November 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6205 - in freeswitch/trunk: . src src/include src/mod/dialplans/mod_dialplan_asterisk
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 14:25:46 2007 New Revision: 6205 Added: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/Makefile freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.vcproj Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_utils.c Log: add a new dialplan module Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Nov 9 14:25:46 2007 @@ -55,6 +55,7 @@ src/switch_stun.c\ src/switch_log.c\ src/switch_xml.c\ +src/switch_config.c\ src/softtimer.c\ libs/stfu/stfu.c\ src/switch_cpp.cpp\ Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Fri Nov 9 14:25:46 2007 @@ -105,6 +105,7 @@ #include <switch_xml.h> #include <switch_core_event_hook.h> #include <switch_scheduler.h> +#include <switch_config.h> #include <libteletone.h> /** \mainpage FreeSWITCH Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Nov 9 14:25:46 2007 @@ -303,6 +303,7 @@ SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr); SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip); SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup); +SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len); /*! \brief Escape a string by prefixing a list of characters with an escape character Added: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/Makefile Fri Nov 9 14:25:46 2007 @@ -0,0 +1,2 @@ +BASE=../../../.. +include /usr/src/freeswitch.trunk/build/modmake.rules Added: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Fri Nov 9 14:25:46 2007 @@ -0,0 +1,189 @@ +/* + * 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 + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * mod_dialplan_asterisk.c -- Asterisk extensions.conf style dialplan parser. + * + */ +#include <switch.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + +SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_asterisk_load); +SWITCH_MODULE_DEFINITION(mod_dialplan_asterisk, mod_dialplan_asterisk_load, NULL, NULL); + +SWITCH_STANDARD_DIALPLAN(asterisk_dialplan_hunt) +{ + switch_caller_extension_t *extension = NULL; + switch_channel_t *channel; + char *cf = "extensions.conf"; + switch_config_t cfg; + char *var, *val; + const char *context = NULL; + + if (arg) { + cf = arg; + } + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!caller_profile) { + caller_profile = switch_channel_get_caller_profile(channel); + } + + if (caller_profile) { + context = caller_profile->context ? caller_profile->context : "default"; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Obtaining Profile!\n"); + return NULL; + } + + if (!switch_config_open_file(&cfg, cf)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return NULL; + } + + while (switch_config_next_pair(&cfg, &var, &val)) { + if (!strcasecmp(cfg.category, context)) { + if (!strcasecmp(var, "exten")) { + int argc; + char *argv[4] = { 0 }; + char *pattern = NULL; + char *pri = NULL; + char *app = NULL; + char *arg = NULL; + char expression[1024] = ""; + char substituted[2048] = ""; + char *field_data = caller_profile->destination_number; + int proceed = 0; + switch_regex_t *re = NULL; + int ovector[30] = {0}; + + + switch_replace_char(val, '|',',', SWITCH_FALSE); + argc = switch_separate_string(val, ',', argv, (sizeof(argv) / sizeof(argv[0]))); + if (argc < 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "parse error line %d!\n", cfg.lineno); + continue; + } + + pattern = argv[0]; + + if (*pattern == '_') { + pattern++; + if (switch_ast2regex(pattern, expression, sizeof(expression))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "converting [%s] to real regex [%s] you should try them!\n", + pattern, expression); + } + if (!(proceed = switch_regex_perform(field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { + switch_regex_safe_free(re); + continue; + } + + } else { + if (strcasecmp(pattern, caller_profile->destination_number)) { + continue; + } + } + + switch_channel_set_variable(channel, "EXTEN", caller_profile->destination_number); + switch_channel_set_variable(channel, "CHANNEL", switch_channel_get_name(channel)); + switch_channel_set_variable(channel, "UNIQUEID", switch_core_session_get_uuid(session)); + + pri = argv[1]; + app = argv[2]; + + if (argc == 4) { + arg = argv[3]; + } else { + if ((arg = strchr(app, '('))) { + *arg++ = '\0'; + char *p = strrchr(arg, ')'); + if (p) { + *p = '\0'; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "parse error line %d!\n", cfg.lineno); + continue; + } + } + + if (strchr(expression, '(')) { + switch_perform_substitution(re, proceed, arg, field_data, substituted, sizeof(substituted), ovector); + arg = substituted; + } + switch_regex_safe_free(re); + + if (!extension) { + if ((extension = switch_caller_extension_new(session, caller_profile->destination_number, + caller_profile->destination_number)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + break; + } + } + + switch_caller_extension_add_application(session, extension, app, arg); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "param '%s' not implemented at line %d!\n", var, cfg.lineno); + } + } + } + + switch_config_close_file(&cfg); + + if (extension) { + switch_channel_set_state(channel, CS_EXECUTE); + } + + return extension; +} + + +SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_asterisk_load) +{ + switch_dialplan_interface_t *dp_interface; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_DIALPLAN(dp_interface, "asterisk", asterisk_dialplan_hunt); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Added: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.vcproj Fri Nov 9 14:25:46 2007 @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mod_dialplan_asterisk" + ProjectGUID="{07113B25-D3AF-4E04-BA77-4CD1171F022C}" + RootNamespace="mod_dialplan_asterisk" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_dialplan_asterisk.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Nov 9 14:25:46 2007 @@ -1269,6 +1269,7 @@ char *data, *indup; size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; const char *sub_val = NULL; + char *cloned_sub_val = NULL; char *func_val = NULL; int nv = 0; @@ -1393,13 +1394,43 @@ if (vtype == 1) { char *expanded = NULL; - + int offset = 0; + int ooffset = 0; + char *p; + if ((expanded = switch_channel_expand_variables(channel, (char *)vname)) == vname) { expanded = NULL; } else { vname = expanded; } + if ((p = strchr(vname, ':'))) { + *p++ = '\0'; + offset = atoi(p); + if ((p = strchr(p, ':'))) { + p++; + ooffset = atoi(p); + } + } + sub_val = switch_channel_get_variable(channel, vname); + if (offset || ooffset) { + cloned_sub_val = strdup(sub_val); + assert(cloned_sub_val); + sub_val = cloned_sub_val; + } + + if (offset >= 0) { + sub_val += offset; + } else if (abs(offset) <= strlen(sub_val)) { + sub_val = cloned_sub_val + (strlen(cloned_sub_val) + offset); + } + + if (ooffset > 0 && ooffset < strlen(sub_val)) { + if ((p = (char *)sub_val + ooffset)) { + *p = '\0'; + } + } + switch_safe_free(expanded); } else { switch_stream_handle_t stream = { 0 }; @@ -1450,9 +1481,11 @@ } switch_safe_free(func_val); + switch_safe_free(cloned_sub_val); sub_val = NULL; vname = NULL; vtype = 0; + br = 0; } if (len + 1 >= olen) { resize(1); Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Nov 9 14:25:46 2007 @@ -222,6 +222,28 @@ } +SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len) +{ + char *p = pat; + memset(rbuf, 0, len); + + while(p && *p) { + if (*p == 'N') { + strncat(rbuf, "[2-9]", len - strlen(rbuf)); + } else if (*p == 'X') { + strncat(rbuf, "[0-9]", len - strlen(rbuf)); + } else if (*p == 'Z') { + strncat(rbuf, "[1-9]", len - strlen(rbuf)); + } else if (*p == '.') { + strncat(rbuf, ".*", len - strlen(rbuf)); + } else if (strlen(rbuf) < len - 1) { + *(rbuf + strlen(rbuf)) = *p; + } + p++; + } + + return strcmp(pat,rbuf) ? SWITCH_TRUE : SWITCH_FALSE; +} SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup) {

