- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11035 - in freeswitch/trunk: . debian libs/esl
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 14:38:00 2008 New Revision: 11035 Log: integrate fs_cli into core build Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/libs/esl/Makefile freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Dec 31 14:38:00 2008 @@ -158,13 +158,18 @@ CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h -bin_PROGRAMS = freeswitch +bin_PROGRAMS = freeswitch fs_cli +fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c freeswitch_SOURCES = src/switch.c -nodist_freeswitch_SOURCES = src/include/switch_version.h +nodist_freeswitch_SOURCES = src/include/switch_version.h +fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include +fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la if ADD_LIBEDIT +fs_cli_CFLAGS += -DHAVE_EDITLINE -Ilibs/libedit/src +fs_cli_LDADD = libs/libedit/src/.libs/libedit.a freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT freeswitch_LDADD += libs/libedit/src/.libs/libedit.a endif Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Wed Dec 31 14:38:00 2008 @@ -1,5 +1,6 @@ opt/freeswitch/htdocs/* opt/freeswitch/bin/freeswitch +opt/freeswitch/bin/fs_cli opt/freeswitch/bin/scripts/* opt/freeswitch/lib/libfreeswitch*.so* opt/freeswitch/lib/libopenzap*.so* Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Wed Dec 31 14:38:00 2008 @@ -2,7 +2,7 @@ LIBEDIT_DIR=../../libs/libedit DEBUG=-g -ggdb 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) +CFLAGS=$(INCS) $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY) MYLIB=libesl.a LIBS=-lncurses -lpthread -lesl LDFLAGS=-L. Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Wed Dec 31 14:38:00 2008 @@ -1,3 +1,7 @@ +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 500 +#endif + #include <stdio.h> #include <stdlib.h> #include <esl.h> @@ -11,9 +15,12 @@ #include <io.h> #else #include <sys/select.h> +#include <unistd.h> #include <histedit.h> +#ifndef HAVE_EDITLINE #define HAVE_EDITLINE #endif +#endif #include <getopt.h>

1 0

[commit] r11034 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 14:14:52 2008 New Revision: 11034 Log: tweak Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/libs/esl/fs_cli.conf Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Wed Dec 31 14:14:52 2008 @@ -25,7 +25,7 @@ esl_port_t port; char pass[128]; int debug; - char *console_fnkeys[12]; + const char *console_fnkeys[12]; char loglevel[128]; int quiet; } cli_profile_t; @@ -60,7 +60,7 @@ */ static unsigned char console_fnkey_pressed(int i) { - char *c; + const char *c; assert((i > 0) && (i <= 12)); @@ -75,7 +75,6 @@ return CC_REDISPLAY; } - if (process_command(global_handle, c)) { running = thread_running = 0; } @@ -367,6 +366,22 @@ } +static void set_fn_keys(cli_profile_t *profile) +{ + profile->console_fnkeys[0] = "help"; + profile->console_fnkeys[1] = "status"; + profile->console_fnkeys[2] = "show channels"; + profile->console_fnkeys[3] = "show calls"; + profile->console_fnkeys[4] = "sofia status"; + profile->console_fnkeys[5] = "reloadxml"; + profile->console_fnkeys[6] = "/log console"; + profile->console_fnkeys[7] = "/log debug"; + profile->console_fnkeys[8] = "sofia status profile internal"; + profile->console_fnkeys[9] = "fsctl pause"; + profile->console_fnkeys[10] = "fsctl resume"; + profile->console_fnkeys[11] = "version"; +} + int main(int argc, char *argv[]) { @@ -420,7 +435,9 @@ strncpy(internal_profile.pass, "ClueCon", sizeof(internal_profile.pass)); strncpy(internal_profile.name, "internal", sizeof(internal_profile.name)); internal_profile.port = 8021; - + set_fn_keys(&internal_profile); + + if (home) { snprintf(hfile, sizeof(hfile), "%s/.fs_cli_history", home); snprintf(cfile, sizeof(cfile), "%s/.fs_cli_conf", home); @@ -503,6 +520,7 @@ esl_set_string(profiles[pcount].host, "localhost"); esl_set_string(profiles[pcount].pass, "ClueCon"); profiles[pcount].port = 8021; + set_fn_keys(&profiles[pcount]); esl_log(ESL_LOG_DEBUG, "Found Profile [%s]\n", profiles[pcount].name); pcount++; } Modified: freeswitch/trunk/libs/esl/fs_cli.conf ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.conf (original) +++ freeswitch/trunk/libs/esl/fs_cli.conf Wed Dec 31 14:14:52 2008 @@ -13,7 +13,7 @@ key_f4 => show calls key_f5 => sofia status key_f6 => reloadxml -key_f7 => /nolog +key_f7 => /log console key_f8 => /log debug key_f9 => sofia status profile internal key_f10 => fsctl pause

1 0

[commit] r11033 - in freeswitch/trunk/src: . mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 14:07:20 2008 New Revision: 11033 Log: tweak Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_log.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed Dec 31 14:07:20 2008 @@ -473,6 +473,7 @@ } switch_mutex_unlock(globals.listener_mutex); + switch_yield(1000000); return SWITCH_STATUS_SUCCESS; @@ -821,6 +822,9 @@ switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); + memset(&listen_list, 0, sizeof(listen_list)); + switch_mutex_init(&listen_list.sock_mutex, SWITCH_MUTEX_NESTED, pool); + if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; @@ -1482,7 +1486,7 @@ ltype = switch_log_str2level(level_s); } - if (ltype && ltype != SWITCH_LOG_INVALID) { + if (ltype != SWITCH_LOG_INVALID) { listener->level = ltype; switch_set_flag(listener, LFLAG_LOG); switch_snprintf(reply, reply_len, "+OK log level %s [%d]", level_s, listener->level); @@ -1927,17 +1931,12 @@ listener_t *listener; uint32_t x = 0; - memset(&listen_list, 0, sizeof(listen_list)); - config(); - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "OH OH no pool\n"); return SWITCH_STATUS_TERM; } - - switch_mutex_init(&listen_list.sock_mutex, SWITCH_MUTEX_NESTED, pool); - + config(); for (;;) { rv = switch_sockaddr_info_get(&sa, prefs.ip, SWITCH_INET, prefs.port, 0, pool); Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Wed Dec 31 14:07:20 2008 @@ -122,6 +122,7 @@ if (!LEVELS[x]) { break; } + if (!strcasecmp(LEVELS[x], str)) { level = (switch_log_level_t) x; break;

1 0

[commit] r11032 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: silik0n Date: Wed Dec 31 13:55:49 2008 New Revision: 11032 Log: try to match the main console Modified: freeswitch/trunk/libs/esl/fs_cli.conf Modified: freeswitch/trunk/libs/esl/fs_cli.conf ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.conf (original) +++ freeswitch/trunk/libs/esl/fs_cli.conf Wed Dec 31 13:55:49 2008 @@ -7,6 +7,16 @@ port => 8021 debug => 2 -key_f1 => show channels -key_f2 => sofia status +key_f1 => help +key_f2 => status +key_f3 => show channels +key_f4 => show calls +key_f5 => sofia status +key_f6 => reloadxml +key_f7 => /nolog +key_f8 => /log debug +key_f9 => sofia status profile internal +key_f10 => fsctl pause +key_f11 => fsctl resume +key_f12 => version

1 0

[commit] r11031 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 13:55:08 2008 New Revision: 11031 Log: tweak 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 Wed Dec 31 13:55:08 2008 @@ -67,6 +67,7 @@ c = global_profile->console_fnkeys[i - 1]; /* This new line is necessary to avoid output to begin after the ">" of the CLI's prompt */ + printf("%s\n", c); printf("\n"); if (c == NULL) { @@ -74,6 +75,7 @@ return CC_REDISPLAY; } + if (process_command(global_handle, c)) { running = thread_running = 0; } @@ -693,7 +695,7 @@ #ifdef HAVE_EDITLINE history(myhistory, &ev, H_ENTER, line); #endif - + if (process_command(&handle, cmd)) { running = 0; }

1 0

[commit] r11030 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 13:52:17 2008 New Revision: 11030 Log: tweak Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed Dec 31 13:52:17 2008 @@ -1824,7 +1824,7 @@ switch_mutex_unlock(listener->filter_mutex); if (listener->sock) { char disco_buf[512] = ""; - const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; + const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com/ !!!\n"; int mlen = strlen(message); switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\nContent-Length: %d\n\n", mlen);

1 0

[commit] r11029 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 13:51:26 2008 New Revision: 11029 Log: tweak 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 Wed Dec 31 13:51:26 2008 @@ -259,7 +259,7 @@ !strcasecmp(cmd, "...") || !strcasecmp(cmd, "bye") ) { - esl_log(ESL_LOG_INFO, "Goodbye!\nSee you at ClueCon http://www.cluecon.com\n"); + esl_log(ESL_LOG_INFO, "Goodbye!\nSee you at ClueCon http://www.cluecon.com/\n"); return -1; } @@ -355,11 +355,11 @@ " | _| ___) | | |___| |___ | | \n" " |_| |____/ \\____|_____|___| \n" "\n" - "****************************************************\n" - "* Anthony Minessale II, Ken Rice, Michael Jerris *\n" - "* FreeSWITCH (http://www.freeswitch.org) *\n" - "* Brought to you by ClueCon http://www.cluecon.com *\n" - "****************************************************\n" + "*****************************************************\n" + "* Anthony Minessale II, Ken Rice, Michael Jerris *\n" + "* FreeSWITCH (http://www.freeswitch.org) *\n" + "* Brought to you by ClueCon http://www.cluecon.com/ *\n" + "*****************************************************\n" "\n\n" ); }

