May 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13250 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 May '09

07 May '09

Author: anthm Date: Thu May 7 10:07:48 2009 New Revision: 13250 Log: add rtp-autoflush-during-bridge param Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu May 7 10:07:48 2009 @@ -1062,7 +1062,7 @@ } if (ok) { - rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_UNSTICK); } else { rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); }

1 0

[commit] r13249 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 May '09

07 May '09

Author: anthm Date: Thu May 7 10:07:04 2009 New Revision: 13249 Log: add rtp-autoflush-during-bridge param Modified: freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu May 7 10:07:04 2009 @@ -92,6 +92,10 @@ <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>  <param name="tls-version" value="$${sip_tls_version}"/> + +  +    Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu May 7 10:07:04 2009 @@ -1024,21 +1024,49 @@ case SWITCH_MESSAGE_INDICATE_BRIDGE: if (switch_rtp_ready(tech_pvt->rtp_session)) { + const char *val; + int ok = 0; + if (sofia_test_flag(tech_pvt, TFLAG_PASS_RFC2833) && switch_channel_test_flag_partner(channel, CF_FS_RTP)) { switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s activate passthru 2833 mode.\n", switch_channel_get_name(channel)); } + + if ((val = switch_channel_get_variable(channel, "rtp_autoflush_during_bridge"))) { + ok = switch_true(val); + } else { + ok = sofia_test_pflag(tech_pvt->profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } - rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); + if (ok) { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + } else { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); + } } goto end; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: if (switch_rtp_ready(tech_pvt->rtp_session)) { + const char *val; + int ok = 0; + if (switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s deactivate passthru 2833 mode.\n", switch_channel_get_name(channel)); switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); } - rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); + + if ((val = switch_channel_get_variable(channel, "rtp_autoflush_during_bridge"))) { + ok = switch_true(val); + } else { + ok = sofia_test_pflag(tech_pvt->profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } + + if (ok) { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + } else { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); + } + } goto end; case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu May 7 10:07:04 2009 @@ -189,6 +189,7 @@ PFLAG_NAT_OPTIONS_PING, PFLAG_AUTOFIX_TIMING, PFLAG_MESSAGE_QUERY_ON_REGISTER, + PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE, /* No new flags below this line */ PFLAG_MAX } PFLAGS; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu May 7 10:07:04 2009 @@ -1557,6 +1557,12 @@ } else { sofia_clear_pflag(profile, PFLAG_CALLID_AS_UUID); } + } else if (!strcasecmp(var, "rtp-autoflush-during-bridge")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } else { + sofia_clear_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } } else if (!strcasecmp(var, "outbound-use-uuid-as-callid")) { if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_UUID_AS_CALLID); @@ -2059,6 +2065,12 @@ sofia_set_flag(profile, TFLAG_INB_NOMEDIA); } else if (!strcasecmp(var, "inbound-late-negotiation") && switch_true(val)) { sofia_set_flag(profile, TFLAG_LATE_NEGOTIATION); + } else if (!strcasecmp(var, "rtp-autoflush-during-bridge")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } else { + sofia_clear_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + } } else if (!strcasecmp(var, "inbound-proxy-media") && switch_true(val)) { sofia_set_flag(profile, TFLAG_PROXY_MEDIA); } else if (!strcasecmp(var, "force-subscription-expires")) {

1 0

[commit] r13248 - freeswitch/trunk/src
by FreeSWITCH SVN 07 May '09

07 May '09

Author: mrene Date: Wed May 6 21:16:12 2009 New Revision: 13248 Log: Don't set the caller name to origination_uuid's value Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed May 6 21:16:12 2009 @@ -1410,7 +1410,6 @@ strncpy(tmp, var_begin, strlen(var_begin)); } - new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_uuid", tmp); }

1 0

[commit] r13247 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by FreeSWITCH SVN 07 May '09

07 May '09

