- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5938 - in freeswitch/trunk/src: . mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: anthm Date: Wed Oct 17 14:26:08 2007 New Revision: 5938 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/switch_channel.c Log: change dialplan a little Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Wed Oct 17 14:26:08 2007 @@ -50,7 +50,8 @@ switch_channel_t *channel; char *exten_name = (char *) switch_xml_attr_soft(xexten, "name"); int proceed = 0; - switch_stream_handle_t stream = { 0 }; + char *expression_expanded = NULL, *field_expanded = NULL; + channel = switch_core_session_get_channel(session); @@ -63,9 +64,18 @@ int ovector[30]; break_t do_break_i = BREAK_ON_FALSE; + switch_safe_free(field_expanded); + switch_safe_free(expression_expanded); + field = (char *) switch_xml_attr(xcond, "field"); expression = (char *) switch_xml_attr_soft(xcond, "expression"); + + if ((expression_expanded = switch_channel_expand_variables(channel, expression)) == expression) { + expression_expanded = NULL; + } else { + expression = expression_expanded; + } if ((do_break_a = (char *) switch_xml_attr(xcond, "break"))) { if (!strcasecmp(do_break_a, "on-true")) { @@ -80,32 +90,12 @@ } if (field) { - if (*field == '$') { - char *cmd = switch_core_session_strdup(session, field + 1); - char *e, *arg; - field = cmd; - field_data = ""; - - if (*field == '{') { - field++; - if ((e = strchr(field, '}'))) { - *e = '\0'; - field_data = switch_channel_get_variable(channel, field); - } + if (strchr(field, '$')) { + if ((field_expanded = switch_channel_expand_variables(channel, field)) == field) { + field_expanded = NULL; + field_data = field; } else { - switch_safe_free(stream.data); - memset(&stream, 0, sizeof(stream)); - SWITCH_STANDARD_STREAM(stream); - - if ((arg = strchr(cmd, '('))) { - *arg++ = '\0'; - if ((e = strchr(arg, ')'))) { - *e = '\0'; - if (switch_api_execute(cmd, arg, session, &stream) == SWITCH_STATUS_SUCCESS) { - field_data = stream.data; - } - } - } + field_data = field_expanded; } } else { field_data = switch_caller_get_field_by_name(caller_profile, field); @@ -183,7 +173,8 @@ } done: - switch_safe_free(stream.data); + switch_safe_free(field_expanded); + switch_safe_free(expression_expanded); return proceed; } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 17 14:26:08 2007 @@ -1295,9 +1295,13 @@ } if (*p == '$' && !nv) { - vtype = 1; - if (*(p + 1) != '{') { - vtype = 2; + if (*(p+1)) { + vtype = 1; + if (*(p + 1) != '{') { + vtype = 2; + } + } else { + nv = 1; } }

1 0

[commit] r5937 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:45:35 2007 New Revision: 5937 Modified: freeswitch/trunk/conf/default_context.xml Log: remove cruff for now Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Wed Oct 17 12:45:35 2007 @@ -94,14 +94,6 @@ </condition> </extension> -  - <extension name="FreeSWITCH Conference SIP"> - <condition field="destination_number" expression="^42$"> - <action application="set" data="bypass_media=true"/> - <action application="bridge" data="sofia/$${sip_profile}/42(a)conference.freeswitch.org"/> - </condition> - </extension> -

1 0

[commit] r5936 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:44:57 2007 New Revision: 5936 Modified: freeswitch/trunk/conf/default_context.xml freeswitch/trunk/conf/directory.xml Log: update to have one example of a user with passwords Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Wed Oct 17 12:44:57 2007 @@ -95,11 +95,12 @@ </extension>  -  -  -  -  -  + <extension name="FreeSWITCH Conference SIP"> + <condition field="destination_number" expression="^42$"> + <action application="set" data="bypass_media=true"/> + <action application="bridge" data="sofia/$${sip_profile}/42(a)conference.freeswitch.org"/> + </condition> + </extension>   Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Wed Oct 17 12:44:57 2007 @@ -49,8 +49,18 @@ <vcard>  </vcard> + +  + <user id="1000" mailbox="1000"> + <params> + <param name="password" value="mypass"/> + <param name="vm-password" value="1234"/> +  +  + </params> + </user> +  - <user id="1000"/> <user id="1001"/> <user id="1002"/> <user id="1003"/>

1 0

[commit] r5935 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:36:23 2007 New Revision: 5935 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: auth all packets if you're authing Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Oct 17 12:36:23 2007 @@ -82,7 +82,7 @@  <param name="auth-calls" value="true"/>  -  + <param name="auth-all-packets" value="true"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> <param name="ext-sip-ip" value="$${external_sip_ip}"/>

1 0

[commit] r5934 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:35:29 2007 New Revision: 5934 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: we need to auth calls in our default config Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Oct 17 12:35:29 2007 @@ -80,12 +80,12 @@   -  + <param name="auth-calls" value="true"/>   <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> - <param name="ext-rtp-ip" value="$${external_sip_ip}"/> + <param name="ext-sip-ip" value="$${external_sip_ip}"/>

1 0

[commit] r5933 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:27:25 2007 New Revision: 5933 Modified: freeswitch/trunk/conf/directory.xml Log: add the default users for phones Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Wed Oct 17 12:27:25 2007 @@ -49,5 +49,27 @@ <vcard>  </vcard> +  + <user id="1000"/> + <user id="1001"/> + <user id="1002"/> + <user id="1003"/> + <user id="1004"/> + <user id="1005"/> + <user id="1006"/> + <user id="1007"/> + <user id="1008"/> + <user id="1009"/> + <user id="1010"/> + <user id="1011"/> + <user id="1012"/> + <user id="1013"/> + <user id="1014"/> + <user id="1015"/> + <user id="1016"/> + <user id="1017"/> + <user id="1018"/> + <user id="1019"/> + </user> </domain>

1 0

[commit] r5932 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:15:35 2007 New Revision: 5932 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: mike is right enum should be second so the XML gets looked at first and enum last Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Oct 17 12:15:35 2007 @@ -44,7 +44,7 @@ <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5060"/> - <param name="dialplan" value="enum,XML"/> + <param name="dialplan" value="XML,enum"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="codec-ms" value="20"/>

1 0

[commit] r5931 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:12:01 2007 New Revision: 5931 Modified: freeswitch/trunk/conf/modules.conf.xml Log: tweak modules.conf Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Wed Oct 17 12:12:01 2007 @@ -48,7 +48,7 @@ <load module="mod_g722"/> <load module="mod_g726"/> <load module="mod_gsm"/> -  + <load module="mod_ilbc"/> <load module="mod_l16"/>

1 0

[commit] r5930 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:10:20 2007 New Revision: 5930 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: add external sip and rtp along with enum dialplan to default so ISN and enum work out of the box Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Oct 17 12:10:20 2007 @@ -44,7 +44,7 @@ <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5060"/> - <param name="dialplan" value="XML"/> + <param name="dialplan" value="enum,XML"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="codec-ms" value="20"/> @@ -73,7 +73,7 @@   - <param name="accept-blind-reg" value="true"/> +   <param name="nonce-ttl" value="60"/> @@ -84,7 +84,8 @@   -  + <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> + <param name="ext-rtp-ip" value="$${external_sip_ip}"/>

1 0

[commit] r5929 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 12:08:14 2007 New Revision: 5929 Added: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: more tweaks Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Oct 17 12:08:14 2007 @@ -12,59 +12,10 @@ The preprocessor will compile the full xml document to ${prefix}/log/freeswitch.registry Don't modify it while freeswitch is running cos it is mem mapped in most cases =D --> - -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  +  <section name="configuration" description="Various Configuration">  Added: freeswitch/trunk/conf/vars.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/vars.xml Wed Oct 17 12:08:14 2007 @@ -0,0 +1,53 @@ +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +

1 0