November 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6215 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Nov '07

10 Nov '07

Author: anthm Date: Fri Nov 9 19:47:09 2007 New Revision: 6215 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: protection against malformed string Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Nov 9 19:47:09 2007 @@ -506,3 +506,32 @@ void sofia_reg_release_gateway__(const char *file, const char *func, int line, sofia_gateway_t *gateway); #define sofia_reg_release_gateway(x) sofia_reg_release_gateway__(__FILE__, __SWITCH_FUNC__, __LINE__, x); + +#define check_decode(_var, _session) do { \ + assert(_session); \ + if (!switch_strlen_zero(_var)) { \ + int d = 0; \ + char *p; \ + if (strchr(_var, '%')) { \ + char *tmp = switch_core_session_strdup(_session, _var); \ + switch_url_decode(tmp); \ + _var = tmp; \ + d++; \ + } \ + if ((p = strchr(_var, '"'))) { \ + if (!d) { \ + char *tmp = switch_core_session_strdup(_session, _var); \ + _var = tmp; \ + } \ + if ((p = strchr(_var, '"'))) { \ + _var = p+1; \ + } \ + if ((p = strrchr(_var, '"'))) { \ + *p = '\0'; \ + } \ + } \ + } \ + \ + if(_session) break; \ + } while(!_session) + 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 Fri Nov 9 19:47:09 2007 @@ -1787,16 +1787,6 @@ return; } -#define check_decode(_var, _session) do { \ - assert(_session); \ - if (!switch_strlen_zero(_var) && strchr(_var, '%')) { \ - char *tmp = switch_core_session_strdup(_session, _var); \ - switch_url_decode(tmp); \ - _var = tmp; \ - } \ - if(_session) break; \ - } while(!_session) - #define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, #varprefix "_user", #varprefix "_host", #varprefix "_port", #varprefix "_uri") const char *_url_set_chanvars(switch_core_session_t *session, url_t *url, const char *user_var, @@ -2144,6 +2134,7 @@ dialplan = profile->dialplan; } + check_decode(displayname, session); tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), from_user, dialplan, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Nov 9 19:47:09 2007 @@ -498,6 +498,8 @@ cid_name = caller_profile->caller_id_name; cid_num = caller_profile->caller_id_number; sofia_glue_tech_prepare_codecs(tech_pvt); + check_decode(cid_name, session); + check_decode(cid_num, session); if (!tech_pvt->from_str) { tech_pvt->from_str = switch_core_session_sprintf(tech_pvt->session, "\"%s\" <sip:%s%s%s>",

1 0

[commit] r6214 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk
by Freeswitch SVN 10 Nov '07

10 Nov '07

