- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6592 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 12:22:08 2007 New Revision: 6592 Modified: freeswitch/trunk/conf/autoload_configs/enum.conf.xml Log: tweak Modified: freeswitch/trunk/conf/autoload_configs/enum.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/enum.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/enum.conf.xml Mon Dec 10 12:22:08 2007 @@ -6,7 +6,7 @@ </settings> <routes> - <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/$${sip_profile}/$1"/> + <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/${use_profile}/$1"/> <route service="E2U+IAX2" regex="iax2:(.*)" replace="iax/$1"/> <route service="E2U+XMPP" regex="XMPP:(.*)" replace="dingaling/$${xmpp_server_profile}/$1"/> </routes>

1 0

[commit] r6591 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 12:11:31 2007 New Revision: 6591 Added: freeswitch/trunk/conf/sip_profiles/outbound.xml Log: update Added: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Mon Dec 10 12:11:31 2007 @@ -0,0 +1,30 @@ +<profile name="outbound"> +  + <gateways> + <X-PRE-PROCESS cmd="include" data="outbound/*.xml"/> + </gateways> + + <domains> + <domain name="$${domain}" parse="true"/> + </domains> + + <settings> + <param name="debug" value="1"/> + <param name="rfc2833-pt" value="101"/> + <param name="sip-port" value="5080"/> + <param name="dialplan" value="XML"/> + <param name="context" value="public"/> + <param name="dtmf-duration" value="100"/> + <param name="codec-prefs" value="$${global_codec_prefs}"/> + <param name="use-rtp-timer" value="true"/> + <param name="rtp-timer-name" value="soft"/> + <param name="manage-presence" value="true"/> + <param name="inbound-codec-negotiation" value="generous"/> + <param name="nonce-ttl" value="60"/> + <param name="auth-calls" value="false"/> + <param name="rtp-ip" value="$${local_ip_v4}"/> + <param name="sip-ip" value="$${local_ip_v4}"/> + <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> + <param name="ext-sip-ip" value="$${external_sip_ip}"/> + </settings> +</profile>

1 0

