- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8119 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: anthm Date: Wed Apr 16 17:29:08 2008 New Revision: 8119 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak 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 Wed Apr 16 17:29:08 2008 @@ -1969,7 +1969,7 @@ while (mod_sofia_globals.threads) { switch_yield(1000); - if (++sanity >= 5000) { + if (++sanity >= 10000) { break; } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Apr 16 17:29:08 2008 @@ -2345,28 +2345,28 @@ sofia_profile_t *pptr; switch_mutex_lock(mod_sofia_globals.hash_mutex); - - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); - if ((pptr = (sofia_profile_t *) val) && pptr == profile) { - aliases[i++] = strdup((char *) var); - if (i == 512) { - abort(); + if (mod_sofia_globals.profile_hash) { + for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &var, NULL, &val); + if ((pptr = (sofia_profile_t *) val) && pptr == profile) { + aliases[i++] = strdup((char *) var); + if (i == 512) { + abort(); + } } } - } - for (j = 0; j < i && j < 512; j++) { - switch_core_hash_delete(mod_sofia_globals.profile_hash, aliases[j]); - free(aliases[j]); - } + for (j = 0; j < i && j < 512; j++) { + switch_core_hash_delete(mod_sofia_globals.profile_hash, aliases[j]); + free(aliases[j]); + } - for (gp = profile->gateways; gp; gp = gp->next) { - switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->name); - switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_from); - switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_contact); + for (gp = profile->gateways; gp; gp = gp->next) { + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->name); + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_from); + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_contact); + } } - switch_mutex_unlock(mod_sofia_globals.hash_mutex); }

1 0

[commit] r8118 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: brian Date: Wed Apr 16 10:12:40 2008 New Revision: 8118 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Apr 16 10:12:40 2008 @@ -141,7 +141,7 @@ <anti-action application="bind_meta_app" data="3 a a execute_extension::cf XML features"/> <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/> - <anti-action application="set" data="sip_exclude_contact=${network_addr}"/> +  <anti-action application="set" data="hangup_after_bridge=true"/>  <anti-action application="set" data="continue_on_fail=true"/>

1 0

[commit] r8117 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 16 Apr '08

16 Apr '08

Author: brian Date: Tue Apr 15 23:05:15 2008 New Revision: 8117 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: add this new option to the config commented out Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Tue Apr 15 23:05:15 2008 @@ -53,6 +53,7 @@ <param name="inbound-codec-negotiation" value="generous"/>   +   <param name="tls" value="false"/>

1 0

[commit] r8116 - freeswitch/trunk/src
by Freeswitch SVN 15 Apr '08

15 Apr '08

Author: anthm Date: Tue Apr 15 14:43:12 2008 New Revision: 8116 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Apr 15 14:43:12 2008 @@ -569,6 +569,8 @@ ok = 1; } else if (!strcasecmp((char *)hi->name, "originate_retries")) { ok = 1; + } else if (!strcasecmp((char *)hi->name, "originate_timeout")) { + ok = 1; } else if (!strcasecmp((char *)hi->name, "originate_retry_sleep_ms")) { ok = 1; } else if (!strcasecmp((char *)hi->name, "origination_caller_id_name")) { @@ -652,6 +654,13 @@ return_ring_ready = 1; } + if ((var_val = switch_event_get_header(var_event, "originate_timeout")) && switch_true(var_val)) { + int tmp = atoi(var_val); + if (tmp > 0) { + timelimit_sec = (uint32_t) tmp; + } + } + if ((var_val = switch_event_get_header(var_event, "originate_retries")) && switch_true(var_val)) { int32_t tmp; tmp = atoi(var_val);

1 0

[commit] r8115 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 15 Apr '08

15 Apr '08

Author: brian Date: Tue Apr 15 12:17:15 2008 New Revision: 8115 Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Log: fix woops Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Tue Apr 15 12:17:15 2008 @@ -10,7 +10,8 @@ <templates> <template name="sql">INSERT INTO cdr VALUES ("${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}");</template> <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec}"</template> - <template name="snom">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec},"${sip_user_agent}","${call_clientcode}","${sip_rtp_rxstat}","${sip_rtp_txstat}","${sofia_record_file}"</template> + <template name="snom">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec}","${sip_user_agent}","${call_clientcode}","${sip_rtp_rxstat}","${sip_rtp_txstat}","${sofia_record_file}"</template> <template name="asterisk">"${accountcode}","${caller_id_number}","${destination_number}","${context}","${caller_id}","${channel_name}","${bridge_channel}","${last_app}","${last_arg}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${amaflags}","${uuid}","${userfield}"</template> </templates> </configuration> +