1 0

[commit] r6204 - in freeswitch/trunk/conf: dialplan directory
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: intralanman Date: Fri Nov 9 13:46:29 2007 New Revision: 6204 Added: freeswitch/trunk/conf/dialplan/US.conf.xml Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/directory/default.xml Log: stuff for localized dialplans (need to add other areas) Added: freeswitch/trunk/conf/dialplan/US.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/US.conf.xml Fri Nov 9 13:46:29 2007 @@ -0,0 +1,59 @@ +<context name="US-Numbering-Plan"> + +  + <extension name="US_International"> + <condition field="destination_number" expression="^011(\d*)$"> + <action application="set" data="continue_on_fail=true"/> + <action application="set" data="hangup_after_bridge=true"/> + <action application="enum" data="1$1"/> + <action application="bridge" data="${enum_auto_route}"/> + <action application="bridge" data="sofia/gateway/$${default_gateway}/011$1"/> + </condition> + </extension> + +  + <extension name="US_LD"> + <condition field="destination_number" expression="^1?([2-9]\d{2}[2-9]\d{6})$"> + <action application="set" data="continue_on_fail=true"/> + <action application="set" data="hangup_after_bridge=true"/> + <action application="enum" data="1$1"/> + <action application="bridge" data="${enum_auto_route}"/> + <action application="bridge" data="sofia/gateway/$${default_gateway}/1$1"/> + </condition> + </extension> + +  + <extension name="US_Local"> + <condition field="${default_area_code}" expression="\d{3}" continue="on-true"> + <anti-action application="say" data="you must dial the area code to call this destination"/> + </condition> + <condition field="destination_number" expression="^([2-9]\d{6})$"> + <action application="set" data="continue_on_fail=true"/> + <action application="set" data="hangup_after_bridge=true"/> + <action application="enum" data="1$1"/> + <action application="bridge" data="${enum_auto_route}"/> + <action application="bridge" data="sofia/gateway/$${default_gateway}/1${default_area_code}$1"/> + </condition> + </extension> + +  + <extension name="FCC_Services"> + <condition field="^([4689]11)$"> + <action application="bridge" data="sofia/gateway/$${default_gateway}/$1"/> + </condition> + </extension> +</context> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 9 13:46:29 2007 @@ -94,6 +94,15 @@ </condition> </extension> + <extension name="Localized_Dialplan"> + <condition field="${numbering_plan}" expression="^[[:alnum:]]+$"/> + <condition field="destination_number" expression="^([[:alnum:]]+)$"> + <action application="transfer" data="$1 XML ${numbering_plan}-Numbering-Plan"/> + </condition> + </extension> + + +   </params> + <variables> + <variable name="numbering_plan" value="US"/> + <variable name="default_area_code" value="434"/> + <variable name="max_calls" value="2"/> + <variable name="presence_id" value="1001@$${domain}"/> + </variables> </user>

