- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8051 - freeswitch/trunk/src
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: anthm Date: Mon Apr 7 15:35:51 2008 New Revision: 8051 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: fix var condition in macros 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 7 15:35:51 2008 @@ -176,7 +176,10 @@ } if (sound_path) { - old_sound_prefix = switch_channel_get_variable(channel, "sound_prefix"); + 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; + } switch_channel_set_variable(channel, "sound_prefix", sound_path); } @@ -747,6 +750,7 @@ prefix = SWITCH_GLOBAL_dirs.base_dir; } + if (!strstr(file, SWITCH_URL_SEPARATOR)) { if (!switch_is_file_path(file)) { file = switch_core_session_sprintf(session, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, file);

1 0

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

07 Apr '08

Author: anthm Date: Mon Apr 7 15:35:30 2008 New Revision: 8050 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: tweak 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 7 15:35:30 2008 @@ -2471,9 +2471,9 @@ switch_channel_set_variable(channel, port_var, port); if (host) { if (user) { - uri = switch_core_session_sprintf(session, "%s@%s:%s", user, host, new_port); + uri = switch_core_session_sprintf(session, "%s@%s%s", user, host, new_port); } else { - uri = switch_core_session_sprintf(session, "%s:%s", host, new_port); + uri = switch_core_session_sprintf(session, "%s%s", host, new_port); } switch_channel_set_variable(channel, uri_var, uri); switch_channel_set_variable(channel, host_var, host);

1 0

[commit] r8049 - freeswitch/trunk/conf/lang/en/demo
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: brian Date: Mon Apr 7 15:14:19 2008 New Revision: 8049 Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Log: tweak Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Mon Apr 7 15:14:19 2008 @@ -54,7 +54,7 @@ <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/9.wav"/> - <action function="execute" data="sleep(6000)"/> + <action function="execute" data="sleep(2000)"/> </match> </input> </macro> @@ -106,7 +106,7 @@ <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/9.wav"/> - <action function="execute" data="sleep(6000)"/> + <action function="execute" data="sleep(2000)"/> </match> </input> </macro>

1 0

[commit] r8048 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: mikej Date: Mon Apr 7 13:06:56 2008 New Revision: 8048 Modified: freeswitch/trunk/libs/sofia-sip/.update Log: bump Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon Apr 7 13:06:56 2008 @@ -1 +1 @@ -Fri Apr 4 13:39:32 EDT 2008 +Mon Apr 7 13:06:49 EDT 2008

1 0

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

07 Apr '08

Author: anthm Date: Mon Apr 7 13:06:44 2008 New Revision: 8047 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: send 503 instead of 480 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 7 13:06:44 2008 @@ -2509,7 +2509,7 @@ if (sess_count >= sess_max || !(profile->pflags & PFLAG_RUNNING)) { - nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); + nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); return; } @@ -2557,7 +2557,7 @@ if (!sofia_endpoint_interface || !(session = switch_core_session_request(sofia_endpoint_interface, NULL))) { - nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); + nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); return; } @@ -3005,7 +3005,7 @@ nua_handle_bind(nh, NULL); free(tech_pvt->sofia_private); switch_core_session_destroy(&session); - nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); + nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); } void sofia_handle_sip_i_options(int status,

1 0

[commit] r8046 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: mikej Date: Mon Apr 7 13:05:41 2008 New Revision: 8046 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: Mon Apr 7 13:01:00 EDT 2008 Pekka.Pessi(a)nokia.com * nua_session.c: if timer is Require'd default to local refresher if Session-Expires has no refresher parameter Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Mon Apr 7 13:05:41 2008 @@ -4168,6 +4168,10 @@ else if (strcasecmp(x->x_refresher, "uas") == 0) t->remote.refresher = uas ? nua_local_refresher : nua_remote_refresher; } + else if (t->remote.require) { + /* Require: timer but no refresher parameter in Session-Expires header */ + t->remote.refresher = nua_local_refresher; + } } if (sip->sip_min_se)

1 0

[commit] r8044 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: brian Date: Mon Apr 7 12:05:17 2008 New Revision: 8044 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: fix ivr name Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Apr 7 12:05:17 2008 @@ -199,7 +199,7 @@  <extension name="ivr_demo"> <condition field="destination_number" expression="5000"> - <action application="ivr" data="demo"/> + <action application="ivr" data="demo_ivr"/> </condition> </extension>

1 0

[commit] r8043 - freeswitch/trunk/conf/lang/en/vm
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: brian Date: Mon Apr 7 12:04:52 2008 New Revision: 8043 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml Log: spelling error Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Mon Apr 7 12:04:52 2008 @@ -215,7 +215,7 @@ <input pattern="^(.*)$"> <match> <action function="say" data="$1" method="pronounced" type="name_spelled"/> - <action function="play-file" data="voicemail/vm-not_avaliable.wav"/> + <action function="play-file" data="voicemail/vm-not_available.wav"/> </match> </input> </macro>

1 0

[commit] r8042 - freeswitch/trunk/conf
by Freeswitch SVN 07 Apr '08

07 Apr '08

Author: brian Date: Mon Apr 7 11:20:41 2008 New Revision: 8042 Modified: freeswitch/trunk/conf/vars.xml Log: set sounds path in here Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Apr 7 11:20:41 2008 @@ -1,6 +1,7 @@  + <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/> <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> <X-PRE-PROCESS cmd="set" data="moh_uri=local_stream://moh"/> <!-- xmpp_client_profile and xmpp_server_profile

1 0

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

07 Apr '08

Author: anthm Date: Mon Apr 7 10:03:10 2008 New Revision: 8041 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update 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 7 10:03:10 2008 @@ -2438,6 +2438,7 @@ const char *user = NULL, *host = NULL, *port = NULL; char *uri = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); + char new_port[25] = ""; if (url) { user = url->url_user; @@ -2462,16 +2463,17 @@ switch_channel_set_variable(channel, user_var, user); } - if (!port) { - port = SOFIA_DEFAULT_PORT; + + if (port) { + switch_snprintf(new_port, sizeof(new_port), ":%s", port); } switch_channel_set_variable(channel, port_var, port); if (host) { if (user) { - uri = switch_core_session_sprintf(session, "%s@%s:%s", user, host, port); + uri = switch_core_session_sprintf(session, "%s@%s:%s", user, host, new_port); } else { - uri = switch_core_session_sprintf(session, "%s:%s", host, port); + uri = switch_core_session_sprintf(session, "%s:%s", host, new_port); } switch_channel_set_variable(channel, uri_var, uri); switch_channel_set_variable(channel, host_var, host); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Apr 7 10:03:10 2008 @@ -1173,6 +1173,7 @@ if (contact) { char *port = (char *) contact->m_url->url_port; + char new_port[25] = ""; display = contact->m_display; @@ -1187,15 +1188,15 @@ display = "\"user\""; } - if (!port) { - port = SOFIA_DEFAULT_PORT; + if (port) { + switch_snprintf(new_port, sizeof(new_port), ":%s", port); } - + if (contact->m_url->url_params) { - contact_str = switch_mprintf("%s <sip:%s@%s:%s;%s>", - display, contact->m_url->url_user, contact->m_url->url_host, port, contact->m_url->url_params); + contact_str = switch_mprintf("%s <sip:%s@%s%s;%s>", + display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params); } else { - contact_str = switch_mprintf("%s <sip:%s@%s:%s>", display, contact->m_url->url_user, contact->m_url->url_host, port); + contact_str = switch_mprintf("%s <sip:%s@%s%s>", display, contact->m_url->url_user, contact->m_url->url_host, new_port); } } 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 7 10:03:10 2008 @@ -403,6 +403,7 @@ if (contact->m_url) { const char *port = contact->m_url->url_port; + char new_port[25] = ""; display = contact->m_display; if (switch_strlen_zero(display)) { @@ -414,15 +415,15 @@ } } - if (!port) { - port = SOFIA_DEFAULT_PORT; + if (port) { + switch_snprintf(new_port, sizeof(new_port), ":%s", port); } if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%s;%s>", - display, contact->m_url->url_user, contact->m_url->url_host, port, contact->m_url->url_params); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s>", + display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%s>", display, contact->m_url->url_user, contact->m_url->url_host, port); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s>", display, contact->m_url->url_user, contact->m_url->url_host, new_port); } }

1 0