1 0

[commit] r8114 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Apr '08

14 Apr '08

Author: mikej Date: Mon Apr 14 15:20:12 2008 New Revision: 8114 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add settings to disable timer and 100rel support by profile (MODENDP-102) Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Mon Apr 14 15:20:12 2008 @@ -34,6 +34,8 @@  <param name="sip-ip" value="$${local_ip_v4}"/> <param name="hold-music" value="$${moh_uri}"/> +  +     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 Mon Apr 14 15:20:12 2008 @@ -138,7 +138,9 @@ PFLAG_SECURE = (1 << 15), PFLAG_BLIND_AUTH = (1 << 16), PFLAG_WORKER_RUNNING = (1 << 17), - PFLAG_UNREG_OPTIONS_FAIL = (1 << 18) + PFLAG_UNREG_OPTIONS_FAIL = (1 << 18), + PFLAG_DISABLE_TIMER = (1 << 19), + PFLAG_DISABLE_100REL = (1 << 20) } PFLAGS; typedef enum { 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 Mon Apr 14 15:20:12 2008 @@ -497,6 +497,9 @@ sip_alias_node_t *node; switch_event_t *s_event; int tportlog = 0; + int use_100rel = !sofia_test_pflag(profile, PFLAG_DISABLE_100REL); + int use_timer = !sofia_test_pflag(profile, PFLAG_DISABLE_TIMER); + const char *supported = NULL; switch_mutex_lock(mod_sofia_globals.mutex); mod_sofia_globals.threads++; @@ -517,6 +520,16 @@ tportlog = 1; } + if (use_100rel && use_timer) { + supported = "100rel, precondition, timer"; + } else if (use_100rel) { + supported = "100rel, precondition"; + } else if (use_timer) { + supported = "timer, precondition"; + } else { + supported = "precondition"; + } + profile->nua = nua_create(profile->s_root, /* Event loop */ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ @@ -559,7 +572,7 @@ TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("include-session-description")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence.winfo")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("message-summary")), - SIPTAG_SUPPORTED_STR("100rel, precondition, timer"), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); + SIPTAG_SUPPORTED_STR(supported), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set params for %s\n", profile->name); @@ -579,7 +592,8 @@ NUTAG_ALLOW("INFO"), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("PUBLISH")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ENABLEMESSAGE(1)), - SIPTAG_SUPPORTED_STR("100rel, precondition"), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); + SIPTAG_SUPPORTED_STR(supported), + SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "activated db for %s\n", profile->name); @@ -1223,6 +1237,14 @@ if (switch_true(val)) { profile->pflags |= PFLAG_CHECKUSER; } + } else if (!strcasecmp(var, "enable-timer")) { + if (!switch_true(val)) { + profile->pflags |= PFLAG_DISABLE_TIMER; + } + } else if (!strcasecmp(var, "enable-100rel")) { + if (!switch_true(val)) { + profile->pflags |= PFLAG_DISABLE_100REL; + } } else if (!strcasecmp(var, "bitpacking")) { if (!strcasecmp(val, "aal2")) { profile->codec_flags = SWITCH_CODEC_FLAG_AAL2;

1 0

[commit] r8111 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Apr '08

14 Apr '08

Author: anthm Date: Mon Apr 14 13:36:09 2008 New Revision: 8111 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: code before declaration 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 Mon Apr 14 13:36:09 2008 @@ -1452,13 +1452,14 @@ nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]) { if ((profile->pflags & PFLAG_UNREG_OPTIONS_FAIL) && status != 200 && sip && sip->sip_to) { + char *sql; time_t now = switch_timestamp(NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Expire registration '%s@%s' due to options failure\n", sip->sip_to->a_url->url_user, sip->sip_to->a_url->url_host ); - char *sql = switch_mprintf("update sip_registrations set expired=%ld where sip_user='%s' and sip_host='%s'", + sql = switch_mprintf("update sip_registrations set expired=%ld where sip_user='%s' and sip_host='%s'", (long)now, sip->sip_to->a_url->url_user, sip->sip_to->a_url->url_host

1 0

[commit] r8110 - freeswitch/trunk/src
by Freeswitch SVN 14 Apr '08

14 Apr '08

Author: anthm Date: Mon Apr 14 13:30:45 2008 New Revision: 8110 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: set bracket vars before firing the CHANNEL_ORIGINATE event Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Apr 14 13:30:45 2008 @@ -826,19 +826,6 @@ peer_channels[i] = switch_core_session_get_channel(new_session); switch_channel_set_flag(peer_channels[i], CF_ORIGINATING); - 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); - switch_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; @@ -857,6 +844,19 @@ } } + 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); + switch_assert(event); + switch_channel_event_set_data(peer_channels[i], event); + switch_event_fire(&event); + } + if (!table) { table = &originate_state_handlers; }