Author: mrene Date: Wed May 6 21:05:16 2009 New Revision: 13247 Log: MODAPP-271 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_originate.c 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 Wed May 6 21:05:16 2009 @@ -2307,7 +2307,7 @@ static switch_call_cause_t cause = SWITCH_CAUSE_NONE; unsigned int timelimit = 60; switch_channel_t *new_channel = NULL; - switch_event_t *params = NULL; + switch_event_t *params = NULL, *var_event_orig = var_event; char stupid[128] = ""; const char *skip = NULL, *var = NULL; @@ -2357,7 +2357,13 @@ if (!strcasecmp(var, "dial-string")) { dest = val; - break; + } else if (!strncasecmp(var, "dial-var-", 9)) { + if (!var_event) { + switch_event_create(&var_event, SWITCH_EVENT_GENERAL); + } else { + switch_event_del_header(var_event, var + 9); + } + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, var + 9, val); } } } @@ -2369,7 +2375,13 @@ if (!strcasecmp(var, "dial-string")) { dest = val; - break; + } else if (!strncasecmp(var, "dial-var-", 9)) { + if (!var_event) { + switch_event_create(&var_event, SWITCH_EVENT_GENERAL); + } else { + switch_event_del_header(var_event, var + 9); + } + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, var + 9, val); } } } @@ -2381,7 +2393,13 @@ if (!strcasecmp(var, "dial-string")) { dest = val; - break; + } else if (!strncasecmp(var, "dial-var-", 9)) { + if (!var_event) { + switch_event_create(&var_event, SWITCH_EVENT_GENERAL); + } else { + switch_event_del_header(var_event, var + 9); + } + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, var + 9, val); } } } @@ -2489,6 +2507,10 @@ if (params) { switch_event_destroy(&params); } + + if (var_event && var_event_orig != var_event) { + switch_event_destroy(&var_event); + } switch_safe_free(user); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed May 6 21:05:16 2009 @@ -1006,6 +1006,24 @@ } } + if (vars) { /* Parse parameters specified from the dialstring */ + char *var_array[1024] = { 0 }; + int var_count = 0; + 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] = { 0 }; + int inner_var_count; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "variable string %d = [%s]\n", x, var_array[x]); + if ((inner_var_count = + switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { + switch_event_del_header(var_event, inner_var_array[0]); + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, inner_var_array[0], inner_var_array[1]); + } + } + } + } + if (oglobals.session) { switch_event_header_t *hi; const char *cdr_total_var; @@ -1020,7 +1038,7 @@ } - /* Copy all the applicable channel variables into the event */ + /* Copy all the missing applicable channel variables from A-leg into the event */ if ((hi = switch_channel_variable_first(caller_channel))) { for (; hi; hi = hi->next) { int ok = 0; @@ -1052,7 +1070,7 @@ ok = 1; } - if (ok) { + if (ok && !switch_event_get_header(var_event, hi->name)) { switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, (char *) hi->name, (char *) hi->value); } } @@ -1071,24 +1089,6 @@ */ } - if (vars) { /* Parse parameters specified from the dialstring */ - char *var_array[1024] = { 0 }; - int var_count = 0; - 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] = { 0 }; - int inner_var_count; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "variable string %d = [%s]\n", x, var_array[x]); - if ((inner_var_count = - switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { - switch_event_del_header(var_event, inner_var_array[0]); - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, inner_var_array[0], inner_var_array[1]); - } - } - } - } - if (caller_channel) { /* ringback is only useful when there is an originator */ ringback_data = NULL;

1 0

[commit] r13246 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 06 May '09

06 May '09

Author: anthm Date: Wed May 6 17:52:09 2009 New Revision: 13246 Log: doh Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 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 Wed May 6 17:52:09 2009 @@ -2428,11 +2428,12 @@ } else { switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(event); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_user", user); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_domain", domain); - d_dest = switch_event_expand_headers(event, dest); - switch_event_destroy(&event); - } + } + + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_user", user); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_domain", domain); + d_dest = switch_event_expand_headers(event, dest); + switch_event_destroy(&event); } if ((flags & SOF_FORKED_DIAL)) {

1 0

[commit] r13245 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 06 May '09

06 May '09

Author: mrene Date: Wed May 6 13:12:44 2009 New Revision: 13245 Log: Add sofia profile params to fine-tune timers Modified: freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Wed May 6 13:12:44 2009 @@ -207,6 +207,34 @@   +  + +  +  + +  +  + + +  +  + +  +  </settings> </profile> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed May 6 13:12:44 2009 @@ -479,6 +479,10 @@ uint32_t ob_calls; uint32_t ib_failed_calls; uint32_t ob_failed_calls; + uint32_t timer_t1; + uint32_t timer_t1x64; + uint32_t timer_t2; + uint32_t timer_t4; }; struct private_object { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed May 6 13:12:44 2009 @@ -775,6 +775,10 @@ NTATAG_DEFAULT_PROXY(profile->outbound_proxy), NTATAG_SERVER_RPORT(profile->rport_level), TPTAG_LOG(sofia_test_flag(profile, TFLAG_TPORT_LOG)), + TAG_IF(profile->timer_t1, NTATAG_SIP_T1(profile->timer_t1)), + TAG_IF(profile->timer_t1x64, NTATAG_SIP_T1X64(profile->timer_t1x64)), + TAG_IF(profile->timer_t2, NTATAG_SIP_T2(profile->timer_t2)), + TAG_IF(profile->timer_t4, NTATAG_SIP_T4(profile->timer_t4)), TAG_END()); /* Last tag should always finish the sequence */ if (!profile->nua) { @@ -1780,6 +1784,38 @@ profile->dtmf_duration = SWITCH_DEFAULT_DTMF_DURATION; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Duration out of bounds, using default of %d!\n", SWITCH_DEFAULT_DTMF_DURATION); } + } else if (!strcasecmp(var, "timer-T1")) { + int v = atoi(val); + if (v > 0) { + profile->timer_t1 = v; + } else { + profile->timer_t1 = 500; + } + nua_set_params(profile->nua, NTATAG_SIP_T1(profile->timer_t1), TAG_END()); + } else if (!strcasecmp(var, "timer-T1X64")) { + int v = atoi(val); + if (v > 0) { + profile->timer_t1x64 = v; + } else { + profile->timer_t1x64 = 32000; + } + nua_set_params(profile->nua, NTATAG_SIP_T1X64(profile->timer_t1x64), TAG_END()); + } else if (!strcasecmp(var, "timer-T2")) { + int v = atoi(val); + if (v > 0) { + profile->timer_t2 = v; + } else { + profile->timer_t2 = 4000; + } + nua_set_params(profile->nua, NTATAG_SIP_T2(profile->timer_t2), TAG_END()); + } else if (!strcasecmp(var, "timer-T4")) { + int v = atoi(val); + if (v > 0) { + profile->timer_t4 = v; + } else { + profile->timer_t4 = 4000; + } + nua_set_params(profile->nua, NTATAG_SIP_T4(profile->timer_t4), TAG_END()); } } } @@ -2408,6 +2444,34 @@ } else { profile->tls_version = 0; } + } else if (!strcasecmp(var, "timer-T1")) { + int v = atoi(val); + if (v > 0) { + profile->timer_t1 = v; + } else { + profile->timer_t1 = 500; + } + } else if (!strcasecmp(var, "timer-T1X64")) { + int v = atoi(val); + if (v > 0) { + profile->timer_t1x64 = v; + } else { + profile->timer_t1x64 = 32000; + } + } else if (!strcasecmp(var, "timer-T2")) { + int v = atoi(val); + if (v > 0) { + profile->timer_t2 = v; + } else { + profile->timer_t2 = 4000; + } + } else if (!strcasecmp(var, "timer-T4")) { + int v = atoi(val); + if (v > 0) { + profile->timer_t4 = v; + } else { + profile->timer_t4 = 4000; + } } }

1 0

[commit] r13244 - freeswitch/trunk/src
by FreeSWITCH SVN 06 May '09

06 May '09

Author: brian Date: Wed May 6 13:00:28 2009 New Revision: 13244 Log: fix play and get digits when using phrase macros Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed May 6 13:00:28 2009 @@ -340,7 +340,7 @@ switch_safe_free(substituted); - if (match && do_break && switch_true(do_break)) { + if ((match && do_break && switch_true(do_break)) || status == SWITCH_STATUS_BREAK) { break; } @@ -860,8 +860,6 @@ char *argv[128] = { 0 }; int argc; int cur; - switch_status_t rst; - switch_core_session_get_read_impl(session, &read_impl); @@ -927,8 +925,8 @@ if ((arg = strchr(dup, ':'))) { *arg++ = '\0'; } - if ((rst = switch_ivr_phrase_macro(session, dup, arg, lang, args) != SWITCH_STATUS_SUCCESS)) { - return rst; + if ((status = switch_ivr_phrase_macro(session, dup, arg, lang, args)) != SWITCH_STATUS_SUCCESS) { + return status; } continue; } else { @@ -951,8 +949,8 @@ } if (!switch_strlen_zero(engine) && !switch_strlen_zero(voice) && !switch_strlen_zero(text)) { - if ((rst = switch_ivr_speak_text(session, engine, voice, text, args)) != SWITCH_STATUS_SUCCESS) { - return rst; + if ((status = switch_ivr_speak_text(session, engine, voice, text, args)) != SWITCH_STATUS_SUCCESS) { + return status; } continue; } else if (!switch_strlen_zero(engine) && !(voice && text)) { @@ -960,8 +958,8 @@ engine = (char *) switch_channel_get_variable(channel, "tts_engine"); voice = (char *) switch_channel_get_variable(channel, "tts_voice"); if (engine && text) { - if ((rst = switch_ivr_speak_text(session, engine, voice, text, args)) != SWITCH_STATUS_SUCCESS) { - return rst; + if ((status = switch_ivr_speak_text(session, engine, voice, text, args)) != SWITCH_STATUS_SUCCESS) { + return status; } continue; } @@ -1404,8 +1402,6 @@ switch_core_timer_destroy(&timer); } - - switch_safe_free(abuf); switch_core_session_reset(session, SWITCH_FALSE, SWITCH_TRUE);

1 0

[commit] r13243 - freeswitch/trunk/src
by FreeSWITCH SVN 06 May '09

06 May '09

Author: brian Date: Wed May 6 12:34:29 2009 New Revision: 13243 Log: remove unused code Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Wed May 6 12:34:29 2009 @@ -122,12 +122,6 @@ } } - if (0 && fh->pre_buffer_datalen) { - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Prebuffering %d bytes\n", (int)fh->pre_buffer_datalen); - switch_buffer_create_dynamic(&fh->pre_buffer, fh->pre_buffer_datalen * fh->channels, fh->pre_buffer_datalen * fh->channels / 2, 0); - fh->pre_buffer_data = switch_core_alloc(fh->memory_pool, fh->pre_buffer_datalen * fh->channels); - } - if (fh->channels > 1 && (flags & SWITCH_FILE_FLAG_READ)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "File has %d channels, muxing to mono will occur.\n", fh->channels); }

1 0

[commit] r13242 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 06 May '09

06 May '09

Author: anthm Date: Wed May 6 10:24:04 2009 New Revision: 13242 Log: MODAPP-272 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed May 6 10:24:04 2009 @@ -1014,7 +1014,7 @@ } - if (cd.do_orbit && cd.orbit_exten) { + if ((switch_true(switch_channel_get_variable(channel, "fifo_caller_exit_to_orbit")) || cd.do_orbit) && cd.orbit_exten) { if (orbit_ann) { switch_ivr_play_file(session, NULL, orbit_ann, NULL); } @@ -1975,7 +1975,7 @@ static void fifo_member_add(char *fifo_name, char *originate_string, int simo_count, int timeout, int lag, time_t expires) { char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 }; - char *sql; + char *sql, *name_dup, *p; fifo_node_t *node = NULL; switch_md5_string(digest, (void *) originate_string, strlen(originate_string)); @@ -1994,15 +1994,23 @@ node->has_outbound = 1; + name_dup = strdup(fifo_name); + if ((p = strchr(name_dup, '@'))) { + *p = '\0'; + } + sql = switch_mprintf("insert into fifo_outbound " "(uuid, fifo_name, originate_string, simo_count, use_count, timeout, " "lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname) " - "values ('%q','%q','%q',%d,%d,%d,%d,%d,%ld,0,0,0,'%q')", - digest, fifo_name, originate_string, simo_count, 0, timeout, lag, 0, (long)expires, globals.hostname + "values ('%q','%q'," + "'{execute_on_answer=''unset fifo_hangup_check'',fifo_hangup_check=''%q'',origination_caller_id_name=Queue," + "origination_caller_id_number=''fifo+%q''}%q',%d,%d,%d,%d,%d,%ld,0,0,0,'%q')", + digest, fifo_name, fifo_name, name_dup, originate_string, simo_count, 0, timeout, lag, 0, (long)expires, globals.hostname ); switch_assert(sql); fifo_execute_sql(sql, globals.sql_mutex); free(sql); + free(name_dup); }

1 0

[commit] r13241 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by FreeSWITCH SVN 06 May '09

06 May '09

Author: anthm Date: Wed May 6 10:13:51 2009 New Revision: 13241 Log: add group_recurse_variables and user_recurse_variables to {} vars (default is true, set to false to not pass vars down to user or group channels) Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_originate.c 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 Wed May 6 10:13:51 2009 @@ -2187,11 +2187,11 @@ switch_originate_flag_t myflags = SOF_NONE; char *cid_name_override = NULL; char *cid_num_override = NULL; - const char *var; + const char *var, *skip = NULL; unsigned int timelimit = 60; char *domain = NULL; switch_channel_t *new_channel = NULL; - + group = strdup(outbound_profile->destination_number); if (!group) goto done; @@ -2206,17 +2206,35 @@ goto done; } + + if (var_event && (skip=switch_event_get_header(var_event, "group_recurse_variables")) && switch_false(skip)) { + if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE)) || + (var = switch_event_get_header(var_event, "leg_timeout"))) { + timelimit = atoi(var); + } + var_event = NULL; + } + + + template = switch_mprintf("${group_call(%s@%s)}", group, domain); if (session) { switch_channel_t *channel = switch_core_session_get_channel(session); dest = switch_channel_expand_variables(channel, template); - if ((var = switch_channel_get_variable(channel, SWITCH_CALL_TIMEOUT_VARIABLE))) { + if ((var = switch_channel_get_variable(channel, SWITCH_CALL_TIMEOUT_VARIABLE)) || + (var = switch_event_get_header(var_event, "leg_timeout"))) { timelimit = atoi(var); } } else if (var_event) { dest = switch_event_expand_headers(var_event, template); + } else { + switch_event_t *event = NULL; + switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); + dest = switch_event_expand_headers(event, template); + switch_event_destroy(&event); } + if (!dest) { goto done; } @@ -2224,7 +2242,8 @@ if (var_event) { cid_name_override = switch_event_get_header(var_event, "origination_caller_id_name"); cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number"); - if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE))) { + if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE)) || + (var = switch_event_get_header(var_event, "leg_timeout"))) { timelimit = atoi(var); } } @@ -2290,6 +2309,7 @@ switch_channel_t *new_channel = NULL; switch_event_t *params = NULL; char stupid[128] = ""; + const char *skip = NULL, *var = NULL; if (switch_strlen_zero(outbound_profile->destination_number)) { goto done; @@ -2310,6 +2330,16 @@ } + if (var_event && (skip=switch_event_get_header(var_event, "user_recurse_variables")) && switch_false(skip)) { + if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE)) || + (var = switch_event_get_header(var_event, "leg_timeout"))) { + timelimit = atoi(var); + } + var_event = NULL; + } + + + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "as_channel", "true"); @@ -2374,7 +2404,8 @@ if (session) { channel = switch_core_session_get_channel(session); - if ((var = switch_channel_get_variable(channel, SWITCH_CALL_TIMEOUT_VARIABLE))) { + if ((var = switch_channel_get_variable(channel, SWITCH_CALL_TIMEOUT_VARIABLE)) + || (var = switch_event_get_header(var_event, "leg_timeout"))) { timelimit = atoi(var); } @@ -2388,22 +2419,20 @@ if (var_event) { switch_event_dup(&event, var_event); - switch_event_del_header(event, "dialer_user"); - switch_event_del_header(event, "dialer_domain"); - if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE))) { + switch_event_del_header(event, "dialed_user"); + switch_event_del_header(event, "dialed_domain"); + if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE)) || + (var = switch_event_get_header(var_event, "leg_timeout"))) { timelimit = atoi(var); } } else { switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(event); - } - switch_assert(var_event); - - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_user", user); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_domain", domain); - d_dest = switch_event_expand_headers(event, dest); - - switch_event_destroy(&event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_user", user); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_domain", domain); + d_dest = switch_event_expand_headers(event, dest); + switch_event_destroy(&event); + } } if ((flags & SOF_FORKED_DIAL)) { Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed May 6 10:13:51 2009 @@ -1545,7 +1545,7 @@ if (originate_status[i].peer_channel) { const char *vvar; - + if ((vvar = switch_channel_get_variable(originate_status[i].peer_channel, "leg_timeout"))) { int val = atoi(vvar); if (val > 0) {

1 0