Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

add timeout option to fs_cli

Browse Source
This commit is contained in:
Mathieu Rene 2011-05-25 15:01:43 -04:00
parent 417b24cc10
commit 5fad26b46e
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libs/esl/fs_cli.c
View File

@ -571,7 +571,7 @@ COLORS[] = { ESL_SEQ_DEFAULT_COLOR, ESL_SEQ_FRED, ESL_SEQ_FRED,
ESL_SEQ_FRED, ESL_SEQ_FMAGEN, ESL_SEQ_FCYAN, ESL_SEQ_FGREEN, ESL_SEQ_FYELLOW }; ESL_SEQ_FRED, ESL_SEQ_FMAGEN, ESL_SEQ_FCYAN, ESL_SEQ_FGREEN, ESL_SEQ_FYELLOW };
static int usage(char *name){ static int usage(char *name){
printf("Usage: %s [-H <host>] [-P <port>] [-p <secret>] [-d <level>] [-x command] [profile]\n\n", name); printf("Usage: %s [-H <host>] [-P <port>] [-p <secret>] [-d <level>] [-x command] [-t <timeout_ms>] [profile]\n\n", name);
printf(" -?,-h --help Usage Information\n"); printf(" -?,-h --help Usage Information\n");
printf(" -H, --host=hostname Host to connect\n"); printf(" -H, --host=hostname Host to connect\n");
printf(" -P, --port=port Port to connect (1 - 65535)\n"); printf(" -P, --port=port Port to connect (1 - 65535)\n");
@ -583,7 +583,8 @@ static int usage(char *name){
printf(" -q, --quiet Disable logging\n"); printf(" -q, --quiet Disable logging\n");
printf(" -r, --retry Retry connection on failure\n"); printf(" -r, --retry Retry connection on failure\n");
printf(" -R, --reconnect Reconnect if disconnected\n"); printf(" -R, --reconnect Reconnect if disconnected\n");
printf(" -d, --debug=level Debug Level (0 - 7)\n\n"); printf(" -d, --debug=level Debug Level (0 - 7)\n");
printf(" -t, --timeout Timeout for API commands (in miliseconds)\n\n");
return 1; return 1;
} }
@ -1032,6 +1033,7 @@ int main(int argc, char *argv[])
{"retry", 0, 0, 'r'}, {"retry", 0, 0, 'r'},
{"interrupt", 0, 0, 'i'}, {"interrupt", 0, 0, 'i'},
{"reconnect", 0, 0, 'R'}, {"reconnect", 0, 0, 'R'},
{"timeout", 1, 0, 't'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@ -1050,7 +1052,7 @@ int main(int argc, char *argv[])
char argv_command[1024] = ""; char argv_command[1024] = "";
char argv_loglevel[128] = ""; char argv_loglevel[128] = "";
int argv_quiet = 0; int argv_quiet = 0;
int loops = 2, reconnect = 0; int loops = 2, reconnect = 0, timeout = 0;
strncpy(internal_profile.host, "127.0.0.1", sizeof(internal_profile.host)); strncpy(internal_profile.host, "127.0.0.1", sizeof(internal_profile.host));
strncpy(internal_profile.pass, "ClueCon", sizeof(internal_profile.pass)); strncpy(internal_profile.pass, "ClueCon", sizeof(internal_profile.pass));
@ -1075,7 +1077,7 @@ int main(int argc, char *argv[])
for(;;) { for(;;) {
int option_index = 0; int option_index = 0;
opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:qrRhi?", options, &option_index); opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:t:qrRhi?", options, &option_index);
if (opt == -1) break; if (opt == -1) break;
switch (opt) switch (opt)
{ {
@ -1128,6 +1130,9 @@ int main(int argc, char *argv[])
case 'R': case 'R':
reconnect = 1; reconnect = 1;
break; break;
case 't':
timeout = atoi(optarg);
break;
case 'h': case 'h':
case '?': case '?':
print_banner(stdout); print_banner(stdout);
@ -1284,7 +1289,17 @@ int main(int argc, char *argv[])
const char *err = NULL; const char *err = NULL;
snprintf(cmd_str, sizeof(cmd_str), "api %s\n\n", argv_command); snprintf(cmd_str, sizeof(cmd_str), "api %s\n\n", argv_command);
esl_send_recv(&handle, cmd_str); if (timeout) {
esl_status_t status = esl_send_recv_timed(&handle, cmd_str, timeout);
if (status != ESL_SUCCESS) {
printf("Request timed out.\n");
esl_disconnect(&handle);
return -2;
}
} else {
esl_send_recv(&handle, cmd_str);
}
if (handle.last_sr_event) { if (handle.last_sr_event) {
if (handle.last_sr_event->body) { if (handle.last_sr_event->body) {
printf("%s\n", handle.last_sr_event->body); printf("%s\n", handle.last_sr_event->body);