- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

11 Dec '07

Author: brian Date: Mon Dec 10 22:44:23 2007 New Revision: 6623 Modified: freeswitch/trunk/conf/directory/default/sipphone.com.noload Log: cleanup Modified: freeswitch/trunk/conf/directory/default/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/sipphone.com.noload (original) +++ freeswitch/trunk/conf/directory/default/sipphone.com.noload Mon Dec 10 22:44:23 2007 @@ -7,7 +7,6 @@ <param name="username" value="%SPUERNAME%"/> <param name="password" value="%SPPASSWORD%"/> <param name="from-domain" value="proxy01.sipphone.com"/> - <param name="proxy" value="proxy01.sipphone.com"/> <param name="caller-id-in-from" value="true"/> <param name="expire-seconds" value="600"/> <param name="register" value="true"/>

1 0

[commit] r6622 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Mon Dec 10 22:32:21 2007 New Revision: 6622 Modified: freeswitch/trunk/src/switch_console.c Log: reduce indentation / cleanup Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Dec 10 22:32:21 2007 @@ -146,44 +146,48 @@ char *data = NULL; int ret = 0; va_list ap; - FILE *handle; + FILE *handle = switch_core_data_channel(channel); const char *filep = switch_cut_path(file); + char date[80] = ""; + switch_size_t retsize; + switch_time_exp_t tm; + switch_event_t *event; va_start(ap, fmt); - - handle = switch_core_data_channel(channel); - ret = switch_vasprintf(&data, fmt, ap); va_end(ap); + if (ret == -1) { fprintf(stderr, "Memory Error\n"); - } else { - char date[80] = ""; + goto done; + } - if (channel == SWITCH_CHANNEL_ID_LOG_CLEAN) { - fprintf(handle, "%s", data); - } else { - switch_size_t retsize; - switch_time_exp_t tm; - switch_event_t *event; - switch_time_exp_lt(&tm, switch_timestamp_now()); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + if (channel == SWITCH_CHANNEL_ID_LOG_CLEAN) { + fprintf(handle, "%s", data); + goto done; + } - if (channel == SWITCH_CHANNEL_ID_LOG) { - fprintf(handle, "[%d] %s %s:%d %s() %s", (int) getpid(), date, filep, line, func, data); - } + switch_time_exp_lt(&tm, switch_timestamp_now()); + switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); - else if (channel == SWITCH_CHANNEL_ID_EVENT && - switch_event_running() == SWITCH_STATUS_SUCCESS && switch_event_create(&event, SWITCH_EVENT_LOG) == SWITCH_STATUS_SUCCESS) { + if (channel == SWITCH_CHANNEL_ID_LOG) { + fprintf(handle, "[%d] %s %s:%d %s() %s", (int) getpid(), date, filep, line, func, data); + goto done; + } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Data", "%s", data); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-File", "%s", filep); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Function", "%s", func); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Line", "%d", line); - switch_event_fire(&event); - } - } + if (channel == SWITCH_CHANNEL_ID_EVENT && + switch_event_running() == SWITCH_STATUS_SUCCESS && + switch_event_create(&event, SWITCH_EVENT_LOG) == SWITCH_STATUS_SUCCESS) { + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Data", "%s", data); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-File", "%s", filep); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Function", "%s", func); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Line", "%d", line); + switch_event_fire(&event); } + + +done: if (data) { free(data); }

1 0

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

11 Dec '07

Author: brian Date: Mon Dec 10 22:30:21 2007 New Revision: 6621 Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Log: update this to be correct Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Mon Dec 10 22:30:21 2007 @@ -1,6 +1,6 @@ <include> <extension name="sipphone.com"> - <condition field="destination_number" expression="^(1222.*)$|^(1747.*)$"> + <condition field="destination_number" expression="^((1222.*)$|^(1747.*))$"> <action application="bridge" data="sofia/gateway/proxy01.sipphone.com/$1"/> </condition> </extension>

1 0

[commit] r6620 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Mon Dec 10 22:28:35 2007 New Revision: 6620 Modified: freeswitch/trunk/src/switch_regex.c Log: this wasn't right wrap in paren to get in multi pipe sep regexp. Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Mon Dec 10 22:28:35 2007 @@ -146,12 +146,7 @@ } index[z++] = '\0'; z = 0; - if (match_count > 1) { - int offset = match_count - 2; - num = atoi(index) + offset; - } else { - num = atoi(index); - } + num = atoi(index); if (pcre_copy_substring(field_data, ovector, match_count, num, replace, sizeof(replace)) > 0) { switch_size_t r;

1 0