[commit] r6590 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 11:50:50 2007 New Revision: 6590 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Mon Dec 10 11:50:50 2007 @@ -432,7 +432,7 @@ char *name = NULL; enum_query_t query = { 0 }; enum dns_type l_qtyp = DNS_T_NAPTR; - int i = 0, abs = 0; + int i = 0, abs = 0, j = 0; dns_socket fd = (dns_socket) - 1; fd_set fds; struct timeval tv = { 0 }; @@ -489,7 +489,7 @@ FD_ZERO(&fds); now = 0; - while ((i = dns_timeouts(nctx, globals.timeout, now)) > 0) { + while ((i = dns_timeouts(nctx, 1, now)) > 0) { #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable: 4389 4127) @@ -498,6 +498,13 @@ #ifdef _MSC_VER #pragma warning(pop) #endif + + j += i; + + if (j > globals.timeout || query.results) { + break; + } + tv.tv_sec = i; tv.tv_usec = 0; i = select((int) (fd + 1), &fds, 0, 0, &tv);

1 0

[commit] r6589 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: trixter Date: Mon Dec 10 11:39:51 2007 New Revision: 6589 Modified: freeswitch/trunk/scripts/contrib/trixter/disa.js Log: fix cherebrum provided Modified: freeswitch/trunk/scripts/contrib/trixter/disa.js ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/disa.js (original) +++ freeswitch/trunk/scripts/contrib/trixter/disa.js Mon Dec 10 11:39:51 2007 @@ -199,7 +199,8 @@ Bleg.setCallerData("caller_id_number",CLID_num); } - Bleg.originate(session,dialprefix+destnum+dialpostfix,timeout); + session.execute("transfer",destnum); + // Bleg.originate(session,dialprefix+destnum+dialpostfix,timeout); bridge(session,Bleg); }

1 0

[commit] r6588 - freeswitch/trunk/src
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 11:27:48 2007 New Revision: 6588 Modified: freeswitch/trunk/src/switch_regex.c Log: fix offset in regex expansion Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Mon Dec 10 11:27:48 2007 @@ -109,6 +109,7 @@ ovector, /* vector of integers for substring information */ olen); /* number of elements (NOT size in bytes) */ + if (match_count <= 0) { switch_regex_safe_free(re); match_count = 0; @@ -145,7 +146,12 @@ } index[z++] = '\0'; z = 0; - num = atoi(index); + if (match_count > 1) { + int offset = match_count - 2; + num = atoi(index) + offset; + } else { + num = atoi(index); + } if (pcre_copy_substring(field_data, ovector, match_count, num, replace, sizeof(replace)) > 0) { switch_size_t r;

1 0

[commit] r6587 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Sun Dec 9 23:58:51 2007 New Revision: 6587 Modified: freeswitch/trunk/conf/sip_profiles/nat.xml Log: gizmo and fwd work now grrr. Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Sun Dec 9 23:58:51 2007 @@ -2,6 +2,12 @@ <gateways> <X-PRE-PROCESS cmd="include" data="nat/*.xml"/> </gateways> + + <domains> +  +  + </domains> + <settings> <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> @@ -12,12 +18,13 @@ <param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> - <param name="rtp-ip" value="$${local_ip_v4}"/> - <param name="sip-ip" value="$${local_ip_v4}"/> <param name="manage-presence" value="true"/> <param name="inbound-codec-negotiation" value="generous"/> <param name="nonce-ttl" value="60"/> - <param name="auth-calls" value="true"/> + <param name="auth-calls" value="false"/> + <param name="rtp-ip" value="$${local_ip_v4}"/> + <param name="sip-ip" value="$${local_ip_v4}"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> + <param name="ext-sip-ip" value="$${external_sip_ip}"/> </settings> </profile>

1 0

[commit] r6586 - freeswitch/trunk/conf/sip_profiles/nat
by Freeswitch SVN 09 Dec '07

09 Dec '07

Author: brian Date: Sat Dec 8 23:49:28 2007 New Revision: 6586 Added: freeswitch/trunk/conf/sip_profiles/nat/example.xml Log: example for nat profile Added: freeswitch/trunk/conf/sip_profiles/nat/example.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/nat/example.xml Sat Dec 8 23:49:28 2007 @@ -0,0 +1,34 @@ +<include> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +</include>

1 0

[commit] r6585 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 08 Dec '07

08 Dec '07

Author: brian Date: Sat Dec 8 15:32:33 2007 New Revision: 6585 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: cleanup Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sat Dec 8 15:32:33 2007 @@ -121,9 +121,9 @@ "default" conference profile in conference.conf.xml --> <extension name="Conferences"> - <condition field="destination_number" expression="^(3\d{3})$"> - <action application="conference" data="$1@default"/> - </condition> + <condition field="destination_number" expression="^(3\d{3})$"> + <action application="conference" data="$1@default"/> + </condition> </extension>

1 0

[commit] r6584 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 08 Dec '07

08 Dec '07

Author: brian Date: Sat Dec 8 15:30:47 2007 New Revision: 6584 Modified: freeswitch/trunk/conf/directory/default/default.xml Log: add more default values Modified: freeswitch/trunk/conf/directory/default/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/default.xml (original) +++ freeswitch/trunk/conf/directory/default/default.xml Sat Dec 8 15:30:47 2007 @@ -4,7 +4,8 @@   <variable name="numbering_plan" value="US"/> -  + <variable name="default_gateway" value="asterlink.com"/> + <variable name="default_area_code" value="918"/> </variables> </user> </include>

1 0

[commit] r6583 - in freeswitch/trunk/conf/sip_profiles: . default nat
by Freeswitch SVN 08 Dec '07

08 Dec '07

Author: brian Date: Sat Dec 8 15:23:14 2007 New Revision: 6583 Added: freeswitch/trunk/conf/sip_profiles/default/ freeswitch/trunk/conf/sip_profiles/default/example.xml freeswitch/trunk/conf/sip_profiles/nat/ Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml Log: break these into includes Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Sat Dec 8 15:23:14 2007 @@ -5,38 +5,7 @@ </aliases>  <gateways> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  + <X-PRE-PROCESS cmd="include" data="default/*.xml"/> </gateways> <domains> Added: freeswitch/trunk/conf/sip_profiles/default/example.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/default/example.xml Sat Dec 8 15:23:14 2007 @@ -0,0 +1,34 @@ +<include> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +</include> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Sat Dec 8 15:23:14 2007 @@ -1,4 +1,7 @@ <profile name="nat"> + <gateways> + <X-PRE-PROCESS cmd="include" data="nat/*.xml"/> + </gateways> <settings> <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/>

1 0