December 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6943 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 01:24:50 2007 New Revision: 6943 Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/README Log: better dox Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/README ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/README (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/README Fri Dec 21 01:24:50 2007 @@ -44,7 +44,18 @@ If you want this to be used *with* your default context you must remove the lines -<context name="INT-Numbering-Plan"> + + +-=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- + +dont just leave regexps undefined that may cause matches to occur that +shouldnt. Instead use the regexp DONT_MATCH_ME or something similar that will +never cause a match. dialplan.es.xml uses this if you need an example + +-=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- + + +<context name="default"> </context> and place the remainder in the default context tags.

1 0

[commit] r6942 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 01:08:58 2007 New Revision: 6942 Added: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.ve.xml Log: Venezuela localized dialplan Added: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.ve.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.ve.xml Fri Dec 21 01:08:58 2007 @@ -0,0 +1,38 @@ + + + + + +<variable name="dial_prefix" value=""/> + + +<variable name="use_enum" value="true"/> + + +<variable name="default_gateway" value="asterlink.com"/> + + +<variablename="default_country_code" value="58"/> + + +<variable name="default_international_prefix" value="00"/> + + +<variablename="default_local_prefix" value="^[2-9]\d+$"/> + + +<variablename="default_cell_prefix" value="041\d+"/> + + +<variable name="default_international_regexp" value="^00(\d+)$"/> + + +<variable name="default_domestic_regexp" value="^02\d+$"/> + + +<variable name="default_local_regexp" value="^[2-9]\d+$"/> + + +<variable name="default_emergency_number" value="^091$/> + +

1 0

[commit] r6941 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 01:06:30 2007 New Revision: 6941 Added: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.es.xml Log: spain localized dialplan Added: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.es.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.es.xml Fri Dec 21 01:06:30 2007 @@ -0,0 +1,40 @@ + + + + + + + +<variable name="dial_prefix" value=""/> + + +<variable name="use_enum" value="true"/> + + +<variable name="default_gateway" value="asterlink.com"/> + + +<variablename="default_country_code" value="34"/> + + +<variable name="default_international_prefix" value="00"/> + + +<variablename="default_local_prefix" value="^[89]\d+$"/> + + +<variablename="default_cell_prefix" value="^6\d+$"/> + + +<variable name="default_international_regexp" value="^00(\d+)$"/> + + + +<variable name="default_domestic_regexp" value="^DONT_MATCH_ME$"/> + + + +<variable name="default_local_regexp" value="^DONT_MATCH_ME$"/> + + +<variable name="default_emergency_number" value="^091$/>

1 0

[commit] r6940 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 00:58:17 2007 New Revision: 6940 Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml Log: added url for X11 numbers Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml Fri Dec 21 00:58:17 2007 @@ -28,4 +28,5 @@ <variable name="default_local_regexp" value="^([2-9]\d{6})$"/>  + <variable name="default_emergency_number" value="^[2-9]11$"/>

1 0

[commit] r6939 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 00:57:42 2007 New Revision: 6939 Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml Log: make bkw happy Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml Fri Dec 21 00:57:42 2007 @@ -28,4 +28,4 @@ <variable name="default_local_regexp" value="^([2-9]\d{6})$"/>  -<variable name="default_emergency_number" value="^\d11$"/> +<variable name="default_emergency_number" value="^[2-9]11$"/>

1 0

[commit] r6938 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 00:55:07 2007 New Revision: 6938 Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/README freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Log: added a provider dialing prefix since some providers make you dial for example 011 before an e164 number, now you can do that just fine Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/README ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/README (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/README Fri Dec 21 00:55:07 2007 @@ -75,6 +75,12 @@ and regexps. Due to the way variables are used you should not attempt to use a regexp unless it is indicated that it is a regexp. + +<variable name="dial_prefix" value=""/>  + +<variable name="dial_prefix" value=""/> +  <variable name="use_enum" value="true"/> Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml Fri Dec 21 00:55:07 2007 @@ -1,5 +1,8 @@  + +<variable name="dial_prefix" value=""/> +  <variable name="use_enum" value="true"/> Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Fri Dec 21 00:55:07 2007 @@ -52,7 +52,7 @@ <action application="bridge" data="${enum_auto_route}"/> </condition> <condition> - <action application="bridge" data="sofia/gateway/${default_gateway}/${e164number}"/> + <action application="bridge" data="sofia/gateway/${dial_prefix}${default_gateway}/${e164number}"/> </condition> </extension>

1 0

[commit] r6937 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 00:47:07 2007 New Revision: 6937 Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Log: added hack to work around limitation in the dialplan where you cant have a variable set in the dialplan that is used by a condition Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Fri Dec 21 00:47:07 2007 @@ -4,6 +4,7 @@ Emergency service - verify your provider really supports this --> <condition field="${destination_number}" expression="${default_emergency_number}" continue="true" break="never"> + <action application="set" data="hangup_after_bridge=true"/> <action application="export" data="nolocal:jitterbuffer_msec=180"/> <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/> </condition> @@ -26,11 +27,19 @@ <action application="set" data="e164number=${default_country_code}${default_local_prefix}$1"/> </condition> + +  + <condition field="${destination_number}" expression="${default_international_regexp}|${default_domestic_regexp}|${default_local_regexp}" continue="true" break="false"/> +  - <condition field="${e164number}" expression="^\d+$" continue="true"> - <action application="info"/> + <condition> <action application="export" data="nolocal:jitterbuffer_msec=180"/> <action application="set" data="continue_on_fail=true"/> <action application="set" data="hangup_after_bridge=true"/>

1 0

[commit] r6936 - freeswitch/trunk/w32/Console
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: mikej Date: Fri Dec 21 00:38:04 2007 New Revision: 6936 Modified: freeswitch/trunk/w32/Console/FreeSwitchConsole.2008.vcproj Log: Enable code analysis Modified: freeswitch/trunk/w32/Console/FreeSwitchConsole.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Console/FreeSwitchConsole.2008.vcproj (original) +++ freeswitch/trunk/w32/Console/FreeSwitchConsole.2008.vcproj Fri Dec 21 00:38:04 2007 @@ -52,6 +52,7 @@ WarningLevel="4" WarnAsError="true" DebugInformationFormat="3" + EnablePREfast="true" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[commit] r6935 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: mikej Date: Fri Dec 21 00:36:52 2007 New Revision: 6935 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Log: more error checking. Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Fri Dec 21 00:36:52 2007 @@ -154,18 +154,18 @@ } channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!caller_profile) { caller_profile = switch_channel_get_caller_profile(channel); } - if (caller_profile && !switch_strlen_zero(caller_profile->destination_number)) { - context = caller_profile->context ? caller_profile->context : "default"; - } else { + if (!caller_profile || switch_strlen_zero(caller_profile->destination_number)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Obtaining Profile!\n"); return NULL; } + + context = caller_profile->context ? caller_profile->context : "default"; if (!switch_config_open_file(&cfg, cf)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); @@ -188,7 +188,7 @@ char *argument = NULL; char *expression = NULL, expression_buf[1024] = ""; char substituted[2048] = ""; - char *field_data = caller_profile->destination_number; + const char *field_data = caller_profile->destination_number; int proceed = 0; switch_regex_t *re = NULL; int ovector[30] = {0}; @@ -220,7 +220,7 @@ field_data = field_expanded; } } else { - field_data = (char *)switch_caller_get_field_by_name(caller_profile, var); + field_data = switch_caller_get_field_by_name(caller_profile, var); } } @@ -236,6 +236,10 @@ expression = pattern; } + if (!field_data) { + field_data = ""; + } + if (!(proceed = switch_regex_perform(field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { switch_regex_safe_free(re); switch_safe_free(field_expanded); @@ -275,6 +279,10 @@ argument = ""; } + if (!field_data) { + field_data = ""; + } + if (strchr(expression, '(')) { switch_perform_substitution(re, proceed, argument, field_data, substituted, sizeof(substituted), ovector); argument = substituted;

1 0

[commit] r6934 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 00:26:38 2007 New Revision: 6934 Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Log: remove debug stuff Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Fri Dec 21 00:26:38 2007 @@ -29,8 +29,7 @@  -  - <condition> + <condition field="${e164number}" expression="^\d+$" continue="true"> <action application="info"/> <action application="export" data="nolocal:jitterbuffer_msec=180"/> <action application="set" data="continue_on_fail=true"/>

1 0