- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6613 - in freeswitch/trunk/src: . mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: anthm Date: Mon Dec 10 18:49:30 2007 New Revision: 6613 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/switch_ivr_originate.c Log: update to originate syntax Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Mon Dec 10 18:49:30 2007 @@ -156,7 +156,7 @@ static switch_status_t my_on_hangup(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); - switch_status_t status = SWITCH_STATUS_FALSE; + switch_status_t status = SWITCH_STATUS_SUCCESS; const char *log_dir = NULL, *accountcode = NULL, *cid_buf = NULL, *a_template_str = NULL, *g_template_str = NULL; char *log_line, *path = NULL; switch_caller_profile_t *caller_profile, *ocp; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Dec 10 18:49:30 2007 @@ -351,7 +351,7 @@ if ((var_count = switch_separate_string(vars, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { int x = 0; for (x = 0; x < var_count; x++) { - char *inner_var_array[2]; + char *inner_var_array[2] = { 0 }; int inner_var_count; if ((inner_var_count = switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { @@ -559,39 +559,37 @@ assert(peer_channels[i] != NULL); + if (var_event) { + switch_event_t *event; + switch_event_header_t *header; + /* install the vars from the {} params */ + for (header = var_event->headers; header; header = header->next) { + switch_channel_set_variable(peer_channels[i], header->name, header->value); + } + switch_event_create(&event, SWITCH_EVENT_CHANNEL_ORIGINATE); + assert(event); + switch_channel_event_set_data(peer_channels[i], event); + switch_event_fire(&event); + } + if (vdata) { char *var_array[1024] = { 0 }; int var_count = 0; if ((var_count = switch_separate_string(vdata, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { int x = 0; for (x = 0; x < var_count; x++) { - char *inner_var_array[2]; + char *inner_var_array[2] = { 0 }; int inner_var_count; if ((inner_var_count = switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { switch_channel_set_variable(peer_channels[i], inner_var_array[0], inner_var_array[1]); - } } } } - - if (var_event) { - switch_event_t *event; - switch_event_header_t *header; - /* install the vars from the {} params */ - for (header = var_event->headers; header; header = header->next) { - switch_channel_set_variable(peer_channels[i], header->name, header->value); - } - switch_event_create(&event, SWITCH_EVENT_CHANNEL_ORIGINATE); - assert(event); - switch_channel_event_set_data(peer_channels[i], event); - switch_event_fire(&event); - } - if (!table) { table = &originate_state_handlers; }

1 0

[commit] r6612 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: anthm Date: Mon Dec 10 18:48:54 2007 New Revision: 6612 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: make sofia use domain wide params when needed for reg Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Dec 10 18:48:54 2007 @@ -748,7 +748,7 @@ const char *a1_hash = NULL; char *sql; char *mailbox = NULL; - switch_xml_t domain, xml = NULL, user, param, xparams; + switch_xml_t domain, xml = NULL, user, param, uparams, dparams; char hexdigest[2 * SU_MD5_DIGEST_SIZE + 1] = ""; char *pbuf = NULL; char *domain_name = NULL; @@ -834,31 +834,51 @@ goto end; } - if (!(xparams = switch_xml_child(user, "params"))) { - ret = AUTH_OK; - goto end; - } - if (!(mailbox = (char *)switch_xml_attr(user, "mailbox"))) { mailbox = username; } - for (param = switch_xml_child(xparams, "param"); param; param = param->next) { - const char *var = switch_xml_attr_soft(param, "name"); - const char *val = switch_xml_attr_soft(param, "value"); - - if (!strcasecmp(var, "password")) { - passwd = val; + dparams = switch_xml_child(domain, "params"); + uparams = switch_xml_child(user, "params"); + + if (!(dparams && uparams)) { + ret = AUTH_OK; + goto skip_auth; + } + + if (dparams) { + for (param = switch_xml_child(dparams, "param"); param; param = param->next) { + const char *var = switch_xml_attr_soft(param, "name"); + const char *val = switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "password")) { + passwd = val; + } + + if (!strcasecmp(var, "a1-hash")) { + a1_hash = val; + } } - - if (!strcasecmp(var, "a1-hash")) { - a1_hash = val; + } + + if (uparams) { + for (param = switch_xml_child(uparams, "param"); param; param = param->next) { + const char *var = switch_xml_attr_soft(param, "name"); + const char *val = switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "password")) { + passwd = val; + } + + if (!strcasecmp(var, "a1-hash")) { + a1_hash = val; + } } } if (switch_strlen_zero(passwd) && switch_strlen_zero(a1_hash)) { ret = AUTH_OK; - goto end; + goto skip_auth; } if (!a1_hash) { @@ -908,11 +928,16 @@ } } + skip_auth: + if (first && ret == AUTH_OK) { if (v_event) { switch_event_create(v_event, SWITCH_EVENT_MESSAGE); } if (v_event && *v_event) { + switch_xml_t xparams[2]; + int i = 0; + switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_mailbox", "%s", mailbox); switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_username", "%s", username); switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_realm", "%s", realm); @@ -920,26 +945,59 @@ switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "user_name", "%s", username); switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "domain_name", "%s", realm); - if ((xparams = switch_xml_child(user, "variables"))) { - for (param = switch_xml_child(xparams, "variable"); param; param = param->next) { - const char *var = switch_xml_attr_soft(param, "name"); - const char *val = switch_xml_attr_soft(param, "value"); - sofia_gateway_t *gateway_ptr = NULL; + if ((dparams = switch_xml_child(domain, "variables"))) { + xparams[i++] = dparams; + } - if (!switch_strlen_zero(var) && !switch_strlen_zero(val)) { - switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, var, "%s", val); + if ((uparams = switch_xml_child(user, "variables"))) { + xparams[i++] = uparams; + } + + if (dparams || uparams) { + int j = 0; + + for (j = 0; j < i; j++) { + for (param = switch_xml_child(xparams[j], "variable"); param; param = param->next) { + const char *var = switch_xml_attr_soft(param, "name"); + const char *val = switch_xml_attr_soft(param, "value"); + sofia_gateway_t *gateway_ptr = NULL; + + if (!switch_strlen_zero(var) && !switch_strlen_zero(val)) { + switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, var, "%s", val); - if (!strcasecmp(var, "register-gateway")) { - if (!strcasecmp(val, "all")) { - switch_xml_t gateways_tag, gateway_tag; - if ((gateways_tag = switch_xml_child(user, "gateways"))) { - for (gateway_tag = switch_xml_child(gateways_tag, "gateway"); gateway_tag; gateway_tag = gateway_tag->next) { - char *name = (char *) switch_xml_attr_soft(gateway_tag, "name"); - if (switch_strlen_zero(name)) { - name = "anonymous"; - } + if (!strcasecmp(var, "register-gateway")) { + if (!strcasecmp(val, "all")) { + switch_xml_t gateways_tag, gateway_tag; + if ((gateways_tag = switch_xml_child(user, "gateways"))) { + for (gateway_tag = switch_xml_child(gateways_tag, "gateway"); gateway_tag; gateway_tag = gateway_tag->next) { + char *name = (char *) switch_xml_attr_soft(gateway_tag, "name"); + if (switch_strlen_zero(name)) { + name = "anonymous"; + } - if ((gateway_ptr = sofia_reg_find_gateway(name))) { + if ((gateway_ptr = sofia_reg_find_gateway(name))) { + gateway_ptr->retry = 0; + if (exptime) { + gateway_ptr->state = REG_STATE_UNREGED; + } else { + gateway_ptr->state = REG_STATE_UNREGISTER; + } + sofia_reg_release_gateway(gateway_ptr); + } + + } + } + } else { + int x, argc; + char *mydata, *argv[50]; + + mydata = strdup(val); + assert(mydata != NULL); + + argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))); + + for (x = 0; x < argc; x++) { + if ((gateway_ptr = sofia_reg_find_gateway((char *)argv[x]))) { gateway_ptr->retry = 0; if (exptime) { gateway_ptr->state = REG_STATE_UNREGED; @@ -947,34 +1005,13 @@ gateway_ptr->state = REG_STATE_UNREGISTER; } sofia_reg_release_gateway(gateway_ptr); - } - - } - } - } else { - int x, argc; - char *mydata, *argv[50]; - - mydata = strdup(val); - assert(mydata != NULL); - - argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))); - - for (x = 0; x < argc; x++) { - if ((gateway_ptr = sofia_reg_find_gateway((char *)argv[x]))) { - gateway_ptr->retry = 0; - if (exptime) { - gateway_ptr->state = REG_STATE_UNREGED; } else { - gateway_ptr->state = REG_STATE_UNREGISTER; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Gateway '%s' not found.\n", argv[x]); } - sofia_reg_release_gateway(gateway_ptr); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Gateway '%s' not found.\n", argv[x]); } - } - free(mydata); + free(mydata); + } } } } @@ -982,7 +1019,6 @@ } } } - end: if (xml) { switch_xml_free(xml);

1 0

[commit] r6611 - in freeswitch/trunk: . build
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: mikej Date: Mon Dec 10 18:38:42 2007 New Revision: 6611 Added: freeswitch/trunk/build/getsounds.sh.in (contents, props changed) Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Log: add 'make sounds' and 'make sounds-install' makefile targets to download and install soundfiles (FSBUILD-28) Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Dec 10 18:38:42 2007 @@ -10,10 +10,21 @@ BASE = $(switch_srcdir) OSARCH=`uname -s` +DEFAULT_SOUNDS=en-us-callie-8000 + .DEFAULT: @target=`echo $@ | sed -e 's|^.*-||'`; \ - if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; - @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ + target_prefix=`echo $@ | sed -e 's|-.*$$||'`; \ + sound_perfix=`echo $@ | sed -e 's|-.*||'`; \ + full_sound_dir=`echo $@ | sed -e 's|^sounds-||' | sed -e 's|-install$$||'`; \ + test -z "$$full_sound_dir" || full_sound_dir=`echo $(DEFAULT_SOUNDS)`; \ + soundfile=`echo freeswitch-sounds-$$full_sound_dir-$(PACKAGE_VERSION).tar.gz`; \ + if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; \ + if test "$$target_prefix" = "sounds"; then \ + if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(PREFIX)/sounds/; else $(GETSOUNDS) $$soundfile ; fi; \ + else \ + cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ ;\ + fi libfreeswitch_la_SOURCES = \ src/switch_apr.c \ Added: freeswitch/trunk/build/getsounds.sh.in ============================================================================== --- (empty file) +++ freeswitch/trunk/build/getsounds.sh.in Mon Dec 10 18:38:42 2007 @@ -0,0 +1,36 @@ +#!/bin/sh + +TAR=@TAR@ +ZCAT=@ZCAT@ +WGET=@WGET@ +CURL=@CURL@ + +DIR=`pwd` + +if [ -f $WGET ] ; then + DOWNLOAD_CMD=$WGET +else + if [ -f $CURL ] ; then + DOWNLOAD_CMD="$CURL -O" + fi +fi + +base=http://files.freeswitch.org/ +tarfile=$1 +install=$2 + +if [ ! -f $tarfile ] ; then + $DOWNLOAD_CMD $base$tarfile + if [ ! -f $tarfile ] ; then + echo cannot find $tarfile + exit 1 + fi +fi + +if [ ! -z $install ] ; then + test -d $install || mkdir $install + cd $install && $ZCAT -c -d $DIR/$tarfile | $TAR x +fi + +exit 0 + Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Dec 10 18:38:42 2007 @@ -382,6 +382,8 @@ AC_PATH_PROGS(CURL, curl) GETLIB="cd $switch_srcdir/libs && ${SHELL} $switch_srcdir/build/getlib.sh" AC_SUBST(GETLIB) +GETSOUNDS="${SHELL} $switch_srcdir/build/getsounds.sh" +AC_SUBST(GETSOUNDS) LIBCURL_CHECK_CONFIG([yes], [7.13.0], [LIBCURL_DEPS=''], [LIBCURL_DEPS='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include']) @@ -414,6 +416,7 @@ src/mod/event_handlers/mod_radius_cdr/Makefile src/mod/languages/mod_java/Makefile src/include/switch_am_config.h + build/getsounds.sh build/getlib.sh build/modmake.rules])

1 0

[commit] r6610 - freeswitch/trunk
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: mikej Date: Mon Dec 10 17:00:56 2007 New Revision: 6610 Modified: freeswitch/trunk/configure.in Log: push version number to 1.0.pre3 Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Dec 10 17:00:56 2007 @@ -3,10 +3,10 @@ # Must change all of the below together # For a release, set revision for that tagged release as well and uncomment -AC_INIT([freeswitch], [1.0.pre1], BUG-REPORT-ADDRESS) +AC_INIT([freeswitch], [1.0.pre3], BUG-REPORT-ADDRESS) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [0]) -AC_SUBST(SWITCH_VERSION_MICRO, [pre1]) +AC_SUBST(SWITCH_VERSION_MICRO, [pre3]) #AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here]) AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])

1 0

[commit] r6609 - in freeswitch/trunk/src: . include
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: anthm Date: Mon Dec 10 16:58:40 2007 New Revision: 6609 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_utils.c Log: add local vars with [] Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Dec 10 16:58:40 2007 @@ -341,6 +341,7 @@ SWITCH_DECLARE(size_t) switch_url_encode(const char *url, char *buf, size_t len); SWITCH_DECLARE(char *) switch_url_decode(char *s); SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, const char *from, const char *headers, const char *body, const char *file); +SWITCH_DECLARE(char *) switch_find_end_paren(const char *s, char open, char close); /* malloc or DIE macros */ #ifdef NDEBUG Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Dec 10 16:58:40 2007 @@ -36,6 +36,33 @@ #include "private/switch_core_pvt.h" +SWITCH_DECLARE(char *) switch_find_end_paren(const char *s, char open, char close) +{ + const char *e = NULL; + int depth = 0; + + while (s && *s && *s == ' ') { + s++; + } + + if (*s == open) { + depth++; + for (e = s + 1; e && *e; e++) { + if (*e == open) { + depth++; + } else if (*e == close) { + depth--; + if (!depth) { + break; + } + } + } + } + + return (char *)e; +} + + SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len) { char c, *p;

1 0

[commit] r6608 - freeswitch/trunk/src
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: anthm Date: Mon Dec 10 16:55:46 2007 New Revision: 6608 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: add local vars with [] Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Dec 10 16:55:46 2007 @@ -283,15 +283,19 @@ while (data && *data && *data == ' ') { data++; } - + if (*data == '{') { - vars = data + 1; - if (!(data = strchr(data, '}'))) { + char *e = switch_find_end_paren(data, '{', '}'); + + if (e) { + vars = data + 1; + *e++ = '\0'; + data = e; + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); status = SWITCH_STATUS_GENERR; goto done; } - *data++ = '\0'; } /* strip leading spaces (again) */ @@ -463,8 +467,25 @@ } for (i = 0; i < and_argc; i++) { - + char *vdata; + char *e = NULL; chan_type = peer_names[i]; + + while (chan_type && *chan_type && *chan_type == ' ') { + chan_type++; + } + + vdata = chan_type; + e = switch_find_end_paren(vdata, '[', ']'); + + if (e) { + vdata++; + *e++ = '\0'; + chan_type = e; + } else { + vdata = NULL; + } + if ((chan_data = strchr(chan_type, '/')) != 0) { *chan_data = '\0'; chan_data++; @@ -537,6 +558,27 @@ peer_channels[i] = switch_core_session_get_channel(new_session); assert(peer_channels[i] != NULL); + + if (vdata) { + char *var_array[1024] = { 0 }; + int var_count = 0; + if ((var_count = switch_separate_string(vdata, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { + int x = 0; + for (x = 0; x < var_count; x++) { + char *inner_var_array[2]; + int inner_var_count; + if ((inner_var_count = + switch_separate_string(var_array[x], '=', + inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { + + switch_channel_set_variable(peer_channels[i], inner_var_array[0], inner_var_array[1]); + + } + } + } + } + + if (var_event) { switch_event_t *event; switch_event_header_t *header;

1 0

[commit] r6606 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 16:16:12 2007 New Revision: 6606 Added: freeswitch/trunk/conf/directory/default/ideasip.com.noload - copied unchanged from r6603, /freeswitch/trunk/conf/directory/default/proxy.ideasip.com.noload freeswitch/trunk/conf/directory/default/pulver.com.noload - copied unchanged from r6596, /freeswitch/trunk/conf/directory/default/fwd.pulver.com.noload freeswitch/trunk/conf/directory/default/sipphone.com.noload - copied unchanged from r6596, /freeswitch/trunk/conf/directory/default/proxy01.sipphone.com.noload Removed: freeswitch/trunk/conf/directory/default/fwd.pulver.com.noload freeswitch/trunk/conf/directory/default/proxy.ideasip.com.noload freeswitch/trunk/conf/directory/default/proxy01.sipphone.com.noload Log: cleanup

1 0

[commit] r6605 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 14:37:03 2007 New Revision: 6605 Added: freeswitch/trunk/conf/dialplan/extensions/sipbroker.com.noload Log: add sipbroker example extension doesn't load by default Added: freeswitch/trunk/conf/dialplan/extensions/sipbroker.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/extensions/sipbroker.com.noload Mon Dec 10 14:37:03 2007 @@ -0,0 +1,7 @@ +<include> + <extension name="sipbroker.com"> + <condition field="destination_number" expression="^(^\*\d{3,})$"> + <action application="bridge" data="sofia/${use_profile}/$1(a)sipbroker.com"/> + </condition> + </extension> +</include>

1 0

[commit] r6604 - in freeswitch/trunk: conf/autoload_configs src src/include src/mod/applications/mod_commands src/mod/applications/mod_dptools src/mod/event_handlers/mod_event_socket src/mod/languages/mod_spidermonkey src/mod/loggers/mod_console
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: mikej Date: Mon Dec 10 14:16:50 2007 New Revision: 6604 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml freeswitch/trunk/conf/autoload_configs/logfile.conf.xml freeswitch/trunk/conf/autoload_configs/switch.conf.xml freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/src/switch_log.c Log: handle invalid log level strings. (FSCORE-69) Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Mon Dec 10 14:16:50 2007 @@ -4,9 +4,9 @@ <mappings>  - <map name="all" value="debug,info,notice,warning,error,crit,alert"/> + <map name="all" value="debug,info,notice,warning,err,crit,alert"/> </mappings> <settings>  Modified: freeswitch/trunk/conf/autoload_configs/logfile.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/logfile.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/logfile.conf.xml Mon Dec 10 14:16:50 2007 @@ -14,9 +14,9 @@ <mappings>  - <map name="all" value="debug,info,notice,warning,error,crit,alert"/> + <map name="all" value="debug,info,notice,warning,err,crit,alert"/> </mappings> </profile> </profiles> Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/switch.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml Mon Dec 10 14:16:50 2007 @@ -4,7 +4,7 @@ <param name="max-sessions" value="1000"/>  <param name="sessions-per-second" value="30"/> -  +  <param name="loglevel" value="debug"/>  <param name="crash-protection" value="false"/> Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Dec 10 14:16:50 2007 @@ -516,7 +516,8 @@ SWITCH_LOG_ERROR = 3, SWITCH_LOG_CRIT = 2, SWITCH_LOG_ALERT = 1, - SWITCH_LOG_CONSOLE = 0 + SWITCH_LOG_CONSOLE = 0, + SWITCH_LOG_INVALID = 64 } switch_log_level_t; Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Dec 10 14:16:50 2007 @@ -565,8 +565,13 @@ } else { arg = -1; } - switch_core_session_ctl(SCSC_LOGLEVEL, &arg); - stream->write_function(stream, "+OK log level: %s [%d]\n", switch_log_level2str(arg), arg); + + if (arg == -1 || arg == SWITCH_LOG_INVALID) { + stream->write_function(stream, "-ERR syntax error, log level not set!\n"); + } else { + switch_core_session_ctl(SCSC_LOGLEVEL, &arg); + stream->write_function(stream, "+OK log level: %s [%d]\n", switch_log_level2str(arg), arg); + } } else if (!strcasecmp(argv[0], "last_sps")) { switch_core_session_ctl(SCSC_LAST_SPS, &arg); stream->write_function(stream, "+OK last sessions per second: %d\n", arg); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Dec 10 14:16:50 2007 @@ -635,6 +635,9 @@ } else { log_str = level; } + if (ltype == SWITCH_LOG_INVALID) { + ltype = SWITCH_LOG_DEBUG; + } switch_log_printf(SWITCH_CHANNEL_LOG, ltype, "%s\n", log_str); switch_safe_free(level); 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 Mon Dec 10 14:16:50 2007 @@ -811,6 +811,7 @@ } else if (!strncasecmp(cmd, "log", 3)) { char *level_s; + switch_log_level_t ltype = SWITCH_LOG_DEBUG; //pull off the first newline/carriage return strip_cr(cmd); @@ -824,11 +825,12 @@ level_s++; } //see if we lined up on an argument or not - if (switch_strlen_zero(level_s)) { - level_s = "debug"; + if (!switch_strlen_zero(level_s)) { + ltype = switch_log_str2level(level_s); } - if ((listener->level = switch_log_str2level(level_s))) { + if (ltype && ltype != SWITCH_LOG_INVALID) { + listener->level = ltype; switch_set_flag(listener, LFLAG_LOG); snprintf(reply, reply_len, "+OK log level %s [%d]", level_s, listener->level); } else { Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Dec 10 14:16:50 2007 @@ -3002,6 +3002,9 @@ if (argc > 1) { if ((level_str = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) { level = switch_log_str2level(level_str); + if (level == SWITCH_LOG_INVALID) { + level = SWITCH_LOG_DEBUG; + } } if ((msg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])))) { Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Mon Dec 10 14:16:50 2007 @@ -76,10 +76,10 @@ uint32_t l = switch_log_str2level(val); uint32_t i; - assert(l < 10); - - for (i = 0; i <= l; i++) { - m |= (1 << i); + if (l < 10) { + for (i = 0; i <= l; i++) { + m |= (1 << i); + } } } else { m = switch_log_str2mask(val); @@ -227,8 +227,12 @@ level = switch_log_str2level(argv[1]); } - hard_log_level = level; - stream->write_function(stream, "+OK console log level set to %s\n", switch_log_level2str(hard_log_level)); + if (level == SWITCH_LOG_INVALID) { + stream->write_function(stream, "-ERR syntax error, console log level not set!\n"); + } else { + hard_log_level = level; + stream->write_function(stream, "+OK console log level set to %s\n", switch_log_level2str(hard_log_level)); + } goto end; } else if (!strcasecmp(argv[0], "colorize")) { COLORIZE = switch_true(argv[1]); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Dec 10 14:16:50 2007 @@ -706,7 +706,9 @@ level = switch_log_str2level(val); } - switch_core_session_ctl(SCSC_LOGLEVEL, &level); + if (level != SWITCH_LOG_INVALID) { + switch_core_session_ctl(SCSC_LOGLEVEL, &level); + } } else if (!strcasecmp(var, "mailer-app")) { runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Dec 10 14:16:50 2007 @@ -485,6 +485,9 @@ switch_log_level_t level = SWITCH_LOG_DEBUG; if (level_str) { level = switch_log_str2level(level_str); + if (level == SWITCH_LOG_INVALID) { + level = SWITCH_LOG_DEBUG; + } } switch_log_printf(SWITCH_CHANNEL_LOG, level, msg); fflush(stdout); // TEMP ONLY!! SHOULD NOT BE CHECKED IN!! Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Mon Dec 10 14:16:50 2007 @@ -75,6 +75,7 @@ char *argv[10] = { 0 }; uint32_t mask = 0; char *p = strdup(str); + switch_log_level_t level; assert(p); @@ -84,7 +85,10 @@ mask = 0xFF; break; } else { - mask |= (1 << switch_log_str2level(argv[x])); + level = switch_log_str2level(argv[x]); + if (level != SWITCH_LOG_INVALID) { + mask |= (1 << level); + } } } } @@ -99,7 +103,7 @@ SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(const char *str) { int x = 0; - switch_log_level_t level = SWITCH_LOG_DEBUG; + switch_log_level_t level = SWITCH_LOG_INVALID; for (x = 0;; x++) { if (!LEVELS[x]) {

1 0

[commit] r6603 - in freeswitch/trunk/conf: dialplan/extensions directory/default
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 14:06:42 2007 New Revision: 6603 Added: freeswitch/trunk/conf/dialplan/extensions/ideasip.com.noload freeswitch/trunk/conf/directory/default/proxy.ideasip.com.noload Log: add ideasip working config example template Added: freeswitch/trunk/conf/dialplan/extensions/ideasip.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/extensions/ideasip.com.noload Mon Dec 10 14:06:42 2007 @@ -0,0 +1,7 @@ +<include> + <extension name="ideasip.com"> + <condition field="destination_number" expression="^1101(.*)$"> + <action application="bridge" data="sofia/gateway/proxy.ideasip.com/$1"/> + </condition> + </extension> +</include> Added: freeswitch/trunk/conf/directory/default/proxy.ideasip.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/proxy.ideasip.com.noload Mon Dec 10 14:06:42 2007 @@ -0,0 +1,21 @@ + + +<include> + <user id="%ISUSERNAME%"> + <gateways> + <gateway name="proxy.ideasip.com"> + <param name="username" value="%ISUSERNAME%"/> + <param name="password" value="%ISPASSWORD%"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="true"/> + <param name="retry_seconds" value="30"/> + <param name="extension" value="%ISEXTENSION%"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="%ISPASSWORD%"/> + </params> + </user> +</include> +

1 0