October 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5944 - freeswitch/trunk/src
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: mikej Date: Wed Oct 17 16:14:19 2007 New Revision: 5944 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr_play_say.c Log: fix windows build Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Oct 17 16:14:19 2007 @@ -417,9 +417,10 @@ { switch_xml_t xml = NULL, cfg = NULL; switch_uuid_t uuid; - memset(&runtime, 0, sizeof(runtime)); char guess_ip[256]; + memset(&runtime, 0, sizeof(runtime)); + switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS); runtime.hard_log_level = SWITCH_LOG_DEBUG; 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 Wed Oct 17 16:14:19 2007 @@ -1208,7 +1208,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; uint32_t rate = 0; - int extra = 0; + switch_size_t extra = 0; char *p, *tmp = NULL; char *star, *pound; switch_size_t starlen, poundlen;

1 0

[commit] r5943 - in freeswitch/trunk/src/mod/say: mod_say_de mod_say_es mod_say_fr mod_say_it mod_say_nl
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: mikej Date: Wed Oct 17 15:52:43 2007 New Revision: 5943 Added: freeswitch/trunk/src/mod/say/mod_say_de/ freeswitch/trunk/src/mod/say/mod_say_de/mod_say_en.c - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/mod/say/mod_say_de/mod_say_en.vcproj - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj freeswitch/trunk/src/mod/say/mod_say_es/ freeswitch/trunk/src/mod/say/mod_say_es/mod_say_en.c - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/mod/say/mod_say_es/mod_say_en.vcproj - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj freeswitch/trunk/src/mod/say/mod_say_fr/ freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_en.c - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_en.vcproj - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj freeswitch/trunk/src/mod/say/mod_say_it/ freeswitch/trunk/src/mod/say/mod_say_it/mod_say_en.c - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/mod/say/mod_say_it/mod_say_en.vcproj - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj freeswitch/trunk/src/mod/say/mod_say_nl/ freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_en.c - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_en.vcproj - copied unchanged from r5941, /freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj Log: make stub copies of mod_say_en to use as working copies for these.

1 0

[commit] r5942 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 15:51:39 2007 New Revision: 5942 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 Wed Oct 17 15:51:39 2007 @@ -822,7 +822,7 @@ if (!strcasecmp(val, "auto")) { profile->extsipip = switch_core_strdup(profile->pool, mod_sofia_globals.guess_ip); } else { - char *ip = NULL; + char *ip = mod_sofia_globals.guess_ip; switch_port_t port = 0; if (sofia_glue_ext_address_lookup(&ip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) {

1 0

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

17 Oct '07

Author: brian Date: Wed Oct 17 15:24:18 2007 New Revision: 5941 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: auth all packets off Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Oct 17 15:24:18 2007 @@ -50,8 +50,8 @@ <param name="codec-ms" value="20"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> - <param name="rtp-ip" value="$${bind_server_ip}"/> - <param name="sip-ip" value="$${bind_server_ip}"/> + <param name="rtp-ip" value="$${local_ip_v4}"/> + <param name="sip-ip" value="$${local_ip_v4}"/>  <param name="manage-presence" value="true"/>  @@ -82,12 +82,11 @@  <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] r5940 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: mikej Date: Wed Oct 17 15:18:17 2007 New Revision: 5940 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: change license on these with approval from Anthony and Mike Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Wed Oct 17 15:18:17 2007 @@ -1,20 +1,34 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application +/* + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * The Initial Developer of the Original Code is * Anthony Minessale II <anthmct(a)yahoo.com> @@ -29,6 +43,7 @@ * mod_say_en.c -- Say for English * */ + #include <switch.h> #include <math.h> #include <ctype.h> @@ -517,10 +532,6 @@ say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE); say_interface->interface_name = "en"; say_interface->say_function = en_say; - say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE); - say_interface->interface_name = "es"; - say_interface->say_function = en_say; - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r5939 - freeswitch/trunk/src
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: anthm Date: Wed Oct 17 14:37:18 2007 New Revision: 5939 Modified: freeswitch/trunk/src/switch_channel.c Log: change dialplan a little (part2) Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 17 14:37:18 2007 @@ -1270,10 +1270,15 @@ char *sub_val = NULL, *func_val = NULL; int nv = 0; - if (!in || !strchr(in, '$')) { + if (in && (p = strchr(in, '$'))) { + if (!*(p + 1)) { + return in; + } + } else { return in; } + olen = strlen(in); indup = strdup(in);

1 0

[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