April 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

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

14 Apr '08

Author: anthm Date: Mon Apr 14 12:52:30 2008 New Revision: 8107 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: doh doh 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 12:52:30 2008 @@ -1458,7 +1458,7 @@ sip->sip_to->a_url->url_host ); - char *sql = switch_mprintf("update sip_registratons set expired=%ld where sip_user='%s' and sip_host='%s'", + char *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] r8106 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Apr '08

14 Apr '08

Author: anthm Date: Mon Apr 14 12:29:56 2008 New Revision: 8106 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: doh 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 Apr 14 12:29:56 2008 @@ -228,7 +228,6 @@ void sofia_reg_check_expire(sofia_profile_t *profile, time_t now) { char sql[1024]; - char *psql = sql; #ifdef SWITCH_HAVE_ODBC if (profile->odbc_dsn) { @@ -265,17 +264,15 @@ switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0"); } - sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, psql, NULL); - switch_safe_free(psql); - + sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); + if (now) { switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and expires <= %ld", (long) now); } else { switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0"); } - sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, psql, NULL); - switch_safe_free(psql); + sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); if (now) { switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and expires <= %ld", (long) now); @@ -283,8 +280,8 @@ switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0"); } - sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, psql, NULL); - switch_safe_free(psql); + sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); + if (now) { switch_snprintf(sql, sizeof(sql), "select * from sip_registrations where status like '%%NATHACK%%'");

1 0

[commit] r8105 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 14 Apr '08

14 Apr '08

Author: anthm Date: Mon Apr 14 12:18:49 2008 New Revision: 8105 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: avoid little race 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 Apr 14 12:18:49 2008 @@ -852,10 +852,11 @@ acs->arg = switch_core_strdup(acs->pool, arg); } acs->bg = 1; + switch_threadattr_create(&thd_attr, acs->pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, api_exec, acs, acs->pool); + if ((uuid_str = switch_event_get_header(event, "job-uuid"))) { switch_copy_string(acs->uuid_str, uuid_str, sizeof(acs->uuid_str)); } else { @@ -863,6 +864,8 @@ switch_uuid_format(acs->uuid_str, &uuid); } switch_snprintf(reply, reply_len, "+OK Job-UUID: %s", acs->uuid_str); + + switch_thread_create(&thread, thd_attr, api_exec, acs, acs->pool); return SWITCH_STATUS_SUCCESS; } else if (!strncasecmp(cmd, "log", 3)) {

1 0

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

14 Apr '08

Author: anthm Date: Mon Apr 14 12:10:18 2008 New Revision: 8104 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add sip: to nua_options call for nathack thing 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 Apr 14 12:10:18 2008 @@ -175,7 +175,7 @@ char *contact = NULL; char to[128] = ""; - switch_snprintf(to, sizeof(to), "%s@%s", argv[1], argv[2]); + switch_snprintf(to, sizeof(to), "sip:%s@%s", argv[1], argv[2]); contact = sofia_glue_get_url_from_contact(argv[3], 1); nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END());

1 0

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

14 Apr '08

Author: mikej Date: Mon Apr 14 11:55:37 2008 New Revision: 8103 Modified: freeswitch/trunk/src/switch_ivr.c Log: try to avoid internal routing loops. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Apr 14 11:55:37 2008 @@ -934,6 +934,20 @@ switch_core_session_t *other_session; switch_channel_t *other_channel = NULL; const char *uuid = NULL; + const char *max_forwards; + const char *forwardvar = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); + int forwardval = 70; + + if (!switch_strlen_zero(forwardvar)) { + forwardval = atoi(forwardvar) - 1; + } + if (forwardval <= 0) { + switch_channel_hangup(channel, SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR); + return SWITCH_STATUS_FALSE; + } + + max_forwards = switch_core_session_sprintf(session, "%d", forwardval); + switch_channel_set_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); switch_core_session_reset(session, SWITCH_TRUE); switch_channel_clear_flag(channel, CF_ORIGINATING);

1 0

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

14 Apr '08

Author: anthm Date: Mon Apr 14 11:28:07 2008 New Revision: 8102 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add unregister-on-options-fail 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 11:28:07 2008 @@ -138,6 +138,7 @@ PFLAG_SECURE = (1 << 15), PFLAG_BLIND_AUTH = (1 << 16), PFLAG_WORKER_RUNNING = (1 << 17), + PFLAG_UNREG_OPTIONS_FAIL = (1 << 18) } 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 11:28:07 2008 @@ -61,6 +61,9 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]); +static void sofia_handle_sip_r_options(switch_core_session_t *session, int status, + char const *phrase, + nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]); void sofia_handle_sip_r_notify(switch_core_session_t *session, int status, char const *phrase, @@ -274,9 +277,11 @@ case nua_r_invite: sofia_handle_sip_r_invite(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; + case nua_r_options: + sofia_handle_sip_r_options(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); + break; case nua_r_get_params: case nua_r_unregister: - case nua_r_options: case nua_i_fork: case nua_r_info: case nua_r_bye: @@ -1152,6 +1157,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; } + } else if (!strcasecmp(var, "unregister-on-options-fail")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_UNREG_OPTIONS_FAIL; + } } else if (!strcasecmp(var, "require-secure-rtp")) { if (switch_true(val)) { profile->pflags |= PFLAG_SECURE; @@ -1438,6 +1447,27 @@ return status; } +static void sofia_handle_sip_r_options(switch_core_session_t *session, int status, + char const *phrase, + 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) { + 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_registratons 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 + ); + sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); + } +} + + static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[])

1 0

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

14 Apr '08

Author: anthm Date: Mon Apr 14 11:07:43 2008 New Revision: 8101 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: execute sql inline to avoid race 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 Apr 14 11:07:43 2008 @@ -264,19 +264,27 @@ } else { switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0"); } - sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE); + + sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, psql, NULL); + switch_safe_free(psql); + if (now) { switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and expires <= %ld", (long) now); } else { switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0"); } - sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE); + + sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, psql, NULL); + switch_safe_free(psql); + if (now) { switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and expires <= %ld", (long) now); } else { switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0"); } - sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE); + + sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, psql, NULL); + switch_safe_free(psql); if (now) { switch_snprintf(sql, sizeof(sql), "select * from sip_registrations where status like '%%NATHACK%%'");

1 0