September 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r9712 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 20:49:34 2008 New Revision: 9712 Modified: freeswitch/trunk/conf/sip_profiles/external.xml Log: translate the multi domain setup to the external profile to traverse the directory and register all gateways in the directory from ALL domains. Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Sun Sep 28 20:49:34 2008 @@ -11,7 +11,7 @@ </aliases> <domains> - <domain name="$${domain}" parse="true"/> + <domain name="all" alias="false" parse="true"/> </domains> <settings>

1 0

[Freeswitch-svn] [commit] r9711 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 20:39:07 2008 New Revision: 9711 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: clarify to match other code 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 Sun Sep 28 20:39:07 2008 @@ -976,7 +976,8 @@ if (sofia_glue_add_profile(switch_core_strdup(profile->pool, dname), profile) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding Alias [%s] for profile [%s]\n", dname, profile->name); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding Alias [%s] for profile [%s] (name in use)\n", dname, profile->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Alias [%s] for profile [%s] (already exists)\n", + dname, profile->name); } }

1 0

[Freeswitch-svn] [commit] r9710 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 20:34:02 2008 New Revision: 9710 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: more tweaks Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Sun Sep 28 20:34:02 2008 @@ -51,7 +51,7 @@ <param name="apply-inbound-acl" value="domains"/>   - <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> + <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${target_domain}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>  <param name="manage-presence" value="true"/>

1 0

[Freeswitch-svn] [commit] r9709 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 20:31:35 2008 New Revision: 9709 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: more goodies Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Sun Sep 28 20:31:35 2008 @@ -2,7 +2,6 @@ <profile name="internal">  <aliases> - <alias name="$${domain}"/> <alias name="default"/> </aliases>  @@ -15,6 +14,7 @@    + <domain name="all" alias="true" parse="false"/> </domains> <settings>

1 0

[Freeswitch-svn] [commit] r9708 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 28 Sep '08

28 Sep '08

Author: brian Date: Sun Sep 28 19:36:22 2008 New Revision: 9708 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Log: more tweaks Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Sep 28 19:36:22 2008 @@ -17,9 +17,10 @@ --> <extension name="set_domain" continue="true"> <condition field="${target_domain}" expression="^$" break="never"/> - <condition field="source" expression="mod_sofia" break="never"> - <action application="set" data="target_domain=${sip_auth_realm}"/> - <anti-action application="set" data="target_domain=$${domain}"/> + <condition field="source" expression="mod_sofia" break="never"/> + <condition field="${sip_auth_realm}" expression="^$" break="never"> + <action application="set" data="target_domain=$${domain}"/> + <anti-action application="set" data="target_domain=${sip_auth_realm}"/> </condition> </extension> @@ -79,13 +80,14 @@ </extension>  +   Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Sun Sep 28 19:36:22 2008 @@ -14,12 +14,13 @@ <condition field="${target_domain}" expression="^$" break="never"/> <condition field="source" expression="mod_sofia" break="never"/> <condition field="${sip_req_params}" expression="target_domain=([A-Z-a-z0-9.]+)" break="never"> - <action application="set" data="target_domain=$1"/> - <anti-action application="set" data="target_domain=$${domain}"/> +  + <action application="export" data="target_domain=$1"/> + <anti-action application="export" data="target_domain=$${domain}"/> </condition> </extension> - <extension name="call_debug"> + <extension name="call_debug" continue="true"> <condition field="${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition>

1 0

[Freeswitch-svn] [commit] r9707 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 28 Sep '08

28 Sep '08

Author: brian Date: Sun Sep 28 19:13:32 2008 New Revision: 9707 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: make conferences multi domain and the dialed_ext to dialed_extension because we have the bytes lets use them Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Sep 28 19:13:32 2008 @@ -163,13 +163,13 @@ <extension name="extension-intercom">  <condition field="destination_number" expression="^8(10[01][0-9])$"> - <action application="set" data="dialed_ext=$1"/> + <action application="set" data="dialed_extension=$1"/>   <action application="export"><![CDATA[sip_h_Call-Info=<sip:${target_domain}>;answer-after=0]]></action> <action application="export" data="sip_invite_params=intercom=true"/> <action application="export" data="sip_auto_answer=true"/> - <action application="bridge" data="user/${dialed_ext}@${target_domain}"/> + <action application="bridge" data="user/${dialed_extension}@${target_domain}"/> </condition> </extension> @@ -182,14 +182,14 @@ --> <extension name="Local_Extension"> <condition field="destination_number" expression="^(10[01][0-9])$"> - <action application="set" data="dialed_ext=$1"/> - <action application="export" data="dialed_ext=$1"/> + <action application="set" data="dialed_extension=$1"/> + <action application="export" data="dialed_extension=$1"/> </condition> <condition field="destination_number" expression="^${caller_id_number}$"> <action application="set" data="voicemail_authorized=${sip_authorized}"/> <action application="answer"/> <action application="sleep" data="1000"/> - <action application="voicemail" data="check default ${target_domain} ${dialed_ext}"/> + <action application="voicemail" data="check default ${target_domain} ${dialed_extension}"/>  <anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/> <anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> @@ -200,13 +200,13 @@ <anti-action application="set" data="hangup_after_bridge=true"/>  <anti-action application="set" data="continue_on_fail=true"/> - <anti-action application="db" data="insert/${target_domain}-call_return/${dialed_ext}/${caller_id_number}"/> - <anti-action application="db" data="insert/${target_domain}-last_dial_ext/${dialed_ext}/${uuid}"/> - <anti-action application="bridge" data="user/${dialed_ext}@${target_domain}"/> + <anti-action application="db" data="insert/${target_domain}-call_return/${dialed_extension}/${caller_id_number}"/> + <anti-action application="db" data="insert/${target_domain}-last_dial_ext/${dialed_extension}/${uuid}"/> + <anti-action application="bridge" data="user/${dialed_extension}@${target_domain}"/> <anti-action application="answer"/> -  +  <anti-action application="sleep" data="1000"/> - <anti-action application="voicemail" data="default ${target_domain} ${dialed_ext}"/> + <anti-action application="voicemail" data="default ${target_domain} ${dialed_extension}"/> </condition> </extension> @@ -224,7 +224,7 @@ <condition field="destination_number" expression="^(30\d{2})$"> <action application="answer"/>  - <action application="conference" data="$1@default"/> + <action application="conference" data="$1-${target_domain}@default"/> </condition> </extension> @@ -232,7 +232,7 @@ <condition field="destination_number" expression="^(31\d{2})$"> <action application="answer"/>  - <action application="conference" data="$1@wideband"/> + <action application="conference" data="$1-${target_domain}@wideband"/> </condition> </extension> @@ -240,7 +240,7 @@ <condition field="destination_number" expression="^(32\d{2})$"> <action application="answer"/>  - <action application="conference" data="$1@ultrawideband"/> + <action application="conference" data="$1-${target_domain}@ultrawideband"/> </condition> </extension>

1 0

[Freeswitch-svn] [commit] r9706 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 28 Sep '08

28 Sep '08

Author: brian Date: Sun Sep 28 19:07:37 2008 New Revision: 9706 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: add more info Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Sep 28 19:07:37 2008 @@ -9,7 +9,12 @@ <action application="deflect" data="${destination_number}"/> </condition> </extension> + +  <extension name="set_domain" continue="true"> <condition field="${target_domain}" expression="^$" break="never"/> <condition field="source" expression="mod_sofia" break="never">

1 0

[Freeswitch-svn] [commit] r9705 - in freeswitch/trunk/conf: dialplan directory/default
by Freeswitch SVN 28 Sep '08

28 Sep '08

Author: brian Date: Sun Sep 28 19:00:04 2008 New Revision: 9705 Modified: freeswitch/trunk/conf/dialplan/public.xml freeswitch/trunk/conf/directory/default/asterlink.com.noload freeswitch/trunk/conf/directory/default/ideasip.com.noload freeswitch/trunk/conf/directory/default/intelefone.net.noload freeswitch/trunk/conf/directory/default/pulver.com.noload freeswitch/trunk/conf/directory/default/sip.broadvoice.com.noload freeswitch/trunk/conf/directory/default/sipphone.com.noload freeswitch/trunk/conf/directory/default/voipuser.org.noload Log: more config goodies Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Sun Sep 28 19:00:04 2008 @@ -9,6 +9,22 @@ </condition> </extension> +  + <extension name="set_domain" continue="true"> + <condition field="${target_domain}" expression="^$" break="never"/> + <condition field="source" expression="mod_sofia" break="never"/> + <condition field="${sip_req_params}" expression="target_domain=([A-Z-a-z0-9.]+)" break="never"> + <action application="set" data="target_domain=$1"/> + <anti-action application="set" data="target_domain=$${domain}"/> + </condition> + </extension> + + <extension name="call_debug"> + <condition field="${call_debug}" expression="^true$" break="never"> + <action application="info"/> + </condition> + </extension> + <extension name="public_extensions"> <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="transfer" data="$1 XML default"/> Modified: freeswitch/trunk/conf/directory/default/asterlink.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/asterlink.com.noload (original) +++ freeswitch/trunk/conf/directory/default/asterlink.com.noload Sun Sep 28 19:00:04 2008 @@ -10,7 +10,8 @@ <param name="from-domain" value="asterlink.com"/> <param name="expire-seconds" value="600"/> <param name="register" value="true"/> - <param name="retry_seconds" value="30"/> + <param name="retry-seconds" value="30"/> + <param name="contact-params" value="target_domain=$${domain}"/> <param name="extension" value="%ALEXTENSION%"/> <param name="context" value="public"/> </gateway> Modified: freeswitch/trunk/conf/directory/default/ideasip.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/ideasip.com.noload (original) +++ freeswitch/trunk/conf/directory/default/ideasip.com.noload Sun Sep 28 19:00:04 2008 @@ -8,7 +8,7 @@ <param name="password" value="%ISPASSWORD%"/> <param name="expire-seconds" value="600"/> <param name="register" value="true"/> - <param name="retry_seconds" value="30"/> + <param name="retry-seconds" value="30"/> <param name="extension" value="%ISEXTENSION%"/> <param name="context" value="public"/> </gateway> Modified: freeswitch/trunk/conf/directory/default/intelefone.net.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/intelefone.net.noload (original) +++ freeswitch/trunk/conf/directory/default/intelefone.net.noload Sun Sep 28 19:00:04 2008 @@ -12,7 +12,7 @@ <param name="register" value="true"/> <param name="proxy" value="sip.intelefone.net"/> <param name="register-proxy" value="sip.intelefone.net"/> - <param name="retry_seconds" value="30"/> + <param name="retry-seconds" value="30"/> <param name="extension" value="%%USERNAME%%"/> <param name="context" value="public"/> </gateway> Modified: freeswitch/trunk/conf/directory/default/pulver.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/pulver.com.noload (original) +++ freeswitch/trunk/conf/directory/default/pulver.com.noload Sun Sep 28 19:00:04 2008 @@ -8,7 +8,7 @@ <param name="password" value="%FWDPASSWORD%"/> <param name="expire-seconds" value="600"/> <param name="register" value="true"/> - <param name="retry_seconds" value="30"/> + <param name="retry-seconds" value="30"/> <param name="extension" value="%FWDEXTENSION%"/> <param name="context" value="public"/> </gateway> Modified: freeswitch/trunk/conf/directory/default/sip.broadvoice.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/sip.broadvoice.com.noload (original) +++ freeswitch/trunk/conf/directory/default/sip.broadvoice.com.noload Sun Sep 28 19:00:04 2008 @@ -21,7 +21,7 @@  <param name="register" value="true"/>  - <param name="retry_seconds" value="3600"/> + <param name="retry-seconds" value="3600"/>   </gateway> 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 Sun Sep 28 19:00:04 2008 @@ -8,7 +8,7 @@ <param name="password" value="%SPPASSWORD%"/> <param name="expire-seconds" value="600"/> <param name="register" value="true"/> - <param name="retry_seconds" value="5"/> + <param name="retry-seconds" value="5"/> <param name="extension" value="%SPEXTENSION%"/> <param name="context" value="public"/> </gateway> Modified: freeswitch/trunk/conf/directory/default/voipuser.org.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/voipuser.org.noload (original) +++ freeswitch/trunk/conf/directory/default/voipuser.org.noload Sun Sep 28 19:00:04 2008 @@ -8,7 +8,7 @@ <param name="password" value="%VUPASSWORD%"/> <param name="expire-seconds" value="600"/> <param name="register" value="true"/> - <param name="retry_seconds" value="30"/> + <param name="retry-seconds" value="30"/> <param name="extension" value="%VUEXTENSION%"/> <param name="context" value="public"/> </gateway>

1 0

[Freeswitch-svn] [commit] r9704 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Sep '08

28 Sep '08

Author: brian Date: Sun Sep 28 18:32:36 2008 New Revision: 9704 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: we use a semicolon for contact params instead of the ampersand. 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 Sun Sep 28 18:32:36 2008 @@ -924,9 +924,9 @@ register_transport = (char *) sofia_glue_transport2str(gateway->register_transport); if (contact_params) { if (*contact_params == ';') { - params = switch_core_sprintf(gateway->pool, "%s&transport=%s", contact_params, register_transport); + params = switch_core_sprintf(gateway->pool, "%s;transport=%s", contact_params, register_transport); } else { - params = switch_core_sprintf(gateway->pool, ";%s&transport=%s", contact_params, register_transport); + params = switch_core_sprintf(gateway->pool, ";%s;transport=%s", contact_params, register_transport); } } else { params = switch_core_sprintf(gateway->pool, ";transport=%s", register_transport);

1 0

[Freeswitch-svn] [commit] r9703 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Sep '08

28 Sep '08

Author: anthm Date: Sun Sep 28 17:36:39 2008 New Revision: 9703 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: append -1 .. -N postfix after any X-headers as vars that have the same name 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 Sun Sep 28 17:36:39 2008 @@ -3836,10 +3836,22 @@ } } else if (!strncasecmp(un->un_name, "X-", 2) || !strncasecmp(un->un_name, "P-", 2)) { if (!switch_strlen_zero(un->un_value)) { - char *new_name; - if ((new_name = switch_mprintf("%s%s", SOFIA_SIP_HEADER_PREFIX, un->un_name))) { + char new_name[512] = ""; + int reps = 0; + for(;;) { + char postfix[25] = ""; + if (reps > 0) { + switch_snprintf(postfix, sizeof(postfix), "-%d", reps); + } + reps++; + switch_snprintf(new_name, sizeof(new_name), "%s%s%s", SOFIA_SIP_HEADER_PREFIX, un->un_name, postfix); + + if (switch_channel_get_variable(channel, new_name)) { + continue; + } + switch_channel_set_variable(channel, new_name, un->un_value); - free(new_name); + break; } } }

1 0