December 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r11040 - 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 17:44:23 2008 New Revision: 11040 Log: wash behind your ears Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_event.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 17:44:23 2008 @@ -628,15 +628,67 @@ switch_mutex_unlock(listener->filter_mutex); + } else if (!strcasecmp(wcmd, "stop-logging")) { + char *id = switch_event_get_header(stream->param_event, "listen-id"); + uint32_t idl = 0; + + if (id) { + idl = (uint32_t) atol(id); + } + + if (!(listener = find_listener(idl))) { + stream->write_function(stream, "<data><reply type=\"error\">Invalid Listen-ID</reply></data>\n"); + goto end; + } + + if (switch_test_flag(listener, LFLAG_LOG)) { + switch_clear_flag_locked(listener, LFLAG_LOG); + stream->write_function(stream, "<data><reply type=\"success\">Not Logging</reply></data>\n"); + } else { + stream->write_function(stream, "<data><reply type=\"error\">Not Logging</reply></data>\n"); + } + + goto end; + + } else if (!strcasecmp(wcmd, "set-loglevel")) { + char *loglevel = switch_event_get_header(stream->param_event, "loglevel"); + char *id = switch_event_get_header(stream->param_event, "listen-id"); + uint32_t idl = 0; + + if (id) { + idl = (uint32_t) atol(id); + } + + if (!(listener = find_listener(idl))) { + stream->write_function(stream, "<data><reply type=\"error\">Invalid Listen-ID</reply></data>\n"); + goto end; + } + + if (loglevel) { + switch_log_level_t ltype = switch_log_str2level(loglevel); + if (ltype != SWITCH_LOG_INVALID) { + listener->level = ltype; + switch_set_flag(listener, LFLAG_LOG); + stream->write_function(stream, "<data><reply type=\"success\">Log Level %s</reply></data>\n", loglevel); + } else { + stream->write_function(stream, "<data><reply type=\"error\">Invalid Level</reply></data>\n"); + } + } else { + stream->write_function(stream, "<data><reply type=\"error\">Invalid Syntax</reply></data>\n"); + } + + goto end; + } else if (!strcasecmp(wcmd, "create-listener")) { char *events = switch_event_get_header(stream->param_event, "events"); + char *loglevel = switch_event_get_header(stream->param_event, "loglevel"); switch_memory_pool_t *pool; char *next, *cur; uint32_t count = 0, key_count = 0; uint8_t custom = 0; char *edup; - if (switch_strlen_zero(events)) { + if (switch_strlen_zero(events) && switch_strlen_zero(loglevel)) { stream->write_function(stream, "<data><reply type=\"error\">Missing parameter!</reply></data>\n"); goto end; } @@ -652,58 +704,69 @@ switch_set_flag(listener, LFLAG_AUTHED); switch_set_flag(listener, LFLAG_STATEFUL); switch_queue_create(&listener->event_queue, SWITCH_CORE_QUEUE_LEN, listener->pool); + switch_queue_create(&listener->log_queue, SWITCH_CORE_QUEUE_LEN, listener->pool); + + if (loglevel) { + switch_log_level_t ltype = switch_log_str2level(loglevel); + if (ltype != SWITCH_LOG_INVALID) { + listener->level = ltype; + switch_set_flag(listener, LFLAG_LOG); + } + } switch_thread_rwlock_create(&listener->rwlock, listener->pool); listener->id = next_id(); listener->timeout = 60; listener->last_flush = switch_timestamp(NULL); - if (switch_stristr("xml", format)) { - listener->format = EVENT_FORMAT_XML; - } else { - listener->format = EVENT_FORMAT_PLAIN; - } + if (events) { - edup = strdup(events); - - for (cur = edup; cur; count++) { - switch_event_types_t type; - - if ((next = strchr(cur, ' '))) { - *next++ = '\0'; + if (switch_stristr("xml", format)) { + listener->format = EVENT_FORMAT_XML; + } else { + listener->format = EVENT_FORMAT_PLAIN; } + + edup = strdup(events); + + for (cur = edup; cur; count++) { + switch_event_types_t type; + + if ((next = strchr(cur, ' '))) { + *next++ = '\0'; + } - if (custom) { - switch_core_hash_insert(listener->event_hash, cur, MARKER); - } else if (switch_name_event(cur, &type) == SWITCH_STATUS_SUCCESS) { - key_count++; - if (type == SWITCH_EVENT_ALL) { - uint32_t x = 0; - for (x = 0; x < SWITCH_EVENT_ALL; x++) { - listener->event_list[x] = 1; + if (custom) { + switch_core_hash_insert(listener->event_hash, cur, MARKER); + } else if (switch_name_event(cur, &type) == SWITCH_STATUS_SUCCESS) { + key_count++; + if (type == SWITCH_EVENT_ALL) { + uint32_t x = 0; + for (x = 0; x < SWITCH_EVENT_ALL; x++) { + listener->event_list[x] = 1; + } + } + if (type <= SWITCH_EVENT_ALL) { + listener->event_list[type] = 1; + } + if (type == SWITCH_EVENT_CUSTOM) { + custom++; } } - if (type <= SWITCH_EVENT_ALL) { - listener->event_list[type] = 1; - } - if (type == SWITCH_EVENT_CUSTOM) { - custom++; - } + + cur = next; } - - cur = next; - } - switch_safe_free(edup); + switch_safe_free(edup); - if (!key_count) { - switch_core_hash_destroy(&listener->event_hash); - switch_core_destroy_memory_pool(&listener->pool); - stream->write_function(stream, "<data><reply type=\"error\">No keywords supplied</reply></data>\n"); - goto end; + if (!key_count) { + switch_core_hash_destroy(&listener->event_hash); + switch_core_destroy_memory_pool(&listener->pool); + stream->write_function(stream, "<data><reply type=\"error\">No keywords supplied</reply></data>\n"); + goto end; + } } - switch_set_flag_locked(listener, LFLAG_EVENTS); add_listener(listener); stream->write_function(stream, "<data>\n"); @@ -750,7 +813,38 @@ listener->last_flush = switch_timestamp(NULL); stream->write_function(stream, "<data>\n <reply type=\"success\">Current Events Follow</reply>\n"); xmlize_listener(listener, stream); - stream->write_function(stream, "<events>\n"); + + if (switch_test_flag(listener, LFLAG_LOG)) { + stream->write_function(stream, "<log_data>\n"); + + while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) { + switch_log_node_t *dnode = (switch_log_node_t *) pop; + int encode_len = (strlen(dnode->data) * 3) + 1; + char *encode_buf = malloc(encode_len); + + switch_assert(encode_buf); + + memset(encode_buf, 0, encode_len); + switch_url_encode((char *) dnode->data, encode_buf, encode_len); + + + stream->write_function(stream, "<log log-level=\"%d\" text-channel=\"%d\" log-file=\"%s\" log-func=\"%s\" log-line=\"%d\">%s</log>\n", + dnode->level, + dnode->channel, + dnode->file, + dnode->func, + dnode->line, + encode_buf + ); + free(encode_buf); + free(dnode->data); + free(dnode); + } + + stream->write_function(stream, "</log_data>\n"); + } + + stream->write_function(stream, "<events>\n"); while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { char *etype; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Dec 31 17:44:23 2008 @@ -930,13 +930,20 @@ static switch_xml_t add_xml_header(switch_xml_t xml, char *name, char *value, int offset) { - switch_xml_t header = switch_xml_add_child_d(xml, "header", offset); - + switch_xml_t header = switch_xml_add_child_d(xml, name, offset); + if (header) { - switch_xml_set_attr_d(header, "name", name); - switch_xml_set_attr_d(header, "value", value); + int encode_len = (strlen(value) * 3) + 1; + char *encode_buf = malloc(encode_len); + + switch_assert(encode_buf); + + memset(encode_buf, 0, encode_len); + switch_url_encode((char *) value, encode_buf, encode_len); + switch_xml_set_txt_d(header, encode_buf); + free(encode_buf); } - + return header; } @@ -948,6 +955,7 @@ switch_xml_t xml = NULL; uint32_t off = 0; va_list ap; + switch_xml_t xheaders = NULL; if (!(xml = switch_xml_new("event"))) { return xml; @@ -972,8 +980,11 @@ } } - for (hp = event->headers; hp; hp = hp->next) { - add_xml_header(xml, hp->name, hp->value, off++); + if ((xheaders = switch_xml_add_child_d(xml, "headers", off++))) { + int hoff = 0; + for (hp = event->headers; hp; hp = hp->next) { + add_xml_header(xheaders, hp->name, hp->value, hoff++); + } } if (!switch_strlen_zero(data)) { @@ -1032,7 +1043,7 @@ switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Date-Local", date); switch_rfc822_date(date, ts); switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Date-GMT", date); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Date-timestamp", "%" SWITCH_UINT64_T_FMT, (uint64_t) ts); + switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Date-Timestamp", "%" SWITCH_UINT64_T_FMT, (uint64_t) ts); switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Calling-File", switch_cut_path(file)); switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Function", func); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Line-Number", "%d", line);

1 0

[Freeswitch-svn] [commit] r11039 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: mikej Date: Wed Dec 31 17:26:30 2008 New Revision: 11039 Log: fix silly compiler warning caused by freebsd not making int same size as void* on some 64 bit amd (SFSIP-113) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_kqueue_port.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_kqueue_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_kqueue_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_kqueue_port.c Wed Dec 31 17:26:30 2008 @@ -242,21 +242,21 @@ i = ser->ser_id; flags = (wait->events & SU_WAIT_IN) ? EV_ADD : EV_ADD | EV_DISABLE; - EV_SET(ev, wait->fd, EVFILT_READ, flags, 0, 0, (void *)i); + EV_SET(ev, wait->fd, EVFILT_READ, flags, 0, 0, (void *)(intptr_t)i); if (kevent(self->sup_kqueue, ev, 1, NULL, 0, NULL) == -1) { SU_DEBUG_0(("kevent((%u, %s, %u, %p)) failed: %s\n", - wait->fd, "EVFILT_READ", flags, (void *)i, strerror(errno))); + wait->fd, "EVFILT_READ", flags, (void *)(intptr_t)i, strerror(errno))); return -1; } flags = (wait->events & SU_WAIT_OUT) ? EV_ADD : EV_ADD | EV_DISABLE; - EV_SET(ev, wait->fd, EVFILT_WRITE, flags, 0, 0, (void *)i); + EV_SET(ev, wait->fd, EVFILT_WRITE, flags, 0, 0, (void *)(intptr_t)i); if (kevent(self->sup_kqueue, ev, 1, NULL, 0, NULL) == -1) { int error = errno; SU_DEBUG_0(("kevent((%u, %s, %u, %p)) failed: %s\n", - wait->fd, "EVFILT_WRITE", flags, (void *)i, strerror(error))); + wait->fd, "EVFILT_WRITE", flags, (void *)(intptr_t)i, strerror(error))); - EV_SET(ev, wait->fd, EVFILT_READ, EV_DELETE, 0, 0, (void *)i); + EV_SET(ev, wait->fd, EVFILT_READ, EV_DELETE, 0, 0, (void *)(intptr_t)i); kevent(self->sup_kqueue, ev, 1, NULL, 0, NULL); errno = error; @@ -294,17 +294,17 @@ wait = ser->ser_wait; - EV_SET(ev, wait->fd, EVFILT_READ, EV_DELETE, 0, 0, (void *)i); + EV_SET(ev, wait->fd, EVFILT_READ, EV_DELETE, 0, 0, (void *)(intptr_t)i); if (kevent(self->sup_kqueue, ev, 1, NULL, 0, NULL) == -1) { SU_DEBUG_0(("remove kevent((%u, %s, %s, %p)) failed: %s\n", - wait->fd, "EVFILT_READ", "EV_DELETE", (void *)i, + wait->fd, "EVFILT_READ", "EV_DELETE", (void *)(intptr_t)i, strerror(errno))); } - EV_SET(ev, wait->fd, EVFILT_WRITE, EV_DELETE, 0, 0, (void *)i); + EV_SET(ev, wait->fd, EVFILT_WRITE, EV_DELETE, 0, 0, (void *)(intptr_t)i); if (kevent(self->sup_kqueue, ev, 1, NULL, 0, NULL) == -1) { SU_DEBUG_0(("remove kevent((%u, %s, %s, %p)) failed: %s\n", - wait->fd, "EVFILT_WRITE", "EV_DELETE", (void *)i, + wait->fd, "EVFILT_WRITE", "EV_DELETE", (void *)(intptr_t)i, strerror(errno))); } @@ -461,21 +461,21 @@ wait->events = events; flags = (wait->events & SU_WAIT_IN) ? EV_ADD | EV_ENABLE : EV_ADD | EV_DISABLE; - EV_SET(ev, wait->fd, EVFILT_READ, flags, 0, 0, (void *)index); + EV_SET(ev, wait->fd, EVFILT_READ, flags, 0, 0, (void *)(intptr_t)index); if (kevent(self->sup_kqueue, ev, 1, NULL, 0, NULL) == -1) { SU_DEBUG_0(("modify kevent((%u, %s, %s, %p)) failed: %s\n", wait->fd, "EVFILT_READ", (events & SU_WAIT_IN) ? "EV_ENABLE" : "EV_DISABLE", - (void *)index, strerror(errno))); + (void *)(intptr_t)index, strerror(errno))); } flags = (wait->events & SU_WAIT_OUT) ? EV_ADD | EV_ENABLE : EV_ADD | EV_DISABLE; - EV_SET(ev, wait->fd, EVFILT_WRITE, flags, 0, 0, (void *)index); + EV_SET(ev, wait->fd, EVFILT_WRITE, flags, 0, 0, (void *)(intptr_t)index); if (kevent(self->sup_kqueue, ev, 1, NULL, 0, NULL) == -1) { SU_DEBUG_0(("modify kevent((%u, %s, %s, %p)) failed: %s\n", wait->fd, "EVFILT_WRITE", (events & SU_WAIT_OUT) ? "EV_ENABLE" : "EV_DISABLE", - (void *)index, strerror(errno))); + (void *)(intptr_t)index, strerror(errno))); } return 0; @@ -539,7 +539,7 @@ struct su_register *ser; su_root_magic_t *magic; - index = (int)ev[j].udata; + index = (int)(intptr_t)ev[j].udata; if (index <= 0 || self->sup_max_index < index) continue; ser = self->sup_indices[index];