Author: anthm Date: Fri Nov 9 19:27:12 2007 New Revision: 6214 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Log: update 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 Nov 9 19:27:12 2007 @@ -61,7 +61,7 @@ if (data && (mydata = switch_core_session_strdup(session, data))) { - if ((argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) { + if ((argc = switch_separate_string(mydata, '|', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) { goto error; } @@ -121,7 +121,7 @@ if (data && (mydata = switch_core_session_strdup(session, data))) { - if ((argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { + if ((argc = switch_separate_string(mydata, '|', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { goto error; } @@ -274,9 +274,6 @@ arg = ""; } - switch_replace_char(arg, '|',',', SWITCH_FALSE); - - if (strchr(expression, '(')) { switch_perform_substitution(re, proceed, arg, field_data, substituted, sizeof(substituted), ovector); arg = substituted; @@ -320,7 +317,18 @@ switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool) { - outbound_profile->destination_number = switch_core_sprintf(outbound_profile->pool, "default/%s", outbound_profile->destination_number); + const char *profile; + + if (session) { + profile = switch_channel_get_variable(switch_core_session_get_channel(session), "sip_profile"); + } else { + profile = switch_core_get_variable("sip_profile"); + } + if (switch_strlen_zero(profile)) { + profile = "default"; + } + + outbound_profile->destination_number = switch_core_sprintf(outbound_profile->pool, "%s/%s", profile, outbound_profile->destination_number); return switch_core_session_outgoing_channel(session, "sofia", outbound_profile, new_session, pool); }

1 0

[commit] r6213 - freeswitch/trunk
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 17:25:48 2007 New Revision: 6213 Modified: freeswitch/trunk/Makefile.am Log: update Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Nov 9 17:25:48 2007 @@ -244,7 +244,8 @@ installall: install -sure: clean modwipe uninstall installall +sure: clean modwipe uninstall + $(MAKE) -j install wayclean: clean

1 0

[commit] r6212 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 16:52:24 2007 New Revision: 6212 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Log: update 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 Nov 9 16:52:24 2007 @@ -88,6 +88,25 @@ } +SWITCH_STANDARD_APP(avoid_function) +{ + void *y = NULL; + int x = 0; + + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + for (x = 0; x < 5; x++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Avoiding initial deadlock on channel %s.\n", switch_channel_get_name(channel)); + switch_yield(100000); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "I should never be called!.\n"); + memset((void *) y, 0, 1000); +} + SWITCH_STANDARD_APP(goto_function) @@ -333,7 +352,8 @@ /* a few fake apps for the sake of emulation */ SWITCH_ADD_APP(app_interface, "Dial", "Dial", "Dial", dial_function, "Dial", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "Goto", "Goto", "Goto", goto_function, "Goto", SAF_SUPPORT_NOMEDIA); - + SWITCH_ADD_APP(app_interface, "AvoidingDeadlock", "Avoid", "Avoid", avoid_function, "Avoid", SAF_SUPPORT_NOMEDIA); + /* fake chan_sip facade */ sip_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); sip_endpoint_interface->interface_name = "SIP";

1 0

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

09 Nov '07

Author: anthm Date: Fri Nov 9 16:38:51 2007 New Revision: 6211 Modified: freeswitch/trunk/conf/extensions.conf freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c freeswitch/trunk/src/switch_utils.c Log: update Modified: freeswitch/trunk/conf/extensions.conf ============================================================================== --- freeswitch/trunk/conf/extensions.conf (original) +++ freeswitch/trunk/conf/extensions.conf Fri Nov 9 16:38:51 2007 @@ -1,7 +1,21 @@ [default] + +; Things you're used to.... exten => music,n,Dial(SIP/1234(a)conference.freeswitch.org|120) exten => _1XXXXX,n,set(cool=${EXTEN}) exten => _1XXXXX,n,set(myvar=true) exten => _1XXXXX,n,Goto(default|music) +exten => 2137991400/1000,n,Goto(default|music) + + +; Some new magic you can do.... +exten => ~^(18(0{2}|8{2}|7{2}|6{2})\d{7})$,n,enum($1) +exten => ~^(18(0{2}|8{2}|7{2}|6{2})\d{7})$,n,bridge(${enum_auto_route}) + +; instead of exten, put anyting about the call you would rather match on. +; either the names of a field in caller_profile or a string of variables to expand. +caller_id_number => 2137991400,n,Goto(default|music) +${sip_from_user} => bill,n,Goto(default|music) + 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 Nov 9 16:38:51 2007 @@ -156,20 +156,27 @@ while (switch_config_next_pair(&cfg, &var, &val)) { if (!strcasecmp(cfg.category, context)) { - if (!strcasecmp(var, "exten")) { + char *field_expanded = NULL; + + if (!strcasecmp(var, "include")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "param '%s' not implemented at line %d!\n", var, cfg.lineno); + } else { int argc; char *argv[3] = { 0 }; char *pattern = NULL; char *pri = NULL; char *app = NULL; char *arg = NULL; - char expression[1024] = ""; + char *expression = NULL, expression_buf[1024] = ""; char substituted[2048] = ""; char *field_data = caller_profile->destination_number; int proceed = 0; switch_regex_t *re = NULL; int ovector[30] = {0}; - + char *cid = NULL; + + expression = expression_buf; + 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); @@ -178,23 +185,55 @@ 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 (!strcasecmp(var, "exten")) { + char *p; + if ((p = strchr(pattern, '/'))) { + *p++ = '\0'; + cid = pattern; + pattern = p; + } + } else { + if (strchr(var, '$')) { + if ((field_expanded = switch_channel_expand_variables(channel, var)) == var) { + field_expanded = NULL; + field_data = var; + } else { + field_data = field_expanded; + } + } else { + field_data = (char *)switch_caller_get_field_by_name(caller_profile, var); } + } + + if (*pattern == '_' || *pattern == '~') { + if (*pattern == '_') { + pattern++; + if (switch_ast2regex(pattern, expression_buf, sizeof(expression_buf))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "converting [%s] to real regex [%s] you should try them!\n", + pattern, expression_buf); + } + } else { + pattern++; + expression = pattern; + } + 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); continue; } - } else { - if (strcasecmp(pattern, caller_profile->destination_number)) { + if (strcasecmp(pattern, field_data)) { continue; } } + if (cid) { + if (strcasecmp(cid, caller_profile->caller_id_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)); @@ -217,6 +256,7 @@ } switch_replace_char(arg, '|',',', SWITCH_FALSE); + if (strchr(expression, '(')) { switch_perform_substitution(re, proceed, arg, field_data, substituted, sizeof(substituted), ovector); @@ -225,17 +265,16 @@ switch_regex_safe_free(re); if (!extension) { - if ((extension = switch_caller_extension_new(session, caller_profile->destination_number, - caller_profile->destination_number)) == 0) { + if ((extension = switch_caller_extension_new(session, field_data, field_data)) == 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_safe_free(field_expanded); } } @@ -280,6 +319,7 @@ switch_dialplan_interface_t *dp_interface; switch_application_interface_t *app_interface; char *mykey = NULL; + int x = 0; if ((mykey = key())) { mykey = NULL; @@ -287,15 +327,23 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + /* add a dialplan interface */ SWITCH_ADD_DIALPLAN(dp_interface, "asterisk", asterisk_dialplan_hunt); + + /* a few fake apps for the sake of emulation */ SWITCH_ADD_APP(app_interface, "Dial", "Dial", "Dial", dial_function, "Dial", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "Goto", "Goto", "Goto", goto_function, "Goto", SAF_SUPPORT_NOMEDIA); + /* fake chan_sip facade */ sip_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); sip_endpoint_interface->interface_name = "SIP"; sip_endpoint_interface->io_routines = &sip_io_routines; - + for (x = 0; x < 10; x++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Avoiding Deadlock.\n"); + switch_yield(100000); + } + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Nov 9 16:38:51 2007 @@ -226,6 +226,8 @@ { char *p = pat; memset(rbuf, 0, len); + + *(rbuf + strlen(rbuf)) = '^'; while(p && *p) { if (*p == 'N') { @@ -241,6 +243,7 @@ } p++; } + *(rbuf + strlen(rbuf)) = '$'; return strcmp(pat,rbuf) ? SWITCH_TRUE : SWITCH_FALSE; }

1 0

[commit] r6210 - freeswitch/trunk
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 15:41:11 2007 New Revision: 6210 Modified: freeswitch/trunk/Makefile.am Log: woops Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Nov 9 15:41:11 2007 @@ -158,11 +158,14 @@ install-data-local: @echo Installing $(NAME) - @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ + @for x in conf conf/dialplan conf/directory conf/sip_profiles mod db log log/xml_cdr bin scripts htdocs grammar ; do \ $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ done @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ + $(INSTALL) conf/sip_profiles/*.xml $(DESTDIR)$(PREFIX)/conf/sip_profiles ; \ + $(INSTALL) conf/dialplan/*.xml $(DESTDIR)$(PREFIX)/conf/dialplan ; \ + $(INSTALL) conf/directory/*.xml $(DESTDIR)$(PREFIX)/conf/directory ; \ fi .version:

1 0

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

09 Nov '07

Author: anthm Date: Fri Nov 9 15:38:34 2007 New Revision: 6209 Added: freeswitch/trunk/conf/extensions.conf Log: add example conf Added: freeswitch/trunk/conf/extensions.conf ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/extensions.conf Fri Nov 9 15:38:34 2007 @@ -0,0 +1,7 @@ +[default] +exten => music,n,Dial(SIP/1234(a)conference.freeswitch.org|120) + +exten => _1XXXXX,n,set(cool=${EXTEN}) +exten => _1XXXXX,n,set(myvar=true) +exten => _1XXXXX,n,Goto(default|music) +

1 0

[commit] r6208 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 15:36:53 2007 New Revision: 6208 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Log: cleanup and add a few more goodies lol 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 Nov 9 15:36:53 2007 @@ -36,6 +36,91 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_asterisk_load); SWITCH_MODULE_DEFINITION(mod_dialplan_asterisk, mod_dialplan_asterisk_load, NULL, NULL); +static switch_status_t exec_app(switch_core_session_t *session, char *app, char *arg) +{ + const switch_application_interface_t *application_interface; + + if ((application_interface = switch_loadable_module_get_application_interface(app))) { + return switch_core_session_exec(session, application_interface, arg); + } + + return SWITCH_STATUS_FALSE; +} + + +SWITCH_STANDARD_APP(dial_function) +{ + int argc; + char *argv[4] = { 0 }; + char *mydata; + switch_channel_t *channel; + + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + + if (data && (mydata = switch_core_session_strdup(session, data))) { + if ((argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) { + goto error; + } + + if (argc > 1) { + switch_channel_set_variable(channel, "call_timeout", argv[1]); + } + + switch_replace_char(argv[0], '&',',', SWITCH_FALSE); + + if (exec_app(session, "bridge", argv[0]) != SWITCH_STATUS_SUCCESS) { + goto error; + } + + goto ok; + } + + + error: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); + + ok: + + return; + +} + + + +SWITCH_STANDARD_APP(goto_function) +{ + int argc; + char *argv[3] = { 0 }; + char *mydata; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + + if (data && (mydata = switch_core_session_strdup(session, data))) { + if ((argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { + goto error; + } + + switch_ivr_session_transfer(session, argv[1], "asterisk", argv[0]); + goto ok; + } + + + error: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); + + ok: + + return; + +} + + SWITCH_STANDARD_DIALPLAN(asterisk_dialplan_hunt) { switch_caller_extension_t *extension = NULL; @@ -73,7 +158,7 @@ if (!strcasecmp(cfg.category, context)) { if (!strcasecmp(var, "exten")) { int argc; - char *argv[4] = { 0 }; + char *argv[3] = { 0 }; char *pattern = NULL; char *pri = NULL; char *app = NULL; @@ -85,8 +170,6 @@ 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); @@ -119,21 +202,22 @@ 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) { + 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; } + } else if ((arg = strchr(app, ','))) { + *arg++ = '\0'; } + if (!arg) { + arg = ""; + } + + switch_replace_char(arg, '|',',', SWITCH_FALSE); + if (strchr(expression, '(')) { switch_perform_substitution(re, proceed, arg, field_data, substituted, sizeof(substituted), ovector); arg = substituted; @@ -165,14 +249,53 @@ } +/* fake chan_sip */ +switch_endpoint_interface_t *sip_endpoint_interface; +static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool); +switch_io_routines_t sip_io_routines = { + /*.outgoing_channel */ channel_outgoing_channel +}; + +static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool) +{ + outbound_profile->destination_number = switch_core_sprintf(outbound_profile->pool, "default/%s", outbound_profile->destination_number); + return switch_core_session_outgoing_channel(session, "sofia", outbound_profile, new_session, pool); +} + +#define WE_DONT_NEED_NO_STINKIN_KEY "true" +static char *key() +{ + return WE_DONT_NEED_NO_STINKIN_KEY; +} + + + + SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_asterisk_load) { switch_dialplan_interface_t *dp_interface; + switch_application_interface_t *app_interface; + char *mykey = NULL; + if ((mykey = key())) { + mykey = NULL; + } + /* 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); + SWITCH_ADD_APP(app_interface, "Dial", "Dial", "Dial", dial_function, "Dial", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "Goto", "Goto", "Goto", goto_function, "Goto", SAF_SUPPORT_NOMEDIA); + + sip_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); + sip_endpoint_interface->interface_name = "SIP"; + sip_endpoint_interface->io_routines = &sip_io_routines; + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

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

09 Nov '07

Author: intralanman Date: Fri Nov 9 14:35:05 2007 New Revision: 6207 Modified: freeswitch/trunk/conf/dialplan/US.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/directory/default.xml Log: changed US.conf to use ${default_gateway} so it can be user specific and the default context to not transfer if the numbering plan isn't set. Modified: freeswitch/trunk/conf/dialplan/US.conf.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/US.conf.xml (original) +++ freeswitch/trunk/conf/dialplan/US.conf.xml Fri Nov 9 14:35:05 2007 @@ -9,7 +9,7 @@ <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"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/011$1"/> </condition> </extension> @@ -22,7 +22,7 @@ <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"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/1$1"/> </condition> </extension> @@ -40,7 +40,7 @@ <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"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/1${default_area_code}$1"/> </condition> </extension> @@ -53,7 +53,7 @@ --> <extension name="FCC_Services"> <condition field="^([4689]11)$"> - <action application="bridge" data="sofia/gateway/$${default_gateway}/$1"/> + <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 14:35:05 2007 @@ -96,6 +96,7 @@ <extension name="Localized_Dialplan"> <condition field="${numbering_plan}" expression="^[[:alnum:]]+$"/> + <condition field="${default_gateway}" expression="[[:alnum:]]"/> <condition field="destination_number" expression="^([[:alnum:]]+)$"> <action application="transfer" data="$1 XML ${numbering_plan}-Numbering-Plan"/> </condition> Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Fri Nov 9 14:35:05 2007 @@ -50,6 +50,18 @@ <variables>  <variable name="testing" value="this"/> + +  +  + +  +  + +  +  +  +  +    @@ -67,12 +79,6 @@   </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] r6206 - in freeswitch/trunk: build conf
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 14:27:16 2007 New Revision: 6206 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/modules.conf.xml Log: update config Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Fri Nov 9 14:27:16 2007 @@ -26,6 +26,7 @@ #codecs/mod_speex #dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml +dialplans/mod_dialplan_asterisk #directories/mod_ldap #endpoints/mod_dingaling #endpoints/mod_iax Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Fri Nov 9 14:27:16 2007 @@ -44,6 +44,7 @@   <load module="mod_dialplan_xml"/> + <load module="mod_dialplan_asterisk"/>  <load module="mod_g711"/>

1 0