1 0

[commit] r6203 - in freeswitch/trunk/conf: . directory
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:17:13 2007 New Revision: 6203 Added: freeswitch/trunk/conf/directory/default.xml - copied unchanged from r6194, /freeswitch/trunk/conf/directory.xml Removed: freeswitch/trunk/conf/directory.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: smack it Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Fri Nov 9 13:17:13 2007 @@ -98,7 +98,7 @@   <section name="directory" description="User Directory"> -  +  </section>

1 0

[commit] r6202 - freeswitch/trunk/conf/directory
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:16:37 2007 New Revision: 6202 Added: freeswitch/trunk/conf/directory/ Log: ;)

1 0

[commit] r6201 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:15:20 2007 New Revision: 6201 Added: freeswitch/trunk/conf/dialplan/default.xml - copied unchanged from r6200, /freeswitch/trunk/conf/dialplan/default_context.xml Removed: freeswitch/trunk/conf/dialplan/default_context.xml Log: we know its a context because its in dialplan/

1 0

[commit] r6200 - in freeswitch/trunk/conf: . dialplan
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:14:32 2007 New Revision: 6200 Added: freeswitch/trunk/conf/dialplan/default_context.xml - copied unchanged from r6194, /freeswitch/trunk/conf/default_context.xml Removed: freeswitch/trunk/conf/default_context.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: again with the fun fun fun stuff Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Fri Nov 9 13:14:32 2007 @@ -92,7 +92,7 @@ </section> <section name="dialplan" description="Regex/XML Dialplan"> -  +  </section>

1 0

[commit] r6199 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:12:02 2007 New Revision: 6199 Added: freeswitch/trunk/conf/dialplan/ Log: more fun stuff

1 0