1 0

[commit] r11028 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 13:49:28 2008 New Revision: 11028 Log: tweak 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 Wed Dec 31 13:49:28 2008 @@ -473,6 +473,7 @@ case 'h': case '?': + print_banner(stdout); usage(argv[0]); return 0; default:

1 0

[commit] r11027 - in freeswitch/trunk/libs/esl: . src/include
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 13:45:41 2008 New Revision: 11027 Log: merge patch FSSCRIPTS-12 Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/libs/esl/src/include/esl_config.h Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Wed Dec 31 13:45:41 2008 @@ -26,6 +26,8 @@ char pass[128]; int debug; char *console_fnkeys[12]; + char loglevel[128]; + int quiet; } cli_profile_t; static cli_profile_t profiles[128] = {{{0}}}; @@ -156,6 +158,8 @@ printf(" -P, --port=port Port to connect (1 - 65535)\n"); printf(" -p, --password=FILENAME Password\n"); printf(" -x, --execute=command Execute Command and Exit\n"); + printf(" -l, --loglevel=command Log Level\n"); + printf(" -q, --quiet Disable logging\n"); printf(" -d, --debug=level Debug Level (0 - 7)\n\n"); return 1; } @@ -391,6 +395,8 @@ {"password", 1, 0, 'p'}, {"debug", 1, 0, 'd'}, {"execute", 1, 0, 'x'}, + {"loglevel", 1, 0, 'l'}, + {"quiet", 0, 0, 'q'}, {0, 0, 0, 0} }; @@ -404,6 +410,8 @@ int argv_error = 0; int argv_exec = 0; char argv_command[256] = ""; + char argv_loglevel[128] = ""; + int argv_quiet = 0; strncpy(internal_profile.host, "127.0.0.1", sizeof(internal_profile.host)); @@ -413,6 +421,7 @@ if (home) { snprintf(hfile, sizeof(hfile), "%s/.fs_cli_history", home); + snprintf(cfile, sizeof(cfile), "%s/.fs_cli_conf", home); } signal(SIGINT, handle_SIGINT); @@ -421,7 +430,7 @@ for(;;) { int option_index = 0; - opt = getopt_long(argc, argv, "H:U:P:S:p:d:x:h?", options, &option_index); + opt = getopt_long(argc, argv, "H:U:P:S:p:d:x:l:qh?", options, &option_index); if (opt == -1) break; switch (opt) { @@ -455,7 +464,13 @@ argv_exec = 1; esl_set_string(argv_command, optarg); break; - + case 'l': + esl_set_string(argv_loglevel, optarg); + break; + case 'q': + argv_quiet = 1; + break; + case 'h': case '?': usage(argv[0]); @@ -503,6 +518,10 @@ if (dt > -1 && dt < 8){ profiles[pcount-1].debug = dt; } + } else if(!strcasecmp(var, "loglevel")) { + esl_set_string(profiles[pcount-1].loglevel, val); + } else if(!strcasecmp(var, "quiet")) { + profiles[pcount-1].quiet = esl_true(val); } else if (!strncasecmp(var, "key_F", 5)) { char *key = var + 5; @@ -542,6 +561,11 @@ if (argv_pass) { esl_set_string(profile->pass, temp_pass); } + + if (*argv_loglevel) { + esl_set_string(profile->loglevel, argv_loglevel); + profile->quiet = 0; + } esl_log(ESL_LOG_DEBUG, "Using profile %s [%s]\n", profile->name, profile->host); @@ -633,8 +657,10 @@ } #endif - snprintf(cmd_str, sizeof(cmd_str), "log info\n\n"); - esl_send_recv(&handle, cmd_str); + if (!argv_quiet && !profile->quiet) { + snprintf(cmd_str, sizeof(cmd_str), "log %s\n\n", profile->loglevel); + esl_send_recv(&handle, cmd_str); + } print_banner(stdout); Modified: freeswitch/trunk/libs/esl/src/include/esl_config.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_config.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_config.h Wed Dec 31 13:45:41 2008 @@ -70,6 +70,34 @@ #define esl_is_file_path(file) ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR)) #endif +/*! + \brief Evaluate the truthfullness of a string expression + \param expr a string expression + \return true or false +*/ +#define esl_true(expr)\ +(expr && ( !strcasecmp(expr, "yes") ||\ +!strcasecmp(expr, "on") ||\ +!strcasecmp(expr, "true") ||\ +!strcasecmp(expr, "enabled") ||\ +!strcasecmp(expr, "active") ||\ +!strcasecmp(expr, "allow") ||\ +atoi(expr))) ? 1 : 0 + +/*! + \brief Evaluate the falsefullness of a string expression + \param expr a string expression + \return true or false +*/ +#define esl_false(expr)\ +(expr && ( !strcasecmp(expr, "no") ||\ +!strcasecmp(expr, "off") ||\ +!strcasecmp(expr, "false") ||\ +!strcasecmp(expr, "disabled") ||\ +!strcasecmp(expr, "inactive") ||\ +!strcasecmp(expr, "disallow") ||\ +!atoi(expr))) ? 1 : 0 + typedef struct esl_config esl_config_t; /*! \brief A simple file handle representing an open configuration file **/

1 0

[commit] r11026 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 13:30:03 2008 New Revision: 11026 Log: add fkeys Added: freeswitch/trunk/libs/esl/fs_cli.conf 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 Wed Dec 31 13:30:03 2008 @@ -19,6 +19,28 @@ static char prompt_str[512] = ""; +typedef struct { + char name[128]; + char host[128]; + esl_port_t port; + char pass[128]; + int debug; + char *console_fnkeys[12]; +} cli_profile_t; + +static cli_profile_t profiles[128] = {{{0}}}; +static cli_profile_t internal_profile = {{ 0 }}; +static int pcount = 0; + +static esl_handle_t *global_handle; +static cli_profile_t *global_profile; + +static int process_command(esl_handle_t *handle, const char *cmd); + +static int running = 1; +static int thread_running = 0; + + #ifdef HAVE_EDITLINE static char *prompt(EditLine * e) { @@ -28,10 +50,85 @@ static EditLine *el; static History *myhistory; static HistEvent ev; -#endif -static int running = 1; -static int thread_running = 0; + + +/* + * If a fnkey is configured then process the command + */ +static unsigned char console_fnkey_pressed(int i) +{ + char *c; + + assert((i > 0) && (i <= 12)); + + c = global_profile->console_fnkeys[i - 1]; + + /* This new line is necessary to avoid output to begin after the ">" of the CLI's prompt */ + printf("\n"); + + if (c == NULL) { + esl_log(ESL_LOG_ERROR, "FUNCTION KEY F%d IS NOT BOUND, please edit your config.\n", i); + return CC_REDISPLAY; + } + + if (process_command(global_handle, c)) { + running = thread_running = 0; + } + + return CC_REDISPLAY; +} + +static unsigned char console_f1key(EditLine * el, int ch) +{ + return console_fnkey_pressed(1); +} +static unsigned char console_f2key(EditLine * el, int ch) +{ + return console_fnkey_pressed(2); +} +static unsigned char console_f3key(EditLine * el, int ch) +{ + return console_fnkey_pressed(3); +} +static unsigned char console_f4key(EditLine * el, int ch) +{ + return console_fnkey_pressed(4); +} +static unsigned char console_f5key(EditLine * el, int ch) +{ + return console_fnkey_pressed(5); +} +static unsigned char console_f6key(EditLine * el, int ch) +{ + return console_fnkey_pressed(6); +} +static unsigned char console_f7key(EditLine * el, int ch) +{ + return console_fnkey_pressed(7); +} +static unsigned char console_f8key(EditLine * el, int ch) +{ + return console_fnkey_pressed(8); +} +static unsigned char console_f9key(EditLine * el, int ch) +{ + return console_fnkey_pressed(9); +} +static unsigned char console_f10key(EditLine * el, int ch) +{ + return console_fnkey_pressed(10); +} +static unsigned char console_f11key(EditLine * el, int ch) +{ + return console_fnkey_pressed(11); +} +static unsigned char console_f12key(EditLine * el, int ch) +{ + return console_fnkey_pressed(12); +} + +#endif static void handle_SIGINT(int sig) { @@ -150,51 +247,51 @@ goto end; } - if ( - !strcasecmp(cmd, "exit") || - !strcasecmp(cmd, "quit") || - !strcasecmp(cmd, "bye") - ) { - esl_log(ESL_LOG_INFO, "Goodbye!\nSee you at ClueCon http://www.cluecon.com\n"); - return -1; - } + if ((*cmd == '/' && cmd++) || !strncasecmp(cmd, "...", 3)) { + + if ( + !strcasecmp(cmd, "exit") || + !strcasecmp(cmd, "quit") || + !strcasecmp(cmd, "...") || + !strcasecmp(cmd, "bye") + ) { + esl_log(ESL_LOG_INFO, "Goodbye!\nSee you at ClueCon http://www.cluecon.com\n"); + return -1; + } - if ( - !strncasecmp(cmd, "event", 5) || - !strncasecmp(cmd, "noevent", 7) || - !strncasecmp(cmd, "nixevent", 8) || - !strncasecmp(cmd, "log", 3) || - !strncasecmp(cmd, "nolog", 5) || - !strncasecmp(cmd, "filter", 6) - ) { + if ( + !strncasecmp(cmd, "event", 5) || + !strncasecmp(cmd, "noevent", 7) || + !strncasecmp(cmd, "nixevent", 8) || + !strncasecmp(cmd, "log", 3) || + !strncasecmp(cmd, "nolog", 5) || + !strncasecmp(cmd, "filter", 6) + ) { - esl_send_recv(handle, cmd); + esl_send_recv(handle, cmd); - printf("%s\n", handle->last_sr_reply); + printf("%s\n", handle->last_sr_reply); - goto end; - } + goto end; + } - printf("Unknown command [%s]\n", cmd); + printf("Unknown command [%s]\n", cmd); + } else { + char cmd_str[1024] = ""; + snprintf(cmd_str, sizeof(cmd_str), "api %s\n\n", cmd); + esl_send_recv(handle, cmd_str); + if (handle->last_sr_event && handle->last_sr_event->body) { + printf("%s\n", handle->last_sr_event->body); + } + } + end: return 0; } -typedef struct { - char name[128]; - char host[128]; - esl_port_t port; - char pass[128]; - int debug; -} cli_profile_t; - -static cli_profile_t profiles[128] = {{{0}}}; -static int pcount; - - static int get_profile(const char *name, cli_profile_t **profile) { int x; @@ -272,17 +369,19 @@ const char *line = NULL; char cmd_str[1024] = ""; esl_config_t cfg; - cli_profile_t *profile = &profiles[0]; - int cur = 0; + cli_profile_t *profile = NULL; + int rv = 0; + #ifndef WIN32 - char hfile[512] = "/tmp/fs_cli_history"; - char cfile[512] = "/tmp/fs_cli_config"; - char *home = getenv("HOME"); + char hfile[512] = "/etc/fs_cli_history"; + char cfile[512] = "/etc/fs_cli.conf"; + char dft_cfile[512] = "/etc/fs_cli.conf"; #else char hfile[512] = "fs_cli_history"; - char cfile[512] = "fs_cli_config"; - char *home = getenv("HOME"); + char cfile[512] = "fs_cli.conf"; + char dft_cfile[512] = "fs_cli.conf"; #endif + char *home = getenv("HOME"); /* Vars for optargs */ int opt; static struct option options[] = { @@ -307,15 +406,13 @@ char argv_command[256] = ""; - 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++; + strncpy(internal_profile.host, "127.0.0.1", sizeof(internal_profile.host)); + strncpy(internal_profile.pass, "ClueCon", sizeof(internal_profile.pass)); + strncpy(internal_profile.name, "internal", sizeof(internal_profile.name)); + internal_profile.port = 8021; if (home) { snprintf(hfile, sizeof(hfile), "%s/.fs_cli_history", home); - snprintf(cfile, sizeof(cfile), "%s/.fs_cli_config", home); } signal(SIGINT, handle_SIGINT); @@ -373,53 +470,69 @@ return usage(argv[0]); } - if (esl_config_open_file(&cfg, cfile)) { + if (!(rv = esl_config_open_file(&cfg, cfile))) { + rv = esl_config_open_file(&cfg, dft_cfile); + } + + if (rv) { char *var, *val; char cur_cat[128] = ""; while (esl_config_next_pair(&cfg, &var, &val)) { if (strcmp(cur_cat, cfg.category)) { - cur++; esl_set_string(cur_cat, cfg.category); - esl_set_string(profiles[cur].name, cur_cat); - esl_set_string(profiles[cur].host, "localhost"); - esl_set_string(profiles[cur].pass, "ClueCon"); - profiles[cur].port = 8021; - esl_log(ESL_LOG_DEBUG, "Found Profile [%s]\n", profiles[cur].name); + esl_set_string(profiles[pcount].name, cur_cat); + esl_set_string(profiles[pcount].host, "localhost"); + esl_set_string(profiles[pcount].pass, "ClueCon"); + profiles[pcount].port = 8021; + esl_log(ESL_LOG_DEBUG, "Found Profile [%s]\n", profiles[pcount].name); pcount++; } if (!strcasecmp(var, "host")) { - esl_set_string(profiles[cur].host, val); + esl_set_string(profiles[pcount-1].host, val); } else if (!strcasecmp(var, "password")) { - esl_set_string(profiles[cur].pass, val); + esl_set_string(profiles[pcount-1].pass, val); } else if (!strcasecmp(var, "port")) { int pt = atoi(val); if (pt > 0) { - profiles[cur].port = (esl_port_t)pt; + profiles[pcount-1].port = (esl_port_t)pt; } } else if (!strcasecmp(var, "debug")) { int dt = atoi(val); if (dt > -1 && dt < 8){ - profiles[cur].debug = dt; + profiles[pcount-1].debug = dt; } + } else if (!strncasecmp(var, "key_F", 5)) { + char *key = var + 5; + + if (key) { + int i = atoi(key); + + if (i > 0 && i < 13) { + profiles[pcount-1].console_fnkeys[i - 1] = strdup(val); + } + } } } esl_config_close_file(&cfg); } if (optind < argc) { - if (get_profile(argv[optind], &profile)) { - esl_log(ESL_LOG_DEBUG, "Chosen profile %s does not exist using builtin default\n", argv[optind]); - profile = &profiles[0]; - } else { - esl_log(ESL_LOG_DEBUG, "Chosen profile %s\n", profile->name); - if (temp_log < 0 ) { - esl_global_set_default_logger(profile->debug); - } - } + get_profile(argv[optind], &profile); } + if (!profile) { + if (get_profile("default", &profile)) { + esl_log(ESL_LOG_DEBUG, "profile default does not exist using builtin profile\n"); + profile = &internal_profile; + } + } + + if (temp_log < 0 ) { + esl_global_set_default_logger(profile->debug); + } + if (argv_host) { esl_set_string(profile->host, temp_host); } @@ -458,6 +571,9 @@ return 0; } + global_handle = &handle; + global_profile = profile; + esl_thread_create_detached(msg_thread_run, &handle); #ifdef HAVE_EDITLINE @@ -466,6 +582,39 @@ el_set(el, EL_EDITOR, "emacs"); myhistory = history_init(); + el_set(el, EL_ADDFN, "f1-key", "F1 KEY PRESS", console_f1key); + el_set(el, EL_ADDFN, "f2-key", "F2 KEY PRESS", console_f2key); + el_set(el, EL_ADDFN, "f3-key", "F3 KEY PRESS", console_f3key); + el_set(el, EL_ADDFN, "f4-key", "F4 KEY PRESS", console_f4key); + el_set(el, EL_ADDFN, "f5-key", "F5 KEY PRESS", console_f5key); + el_set(el, EL_ADDFN, "f6-key", "F6 KEY PRESS", console_f6key); + el_set(el, EL_ADDFN, "f7-key", "F7 KEY PRESS", console_f7key); + el_set(el, EL_ADDFN, "f8-key", "F8 KEY PRESS", console_f8key); + el_set(el, EL_ADDFN, "f9-key", "F9 KEY PRESS", console_f9key); + el_set(el, EL_ADDFN, "f10-key", "F10 KEY PRESS", console_f10key); + el_set(el, EL_ADDFN, "f11-key", "F11 KEY PRESS", console_f11key); + el_set(el, EL_ADDFN, "f12-key", "F12 KEY PRESS", console_f12key); + + el_set(el, EL_BIND, "\033OP", "f1-key", NULL); + el_set(el, EL_BIND, "\033OQ", "f2-key", NULL); + el_set(el, EL_BIND, "\033OR", "f3-key", NULL); + el_set(el, EL_BIND, "\033OS", "f4-key", NULL); + + + el_set(el, EL_BIND, "\033[11~", "f1-key", NULL); + el_set(el, EL_BIND, "\033[12~", "f2-key", NULL); + el_set(el, EL_BIND, "\033[13~", "f3-key", NULL); + el_set(el, EL_BIND, "\033[14~", "f4-key", NULL); + el_set(el, EL_BIND, "\033[15~", "f5-key", NULL); + el_set(el, EL_BIND, "\033[17~", "f6-key", NULL); + el_set(el, EL_BIND, "\033[18~", "f7-key", NULL); + el_set(el, EL_BIND, "\033[19~", "f8-key", NULL); + el_set(el, EL_BIND, "\033[20~", "f9-key", NULL); + el_set(el, EL_BIND, "\033[21~", "f10-key", NULL); + el_set(el, EL_BIND, "\033[23~", "f11-key", NULL); + el_set(el, EL_BIND, "\033[24~", "f12-key", NULL); + + if (myhistory == 0) { esl_log(ESL_LOG_ERROR, "history could not be initialized\n"); goto done; @@ -474,6 +623,8 @@ history(myhistory, &ev, H_SETSIZE, 800); el_set(el, EL_HIST, history, myhistory); history(myhistory, &ev, H_LOAD, hfile); + + #endif #ifdef WIN32 hStdout = GetStdHandle(STD_OUTPUT_HANDLE); @@ -516,20 +667,8 @@ history(myhistory, &ev, H_ENTER, line); #endif - if (!strncasecmp(cmd, "...", 3)) { - if (process_command(&handle, "exit")) { - running = 0; - } - } else if (*cmd == '/' || !strncasecmp(cmd, "...", 3)) { - if (process_command(&handle, cmd + 1)) { - running = 0; - } - } else { - snprintf(cmd_str, sizeof(cmd_str), "api %s\n\n", cmd); - esl_send_recv(&handle, cmd_str); - if (handle.last_sr_event && handle.last_sr_event->body) { - printf("%s\n", handle.last_sr_event->body); - } + if (process_command(&handle, cmd)) { + running = 0; } #ifdef HAVE_EDITLINE Added: freeswitch/trunk/libs/esl/fs_cli.conf ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/fs_cli.conf Wed Dec 31 13:30:03 2008 @@ -0,0 +1,12 @@ +[default] + +; Put me in /etc/fs_cli.conf or ~/.fs_cli_conf + +host => 127.0.0.1 +password => ClueCon +port => 8021 +debug => 2 + +key_f1 => show channels +key_f2 => sofia status +

1 0