1 0

[Freeswitch-svn] [commit] r11038 - freeswitch/trunk/src/include
by FreeSWITCH SVN 31 Dec '08

31 Dec '08

Author: anthm Date: Wed Dec 31 16:02:22 2008 New Revision: 11038 Log: fix typo in comment Modified: freeswitch/trunk/src/include/switch_types.h Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Dec 31 16:02:22 2008 @@ -486,7 +486,7 @@ Always sending a duration of 0 with a new timestamp should be tolerated but is rarely intentional and is mistakenly done by many devices. - The issue is that the Sonus expects everyone to do it this way instead of tolerating eiher way. + The issue is that the Sonus expects everyone to do it this way instead of tolerating either way. Sonus will actually ignore every packet with the same timestamp before concluding if it's DTMF. This flag will cause each packet to have a new timestamp.

1 0

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

31 Dec '08

Author: mikej Date: Wed Dec 31 14:58:52 2008 New Revision: 11037 Log: fix bsd fs_cli build 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 14:58:52 2008 @@ -1,5 +1,5 @@ #ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #endif #include <stdio.h>

1 0

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

31 Dec '08

Author: anthm Date: Wed Dec 31 14:44:16 2008 New Revision: 11036 Log: allow unix build without libedit 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 Wed Dec 31 14:44:16 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) $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY) +CFLAGS=$(INCS) -DHAVE_EDITLINE $(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:44:16 2008 @@ -16,14 +16,14 @@ #else #include <sys/select.h> #include <unistd.h> -#include <histedit.h> -#ifndef HAVE_EDITLINE -#define HAVE_EDITLINE -#endif #endif #include <getopt.h> +#ifdef HAVE_EDITLINE +#include <histedit.h> +#endif + static char prompt_str[512] = ""; typedef struct {

1 0

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [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