[commit] r6198 - in freeswitch/trunk/conf: . sip_profiles
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:03:53 2007 New Revision: 6198 Added: freeswitch/trunk/conf/sip_profiles/ freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/conf/vars.xml Log: house keeping.. moving things around a bit more to demo various things you can do Added: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/default.xml Fri Nov 9 13:03:53 2007 @@ -0,0 +1,106 @@ +<profile name="default"> +  +  +  +  +  + <gateways> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + </gateways> + + <domains> +  +  + </domains> + + <settings> + <param name="debug" value="1"/> + <param name="rfc2833-pt" value="101"/> + <param name="sip-port" value="5062"/> + <param name="dialplan" value="XML,enum"/> + <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="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"/> +  +  + +  +  +  +  +  +  +  +  +  +  +  + </settings> +</profile> + Added: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Fri Nov 9 13:03:53 2007 @@ -0,0 +1,19 @@ +<profile name="nat"> + <settings> + <param name="debug" value="1"/> + <param name="rfc2833-pt" value="101"/> + <param name="sip-port" value="5061"/> + <param name="dialplan" value="XML,enum"/> + <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="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="ext-rtp-ip" value="$${external_rtp_ip}"/> + </settings> +</profile> Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Fri Nov 9 13:03:53 2007 @@ -1,130 +1,5 @@ <configuration name="sofia.conf" description="sofia Endpoint"> <profiles> - <profile name="$${sip_profile}"> -  - <aliases> - <alias name="default"/> - </aliases> -  - <gateways> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - </gateways> - - <domains> -  -  - </domains> - - <settings> - <param name="debug" value="1"/> - <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5060"/> - <param name="dialplan" value="XML,enum"/> - <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="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"/> -  -  - -  -  -  -  -  -  -  -  -  -  -  - </settings> - </profile> - - <profile name="nat"> - <settings> - <param name="debug" value="1"/> - <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5061"/> - <param name="dialplan" value="XML,enum"/> - <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="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="ext-rtp-ip" value="$${external_rtp_ip}"/> - </settings> - </profile> - +  </profiles> </configuration> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Nov 9 13:03:53 2007 @@ -8,6 +8,7 @@ used by: sofia.conf.xml enum.conf.xml default_context.xml directory.xml -->  +  <!-- xmpp_client_profile and xmpp_server_profile xmpp_client_profile can be any string. xmpp_server_profile is appended to "dingaling_" to form the database name

1 0

[commit] r6197 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 12:46:20 2007 New Revision: 6197 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: thx stkn Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Nov 9 12:46:20 2007 @@ -1341,12 +1341,12 @@ #define SCHED_TRANSF_DESCR "Schedule a transfer in the future" #define SCHED_BROADCAST_DESCR "Schedule a broadcast in the future" #define SCHED_HANGUP_DESCR "Schedule a hangup in the future" -#define UNSET_LONG_DESC "Unset a channel varaible for the channel calling the application." -#define SET_LONG_DESC "Set a channel varaible for the channel calling the application." -#define SET_GLOBAL_LONG_DESC "Set a global varaible." -#define SET_PROFILE_VAR_LONG_DESC "Set a caller profile varaible for the channel calling the application." -#define EXPORT_LONG_DESC "Set and export a channel varaible for the channel calling the application." -#define LOG_LONG_DESC "Logs a channel varaible for the channel calling the application." +#define UNSET_LONG_DESC "Unset a channel variable for the channel calling the application." +#define SET_LONG_DESC "Set a channel variable for the channel calling the application." +#define SET_GLOBAL_LONG_DESC "Set a global variable." +#define SET_PROFILE_VAR_LONG_DESC "Set a caller profile variable for the channel calling the application." +#define EXPORT_LONG_DESC "Set and export a channel variable for the channel calling the application." +#define LOG_LONG_DESC "Logs a channel variable for the channel calling the application." #define TRANSFER_LONG_DESC "Immediatly transfer the calling channel to a new extension" #define SLEEP_LONG_DESC "Pause the channel for a given number of milliseconds, consuming the audio for that period of time." SWITCH_MODULE_LOAD_FUNCTION(mod_dptools_load) @@ -1371,14 +1371,14 @@ SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "hangup", "Hangup the call", "Hangup the call for a channel.", hangup_function, "[<cause>]", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "log", "Logs a channel varaible", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "log", "Logs a channel variable", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "info", "Display Call Info", "Display Call Info", info_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "event", "Fire an event", "Fire an event", event_function, "", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "export", "Export a channel varaible across a bridge", EXPORT_LONG_DESC, export_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "set", "Set a channel varaible", SET_LONG_DESC, set_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "set_global", "Set a global varaible", SET_GLOBAL_LONG_DESC, set_global_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "set_profile_var", "Set a caller profile varaible", SET_PROFILE_VAR_LONG_DESC, set_profile_var_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "unset", "Unset a channel varaible", UNSET_LONG_DESC, unset_function, "<varname>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "export", "Export a channel variable across a bridge", EXPORT_LONG_DESC, export_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set", "Set a channel variable", SET_LONG_DESC, set_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set_global", "Set a global variable", SET_GLOBAL_LONG_DESC, set_global_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set_profile_var", "Set a caller profile variable", SET_PROFILE_VAR_LONG_DESC, set_profile_var_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "unset", "Unset a channel variable", UNSET_LONG_DESC, unset_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "ring_ready", "Indicate Ring_Ready", "Indicate Ring_Ready on a channel.", ring_ready_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "break", "Break", "Set the break flag.", break_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "detect_speech", "Detect speech", "Detect speech on a channel.", detect_speech_function, DETECT_SPEECH_SYNTAX, SAF_NONE);

