- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10955 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: silik0n Date: Fri Dec 26 13:43:54 2008 New Revision: 10955 Log: clean up usage help Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 13:43:54 2008 @@ -57,10 +57,10 @@ printf("Usage: %s [-H <host>] [-P <port>] [-p <secret>] [-d <level>] [-x command] [profile]\n\n", name); printf(" -?,-h --help Usage Information\n"); printf(" -H, --host=hostname Host to connect\n"); - printf(" -P, --port=port Port to connect\n"); + printf(" -P, --port=port Port to connect (1 - 65535)\n"); printf(" -p, --password=FILENAME Password\n"); printf(" -x, --execute=command Execute Command and exit (Work In Progress)\n"); - printf(" -d, --debug=level Debug Level 0 - 7\n\n"); + printf(" -d, --debug=level Debug Level (0 - 7)\n\n"); return 1; }

1 0

[commit] r10954 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: silik0n Date: Fri Dec 26 13:41:59 2008 New Revision: 10954 Log: add some bounds checking Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 13:41:59 2008 @@ -53,6 +53,17 @@ 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 }; +static int usage(char *name){ + printf("Usage: %s [-H <host>] [-P <port>] [-p <secret>] [-d <level>] [-x command] [profile]\n\n", name); + printf(" -?,-h --help Usage Information\n"); + printf(" -H, --host=hostname Host to connect\n"); + printf(" -P, --port=port Port to connect\n"); + printf(" -p, --password=FILENAME Password\n"); + printf(" -x, --execute=command Execute Command and exit (Work In Progress)\n"); + printf(" -d, --debug=level Debug Level 0 - 7\n\n"); + return 1; +} + static void *msg_thread_run(esl_thread_t *me, void *obj) { @@ -245,8 +256,10 @@ int argv_host = 0; char temp_pass[128]; int argv_pass = 0 ; - esl_port_t temp_port = 0; + int temp_port = 0; int argv_port = 0; + int temp_log = 0; + int argv_error = 0; strncpy(profiles[0].host, "127.0.0.1", sizeof(profiles[0].host)); strncpy(profiles[0].pass, "ClueCon", sizeof(profiles[0].pass)); @@ -276,15 +289,26 @@ argv_host = 1; break; case 'P': - temp_port= (esl_port_t)atoi(optarg); - argv_port = 1; + temp_port= atoi(optarg); + if (temp_port > 0 && temp_port < 65536){ + argv_port = 1; + } else { + printf("ERROR: Port must be in range 1 - 65535\n"); + argv_error = 1; + } break; case 'p': esl_set_string(temp_pass, optarg); argv_pass = 1; break; case 'd': - esl_global_set_default_logger(atoi(optarg)); + temp_log=atoi(optarg); + if (temp_log < 0 || temp_log > 7){ + printf("ERROR: Debug level should be 0 - 7.\n"); + argv_error = 1; + } else { + esl_global_set_default_logger(temp_log); + } break; case 'x': printf("Executing commands from the CLI is not complete.\n"); @@ -292,18 +316,18 @@ case 'h': case '?': - printf("Usage: %s [-H <host>] [-P <port>] [-p <secret>] [-d <level>] [-x command] [profile]\n\n", argv[0]); - printf(" -?,-h --help Usage Information\n"); - printf(" -H, --host=hostname Host to connect\n"); - printf(" -P, --port=port Port to connect\n"); - printf(" -p, --password=FILENAME Password\n"); - printf(" -x, --execute=command Execute Command and exit (Work In Progress)\n"); - printf(" -d, --debug=level Debug Level 0 - 7\n\n"); + usage(argv[0]); return 0; default: opt = 0; } } + + if(argv_error){ + printf("\n"); + usage(argv[0]); + return 0; + } if (esl_config_open_file(&cfg, cfile)) { char *var, *val; @@ -339,7 +363,7 @@ esl_set_string(profiles[cur].host, temp_host); } if (argv_port) { - profiles[cur].port = temp_port; + profiles[cur].port = (esl_port_t)temp_port; } if (argv_pass) { esl_set_string(profiles[cur].pass, temp_pass);

1 0

[commit] r10953 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: silik0n Date: Fri Dec 26 13:14:00 2008 New Revision: 10953 Log: add a couple of more options Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 13:14:00 2008 @@ -236,9 +236,18 @@ {"host", 1, 0, 'H'}, {"port", 1, 0, 'P'}, {"password", 1, 0, 'p'}, + {"debug", 1, 0, 'd'}, + {"execute", 1, 0, 'x'}, {0, 0, 0, 0} }; + char temp_host[128]; + int argv_host = 0; + char temp_pass[128]; + int argv_pass = 0 ; + esl_port_t temp_port = 0; + int argv_port = 0; + strncpy(profiles[0].host, "127.0.0.1", sizeof(profiles[0].host)); strncpy(profiles[0].pass, "ClueCon", sizeof(profiles[0].pass)); strncpy(profiles[0].name, "default", sizeof(profiles[0].name)); @@ -256,6 +265,46 @@ handle.debug = 0; esl_global_set_default_logger(7); + for(;;) { + int option_index = 0; + opt = getopt_long(argc, argv, "H:U:P:S:p:d:x:h?", options, &option_index); + if (opt == -1) break; + switch (opt) + { + case 'H': + esl_set_string(temp_host, optarg); + argv_host = 1; + break; + case 'P': + temp_port= (esl_port_t)atoi(optarg); + argv_port = 1; + break; + case 'p': + esl_set_string(temp_pass, optarg); + argv_pass = 1; + break; + case 'd': + esl_global_set_default_logger(atoi(optarg)); + break; + case 'x': + printf("Executing commands from the CLI is not complete.\n"); + return 0; + + case 'h': + case '?': + printf("Usage: %s [-H <host>] [-P <port>] [-p <secret>] [-d <level>] [-x command] [profile]\n\n", argv[0]); + printf(" -?,-h --help Usage Information\n"); + printf(" -H, --host=hostname Host to connect\n"); + printf(" -P, --port=port Port to connect\n"); + printf(" -p, --password=FILENAME Password\n"); + printf(" -x, --execute=command Execute Command and exit (Work In Progress)\n"); + printf(" -d, --debug=level Debug Level 0 - 7\n\n"); + return 0; + default: + opt = 0; + } + } + if (esl_config_open_file(&cfg, cfile)) { char *var, *val; char cur_cat[128] = ""; @@ -286,36 +335,14 @@ esl_config_close_file(&cfg); } - for(;;) { - int option_index = 0; - opt = getopt_long(argc, argv, "H:U:P:S:p:h?", options, &option_index); - if (opt == -1) break; - switch (opt) - { - case 'H': - printf("Host: %s\n", optarg); - esl_set_string(profile[0].host, optarg); - break; - case 'P': - printf("Port: %s\n", optarg); - profile[0].port= (esl_port_t)atoi(optarg); - break; - case 'p': - printf("password: %s\n", optarg); - esl_set_string(profile[0].pass, optarg); - break; - case 'h': - case '?': - printf("Usage: %s [-H <host>] [-P <port>] [-p <secret>] [profile]\n\n", argv[0]); - printf(" -?,-h --help Usage Information\n"); - printf(" -H, --host=hostname Host to connect\n"); - printf(" -P, --port=port Port to connect\n"); - printf(" -p, --password=FILENAME Password\n\n"); - - return 0; - default: - opt = 0; - } + if (argv_host) { + esl_set_string(profiles[cur].host, temp_host); + } + if (argv_port) { + profiles[cur].port = temp_port; + } + if (argv_pass) { + esl_set_string(profiles[cur].pass, temp_pass); } if (optind < argc) {

1 0

[commit] r10952 - in freeswitch/trunk/libs/esl: . src
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: mikej Date: Fri Dec 26 13:11:31 2008 New Revision: 10952 Log: fix /log Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 13:11:31 2008 @@ -121,8 +121,6 @@ static int process_command(esl_handle_t *handle, const char *cmd) { - char cmd_str[1024]; - if ( !strcasecmp(cmd, "exit") || !strcasecmp(cmd, "quit") || @@ -140,8 +138,7 @@ !strncasecmp(cmd, "filter", 6) ) { - snprintf(cmd_str, sizeof(cmd_str), "%s\n\n", cmd); - esl_send_recv(handle, cmd_str); + esl_send_recv(handle, cmd); printf("%s\n", handle->last_sr_reply); Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Fri Dec 26 13:11:31 2008 @@ -867,7 +867,7 @@ } if (!(*e == '\n' && *(e-1) == '\n')) { - if (send(handle->sock, "\n\n", 2, 0)) { + if (send(handle->sock, "\n\n", 2, 0) != 2) { strerror_r(handle->errnum, handle->err, sizeof(handle->err)); return ESL_FAIL; }

1 0

[commit] r10951 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: mikej Date: Fri Dec 26 13:07:36 2008 New Revision: 10951 Log: fix /log Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 13:07:36 2008 @@ -121,6 +121,8 @@ static int process_command(esl_handle_t *handle, const char *cmd) { + char cmd_str[1024]; + if ( !strcasecmp(cmd, "exit") || !strcasecmp(cmd, "quit") || @@ -138,7 +140,9 @@ !strncasecmp(cmd, "filter", 6) ) { - esl_send_recv(handle, cmd); + snprintf(cmd_str, sizeof(cmd_str), "%s\n\n", cmd); + esl_send_recv(handle, cmd_str); + printf("%s\n", handle->last_sr_reply); goto end;

1 0

[commit] r10950 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: mikej Date: Fri Dec 26 12:54:30 2008 New Revision: 10950 Log: tweak Modified: freeswitch/trunk/libs/esl/Makefile freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Fri Dec 26 12:54:30 2008 @@ -4,7 +4,7 @@ PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes CFLAGS=$(INCS) -D_GNU_SOURCE $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY) MYLIB=libesl.a -LIBS=-lesl -lncurses -lpthread +LIBS=-lncurses -lpthread -lesl LDFLAGS=-L. OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o SRC=src/esl.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c @@ -16,10 +16,6 @@ ar rcs $(MYLIB) $(OBJS) ranlib $(MYLIB) -$(OBJS): $(SRC) - $(CC) $(CC_CFLAGS) $(CFLAGS) -c $< -o $@ - - testserver: $(MYLIB) testserver.c $(CC) $(CC_CFLAGS) $(CFLAGS) testserver.c -o testserver $(LDFLAGS) $(LIBS) Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 12:54:30 2008 @@ -402,7 +402,7 @@ } else { snprintf(cmd_str, sizeof(cmd_str), "api %s\n\n", cmd); esl_send_recv(&handle, cmd_str); - if (handle.last_sr_event) { + if (handle.last_sr_event && handle.last_sr_event->body) { printf("%s\n", handle.last_sr_event->body); } }

1 0

[commit] r10949 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: brian Date: Fri Dec 26 12:09:09 2008 New Revision: 10949 Log: fix early media issue related to group_confirm_file Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Dec 26 12:09:09 2008 @@ -39,6 +39,12 @@ { switch_channel_t *channel = switch_core_session_get_channel(session); + if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) { + while (switch_channel_get_state(channel) == CS_CONSUME_MEDIA && !switch_channel_test_flag(channel, CF_TAGGED)) { + switch_ivr_sleep(session, 10, SWITCH_FALSE, NULL); + } + } + switch_channel_clear_state_handler(channel, &originate_state_handlers); return SWITCH_STATUS_FALSE;

1 0

[commit] r10948 - in freeswitch/trunk/libs/esl: . src
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: mikej Date: Fri Dec 26 12:07:05 2008 New Revision: 10948 Log: fix build Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 12:07:05 2008 @@ -41,15 +41,15 @@ } -#ifdef WIN32 -static HANDLE hStdout; -static WORD wOldColorAttrs; -static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; - -static WORD -#else -static const char* -#endif +#ifdef WIN32 +static HANDLE hStdout; +static WORD wOldColorAttrs; +static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; + +static WORD +#else +static const char* +#endif 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 }; @@ -88,11 +88,11 @@ if (tchannel == 0 || (file && !strcmp(file, "switch_console.c"))) { #ifdef WIN32 - DWORD len = (DWORD) strlen(handle->last_event->body); - DWORD outbytes = 0; - SetConsoleTextAttribute(hStdout, COLORS[level]); - WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL); - SetConsoleTextAttribute(hStdout, wOldColorAttrs); + DWORD len = (DWORD) strlen(handle->last_event->body); + DWORD outbytes = 0; + SetConsoleTextAttribute(hStdout, COLORS[level]); + WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL); + SetConsoleTextAttribute(hStdout, wOldColorAttrs); #else printf("%s%s%s", COLORS[level], handle->last_event->body, ESL_SEQ_DEFAULT_COLOR); #endif @@ -228,13 +228,6 @@ char cfile[512] = ".\\fs_cli_config"; char *home = ""; //getenv("HOME"); #endif - - strncpy(profiles[0].host, "127.0.0.1", sizeof(profiles[0].host)); - strncpy(profiles[0].pass, "ClueCon", sizeof(profiles[0].pass)); - strncpy(profiles[0].name, "default", sizeof(profiles[0].name)); - profiles[0].port = 8021; - pcount++; - /* Vars for optargs */ int opt; static struct option options[] = { @@ -244,7 +237,12 @@ {"password", 1, 0, 'p'}, {0, 0, 0, 0} }; - + + strncpy(profiles[0].host, "127.0.0.1", sizeof(profiles[0].host)); + strncpy(profiles[0].pass, "ClueCon", sizeof(profiles[0].pass)); + strncpy(profiles[0].name, "default", sizeof(profiles[0].name)); + profiles[0].port = 8021; + pcount++; if (home) { snprintf(hfile, sizeof(hfile), "%s/.fs_cli_history", home); @@ -287,7 +285,7 @@ esl_config_close_file(&cfg); } - while (1){ + for(;;) { int option_index = 0; opt = getopt_long(argc, argv, "H:U:P:S:p:h?", options, &option_index); if (opt == -1) break; @@ -357,10 +355,10 @@ history(myhistory, &ev, H_LOAD, hfile); #endif #ifdef WIN32 - hStdout = GetStdHandle(STD_OUTPUT_HANDLE); - if (hStdout != INVALID_HANDLE_VALUE && GetConsoleScreenBufferInfo(hStdout, &csbiInfo)) { - wOldColorAttrs = csbiInfo.wAttributes; - } + hStdout = GetStdHandle(STD_OUTPUT_HANDLE); + if (hStdout != INVALID_HANDLE_VALUE && GetConsoleScreenBufferInfo(hStdout, &csbiInfo)) { + wOldColorAttrs = csbiInfo.wAttributes; + } #endif snprintf(cmd_str, sizeof(cmd_str), "log info\n\n"); Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Fri Dec 26 12:07:05 2008 @@ -861,7 +861,7 @@ esl_log(ESL_LOG_DEBUG, "SEND\n%s\n", cmd); } - if (send(handle->sock, cmd, strlen(cmd), 0) != strlen(cmd)) { + if (send(handle->sock, cmd, strlen(cmd), 0) != (int)strlen(cmd)) { strerror_r(handle->errnum, handle->err, sizeof(handle->err)); return ESL_FAIL; }

1 0

[commit] r10947 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: mikej Date: Fri Dec 26 12:00:51 2008 New Revision: 10947 Log: fix bsd make Modified: freeswitch/trunk/libs/esl/Makefile Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Fri Dec 26 12:00:51 2008 @@ -1,5 +1,4 @@ -PWD=$(shell pwd) -INCS=-I$(PWD)/src/include +INCS=-Isrc/include LIBEDIT_DIR=../../libs/libedit DEBUG=-g -ggdb PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes @@ -17,6 +16,10 @@ ar rcs $(MYLIB) $(OBJS) ranlib $(MYLIB) +$(OBJS): $(SRC) + $(CC) $(CC_CFLAGS) $(CFLAGS) -c $< -o $@ + + testserver: $(MYLIB) testserver.c $(CC) $(CC_CFLAGS) $(CFLAGS) testserver.c -o testserver $(LDFLAGS) $(LIBS)

1 0

[commit] r10946 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: anthm Date: Fri Dec 26 11:43:03 2008 New Revision: 10946 Log: fix bug Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Fri Dec 26 11:43:03 2008 @@ -861,11 +861,11 @@ esl_log(ESL_LOG_DEBUG, "SEND\n%s\n", cmd); } - if (send(handle->sock, cmd, strlen(cmd), 0)) { + if (send(handle->sock, cmd, strlen(cmd), 0) != strlen(cmd)) { strerror_r(handle->errnum, handle->err, sizeof(handle->err)); return ESL_FAIL; } - + if (!(*e == '\n' && *(e-1) == '\n')) { if (send(handle->sock, "\n\n", 2, 0)) { strerror_r(handle->errnum, handle->err, sizeof(handle->err)); @@ -884,7 +884,11 @@ esl_status_t status; esl_mutex_lock(handle->mutex); - esl_send(handle, cmd); + + if ((status = esl_send(handle, cmd))) { + return status; + } + status = esl_recv_event(handle, &handle->last_sr_event); if (handle->last_sr_event) {

1 0