1 0

[commit] r8109 - freeswitch/trunk/src
by Freeswitch SVN 14 Apr '08

14 Apr '08

Author: mikej Date: Mon Apr 14 13:24:52 2008 New Revision: 8109 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: re-set the sound prefix back to nothing after a phrase if it wasn't set before. (MODAPP-84) 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 Mon Apr 14 13:24:52 2008 @@ -176,10 +176,10 @@ } if (sound_path) { - if ((old_sound_prefix = switch_channel_get_variable(channel, "sound_prefix"))) { - char *p = switch_core_session_strdup(session, old_sound_prefix); - old_sound_prefix = p; - } + char *p; + old_sound_prefix = switch_str_nil(switch_channel_get_variable(channel, "sound_prefix")); + p = switch_core_session_strdup(session, old_sound_prefix); + old_sound_prefix = p; switch_channel_set_variable(channel, "sound_prefix", sound_path); }

1 0

[commit] r8108 - freeswitch/trunk/src
by Freeswitch SVN 14 Apr '08

14 Apr '08

Author: anthm Date: Mon Apr 14 13:12:42 2008 New Revision: 8108 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: vars to execute app before bridge (FSCORE-114) Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Apr 14 13:12:42 2008 @@ -689,20 +689,6 @@ switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_VARIABLE, switch_core_session_get_uuid(peer_session)); switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_VARIABLE, switch_core_session_get_uuid(session)); - if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_app"))) { - data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_data"); - if ((application_interface = switch_loadable_module_get_application_interface(app))) { - switch_core_session_exec(session, application_interface, data); - } - } - - if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_app"))) { - data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_data"); - if ((application_interface = switch_loadable_module_get_application_interface(app))) { - switch_core_session_exec(peer_session, application_interface, data); - } - } - if (!(switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA))) { if ((status = switch_ivr_wait_for_answer(session, peer_session)) != SWITCH_STATUS_SUCCESS) { switch_channel_state_t w_state = switch_channel_get_state(caller_channel); @@ -752,6 +738,20 @@ switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(session)); switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(session)); + if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_app"))) { + data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_data"); + if ((application_interface = switch_loadable_module_get_application_interface(app))) { + switch_core_session_exec(session, application_interface, data); + } + } + + if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_app"))) { + data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_data"); + if ((application_interface = switch_loadable_module_get_application_interface(app))) { + switch_core_session_exec(peer_session, application_interface, data); + } + } + switch_channel_set_private(peer_channel, "_bridge_", b_leg); switch_channel_set_state(peer_channel, CS_LOOPBACK); audio_bridge_thread(NULL, (void *) a_leg);

1 0