1 0

[commit] r6196 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 11:50:37 2007 New Revision: 6196 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: add db api cmd and db_insert dialplan app Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Nov 9 11:50:37 2007 @@ -59,6 +59,15 @@ ");\n"; +static char db_sql[] = + "CREATE TABLE db_data (\n" + " hostname VARCHAR(255),\n" + " realm VARCHAR(255),\n" + " data_key VARCHAR(255),\n" + " data VARCHAR(255)\n" + ");\n"; + + static switch_status_t limit_execute_sql(char *sql, switch_mutex_t *mutex) { @@ -221,11 +230,21 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.odbc_dsn); - switch_odbc_handle_exec(globals.master_odbc, limit_sql, NULL); + if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from limit_data", NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_odbc_handle_exec(globals.master_odbc, limit_sql, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Create SQL Database!\n"); + } + } + if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from db_data", NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_odbc_handle_exec(globals.master_odbc, db_sql, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Create SQL Database!\n"); + } + } } else { #endif if ((db = switch_core_db_open_file(globals.dbname))) { switch_core_db_test_reactive(db, "select * from limit_data", NULL, limit_sql); + switch_core_db_test_reactive(db, "select * from db_data", NULL, db_sql); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n"); status = SWITCH_STATUS_FALSE; @@ -289,6 +308,96 @@ } +SWITCH_STANDARD_API(db_api_function) +{ + int argc = 0; + char *argv[4] = { 0 }; + char *mydata = NULL; + char *sql; + + switch_mutex_lock(globals.mutex); + + if (!switch_strlen_zero(cmd)) { + mydata = strdup(cmd); + argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc < 1) { + goto error; + } + + if (!strcasecmp(argv[0], "set")) { + if (argc < 4) { + goto error; + } + sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); + assert(sql); + limit_execute_sql(sql, NULL); + switch_safe_free(sql); + sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); + assert(sql); + limit_execute_sql(sql, NULL); + switch_safe_free(sql); + stream->write_function(stream, "+OK"); + goto done; + } else if (!strcasecmp(argv[0], "get")) { + char buf[256] = ""; + callback_t cbt = { 0 }; + if (argc < 3) { + goto error; + } + cbt.buf = buf; + cbt.len = sizeof(buf); + sql = switch_mprintf("select data from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); + limit_execute_sql_callback(NULL, sql, sql2str_callback, &cbt); + stream->write_function(stream, "%s", buf); + goto done; + } + + + error: + stream->write_function(stream, "!err!"); + + done: + + switch_mutex_unlock(globals.mutex); + switch_safe_free(mydata); + return SWITCH_STATUS_SUCCESS; + +} + + +#define DB_USAGE "<realm>/<key>/<val>" +#define DB_DESC "save data" + +SWITCH_STANDARD_APP(db_function) +{ + switch_channel_t *channel; + int argc = 0; + char *argv[3] = { 0 }; + char *mydata = NULL; + char *sql; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!switch_strlen_zero(data)) { + mydata = switch_core_session_strdup(session, data); + argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc < 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: db_insert %s\n", DB_USAGE); + return; + } + + + sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[0], argv[1], argv[2]); + assert(sql); + limit_execute_sql(sql, globals.mutex); + switch_safe_free(sql); +} + #define LIMIT_USAGE "<realm> <id> <max>" #define LIMIT_DESC "limit access to an extension" @@ -363,6 +472,7 @@ { switch_status_t status; switch_application_interface_t *app_interface; + switch_api_interface_t *commands_api_interface; memset(&globals, 0, sizeof(&globals)); gethostname(globals.hostname, sizeof(globals.hostname)); @@ -378,6 +488,9 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_NONE); + SWITCH_ADD_APP(app_interface, "db_insert", "Insert to the db", DB_DESC, db_function, DB_USAGE, SAF_NONE); + + SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[get|set]/<realm>/<key>/<value>"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0