[commit] r6619 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Mon Dec 10 21:21:15 2007 New Revision: 6619 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: fix xmlrpc Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Mon Dec 10 21:21:15 2007 @@ -165,7 +165,7 @@ NextToken(&p); x = GetToken(&p); if (x) { - if (!strcasecmp(x,"basic")) { + if (!strcasecmp(x, "basic")) { NextToken(&p); @@ -187,12 +187,18 @@ } if (!domain_name) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s] no domain!\n", user); goto fail; } + + snprintf(z, sizeof(z), "%s:%s", globals.user, globals.pass); + Base64Encode(z, t); + + if (!strcmp(p, t)) { + r->user=strdup(user); + goto authed; + } if (switch_xml_locate_user("id", user, domain_name, NULL, &x_domain_root, &x_domain, &x_user, "mailbox=check") != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain_name); goto fail; } @@ -315,7 +321,7 @@ switch_xml_free(x_domain_root); } - snprintf(z, sizeof(z), "Basic realm=\"%s\"", domain_name); + snprintf(z, sizeof(z), "Basic realm=\"%s\"", domain_name ? domain_name : globals.realm); ResponseAddField(r, "WWW-Authenticate", z); ResponseStatus(r, 401); return FALSE; @@ -389,9 +395,6 @@ } else { if (globals.realm && strncmp(r->uri, "/pub", 4)) { ret = !http_directory_auth(r, NULL); - if (ret) { - ret = !RequestAuth(r, globals.realm, globals.user, globals.pass); - } } } @@ -460,8 +463,12 @@ } } - if (fs_user && fs_domain && !j) { - auth = 0; + if (!fs_user || !strcmp(fs_user, globals.user)) { + auth = 1; + } else { + if (!j) { + auth = 0; + } } if (auth) {

1 0

[commit] r6618 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Mon Dec 10 20:30:43 2007 New Revision: 6618 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: fix regexp here Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Dec 10 20:30:43 2007 @@ -43,7 +43,7 @@ <extension name="eavesdrop"> - <condition field="destination_number" expression="^88(.*)$|^*0(.*)$"> + <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$"> <action application="answer"/> <action application="eavesdrop" data="${db(select/spymap/$1)}"/> </condition>

1 0

[commit] r6617 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Mon Dec 10 20:05:52 2007 New Revision: 6617 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: update 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 20:05:52 2007 @@ -1488,6 +1488,16 @@ d_dest = switch_channel_expand_variables(channel, dest); if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, NULL, NULL, NULL) == SWITCH_STATUS_SUCCESS) { + const char *context; + switch_caller_profile_t *cp; + switch_channel_t *new_channel = switch_core_session_get_channel(*new_session); + + if ((context = switch_channel_get_variable(new_channel, "inbound_context"))) { + if ((cp = switch_channel_get_caller_profile(new_channel))) { + cp->context = switch_core_strdup(cp->pool, context); + } + } + switch_core_session_rwunlock(*new_session); }

1 0

[commit] r6616 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Mon Dec 10 19:14:25 2007 New Revision: 6616 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: only propigate some vars not all 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 19:14:25 2007 @@ -378,9 +378,6 @@ switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, inner_var_array[0], "%s", inner_var_array[1]); - if (caller_channel) { - switch_channel_set_variable(caller_channel, inner_var_array[0], inner_var_array[1]); - } } } }

1 0

[commit] r6615 - freeswitch/trunk
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Mon Dec 10 19:11:43 2007 New Revision: 6615 Modified: freeswitch/trunk/Makefile.am Log: make targets for specific sound file sets such as 'sounds-en-us-callie-16000' and 'sounds-en-us-callie-16000-install' Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Dec 10 19:11:43 2007 @@ -16,8 +16,8 @@ @target=`echo $@ | sed -e 's|^.*-||'`; \ 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)`; \ + full_sound_dir=`echo $@ | sed -e 's|^sounds||' | sed -e 's|^-||' | 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 \

1 0

[commit] r6614 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Mon Dec 10 19:09:04 2007 New Revision: 6614 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: only propigate some vars not all 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 19:09:04 2007 @@ -325,10 +325,31 @@ caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); - /* Copy all the channel variables into the event */ + /* Copy all the applicable channel variables into the event */ if ((hi = switch_channel_variable_first(caller_channel))) { for (; hi; hi = hi->next) { - switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, (char *)hi->name, "%s", (char *) hi->value); + int ok = 0; + if (!strcasecmp((char *)hi->name, "group_confirm_key")) { + ok = 1; + } else if (!strcasecmp((char *)hi->name, "group_confirm_file")) { + ok = 1; + } else if (!strcasecmp((char *)hi->name, "fail_on_single_reject")) { + ok = 1; + } else if (!strcasecmp((char *)hi->name, "ignore_early_media")) { + ok = 1; + } else if (!strcasecmp((char *)hi->name, "originate_retries")) { + ok = 1; + } else if (!strcasecmp((char *)hi->name, "originate_retry_sleep_ms")) { + ok = 1; + } else if (!strcasecmp((char *)hi->name, "origination_caller_id_name")) { + ok = 1; + } else if (!strcasecmp((char *)hi->name, "origination_caller_id_number")) { + ok = 1; + } + + if (ok) { + switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, (char *)hi->name, "%s", (char *) hi->value); + } } switch_channel_variable_last(caller_channel); }

1 0