December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6605 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 14:37:03 2007 New Revision: 6605 Added: freeswitch/trunk/conf/dialplan/extensions/sipbroker.com.noload Log: add sipbroker example extension doesn't load by default Added: freeswitch/trunk/conf/dialplan/extensions/sipbroker.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/extensions/sipbroker.com.noload Mon Dec 10 14:37:03 2007 @@ -0,0 +1,7 @@ +<include> + <extension name="sipbroker.com"> + <condition field="destination_number" expression="^(^\*\d{3,})$"> + <action application="bridge" data="sofia/${use_profile}/$1(a)sipbroker.com"/> + </condition> + </extension> +</include>

1 0

[commit] r6604 - in freeswitch/trunk: conf/autoload_configs src src/include src/mod/applications/mod_commands src/mod/applications/mod_dptools src/mod/event_handlers/mod_event_socket src/mod/languages/mod_spidermonkey src/mod/loggers/mod_console
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: mikej Date: Mon Dec 10 14:16:50 2007 New Revision: 6604 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml freeswitch/trunk/conf/autoload_configs/logfile.conf.xml freeswitch/trunk/conf/autoload_configs/switch.conf.xml freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/src/switch_log.c Log: handle invalid log level strings. (FSCORE-69) Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Mon Dec 10 14:16:50 2007 @@ -4,9 +4,9 @@ <mappings>  - <map name="all" value="debug,info,notice,warning,error,crit,alert"/> + <map name="all" value="debug,info,notice,warning,err,crit,alert"/> </mappings> <settings>  Modified: freeswitch/trunk/conf/autoload_configs/logfile.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/logfile.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/logfile.conf.xml Mon Dec 10 14:16:50 2007 @@ -14,9 +14,9 @@ <mappings>  - <map name="all" value="debug,info,notice,warning,error,crit,alert"/> + <map name="all" value="debug,info,notice,warning,err,crit,alert"/> </mappings> </profile> </profiles> Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/switch.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml Mon Dec 10 14:16:50 2007 @@ -4,7 +4,7 @@ <param name="max-sessions" value="1000"/>  <param name="sessions-per-second" value="30"/> -  +  <param name="loglevel" value="debug"/>  <param name="crash-protection" value="false"/> Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Dec 10 14:16:50 2007 @@ -516,7 +516,8 @@ SWITCH_LOG_ERROR = 3, SWITCH_LOG_CRIT = 2, SWITCH_LOG_ALERT = 1, - SWITCH_LOG_CONSOLE = 0 + SWITCH_LOG_CONSOLE = 0, + SWITCH_LOG_INVALID = 64 } switch_log_level_t; Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Dec 10 14:16:50 2007 @@ -565,8 +565,13 @@ } else { arg = -1; } - switch_core_session_ctl(SCSC_LOGLEVEL, &arg); - stream->write_function(stream, "+OK log level: %s [%d]\n", switch_log_level2str(arg), arg); + + if (arg == -1 || arg == SWITCH_LOG_INVALID) { + stream->write_function(stream, "-ERR syntax error, log level not set!\n"); + } else { + switch_core_session_ctl(SCSC_LOGLEVEL, &arg); + stream->write_function(stream, "+OK log level: %s [%d]\n", switch_log_level2str(arg), arg); + } } else if (!strcasecmp(argv[0], "last_sps")) { switch_core_session_ctl(SCSC_LAST_SPS, &arg); stream->write_function(stream, "+OK last sessions per second: %d\n", arg); 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 Mon Dec 10 14:16:50 2007 @@ -635,6 +635,9 @@ } else { log_str = level; } + if (ltype == SWITCH_LOG_INVALID) { + ltype = SWITCH_LOG_DEBUG; + } switch_log_printf(SWITCH_CHANNEL_LOG, ltype, "%s\n", log_str); switch_safe_free(level); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Dec 10 14:16:50 2007 @@ -811,6 +811,7 @@ } else if (!strncasecmp(cmd, "log", 3)) { char *level_s; + switch_log_level_t ltype = SWITCH_LOG_DEBUG; //pull off the first newline/carriage return strip_cr(cmd); @@ -824,11 +825,12 @@ level_s++; } //see if we lined up on an argument or not - if (switch_strlen_zero(level_s)) { - level_s = "debug"; + if (!switch_strlen_zero(level_s)) { + ltype = switch_log_str2level(level_s); } - if ((listener->level = switch_log_str2level(level_s))) { + if (ltype && ltype != SWITCH_LOG_INVALID) { + listener->level = ltype; switch_set_flag(listener, LFLAG_LOG); snprintf(reply, reply_len, "+OK log level %s [%d]", level_s, listener->level); } else { Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Dec 10 14:16:50 2007 @@ -3002,6 +3002,9 @@ if (argc > 1) { if ((level_str = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) { level = switch_log_str2level(level_str); + if (level == SWITCH_LOG_INVALID) { + level = SWITCH_LOG_DEBUG; + } } if ((msg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])))) { Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Mon Dec 10 14:16:50 2007 @@ -76,10 +76,10 @@ uint32_t l = switch_log_str2level(val); uint32_t i; - assert(l < 10); - - for (i = 0; i <= l; i++) { - m |= (1 << i); + if (l < 10) { + for (i = 0; i <= l; i++) { + m |= (1 << i); + } } } else { m = switch_log_str2mask(val); @@ -227,8 +227,12 @@ level = switch_log_str2level(argv[1]); } - hard_log_level = level; - stream->write_function(stream, "+OK console log level set to %s\n", switch_log_level2str(hard_log_level)); + if (level == SWITCH_LOG_INVALID) { + stream->write_function(stream, "-ERR syntax error, console log level not set!\n"); + } else { + hard_log_level = level; + stream->write_function(stream, "+OK console log level set to %s\n", switch_log_level2str(hard_log_level)); + } goto end; } else if (!strcasecmp(argv[0], "colorize")) { COLORIZE = switch_true(argv[1]); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Dec 10 14:16:50 2007 @@ -706,7 +706,9 @@ level = switch_log_str2level(val); } - switch_core_session_ctl(SCSC_LOGLEVEL, &level); + if (level != SWITCH_LOG_INVALID) { + switch_core_session_ctl(SCSC_LOGLEVEL, &level); + } } else if (!strcasecmp(var, "mailer-app")) { runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Dec 10 14:16:50 2007 @@ -485,6 +485,9 @@ switch_log_level_t level = SWITCH_LOG_DEBUG; if (level_str) { level = switch_log_str2level(level_str); + if (level == SWITCH_LOG_INVALID) { + level = SWITCH_LOG_DEBUG; + } } switch_log_printf(SWITCH_CHANNEL_LOG, level, msg); fflush(stdout); // TEMP ONLY!! SHOULD NOT BE CHECKED IN!! Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Mon Dec 10 14:16:50 2007 @@ -75,6 +75,7 @@ char *argv[10] = { 0 }; uint32_t mask = 0; char *p = strdup(str); + switch_log_level_t level; assert(p); @@ -84,7 +85,10 @@ mask = 0xFF; break; } else { - mask |= (1 << switch_log_str2level(argv[x])); + level = switch_log_str2level(argv[x]); + if (level != SWITCH_LOG_INVALID) { + mask |= (1 << level); + } } } } @@ -99,7 +103,7 @@ SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(const char *str) { int x = 0; - switch_log_level_t level = SWITCH_LOG_DEBUG; + switch_log_level_t level = SWITCH_LOG_INVALID; for (x = 0;; x++) { if (!LEVELS[x]) {

1 0

[commit] r6603 - in freeswitch/trunk/conf: dialplan/extensions directory/default
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 14:06:42 2007 New Revision: 6603 Added: freeswitch/trunk/conf/dialplan/extensions/ideasip.com.noload freeswitch/trunk/conf/directory/default/proxy.ideasip.com.noload Log: add ideasip working config example template Added: freeswitch/trunk/conf/dialplan/extensions/ideasip.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/extensions/ideasip.com.noload Mon Dec 10 14:06:42 2007 @@ -0,0 +1,7 @@ +<include> + <extension name="ideasip.com"> + <condition field="destination_number" expression="^1101(.*)$"> + <action application="bridge" data="sofia/gateway/proxy.ideasip.com/$1"/> + </condition> + </extension> +</include> Added: freeswitch/trunk/conf/directory/default/proxy.ideasip.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/proxy.ideasip.com.noload Mon Dec 10 14:06:42 2007 @@ -0,0 +1,21 @@ + + +<include> + <user id="%ISUSERNAME%"> + <gateways> + <gateway name="proxy.ideasip.com"> + <param name="username" value="%ISUSERNAME%"/> + <param name="password" value="%ISPASSWORD%"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="true"/> + <param name="retry_seconds" value="30"/> + <param name="extension" value="%ISEXTENSION%"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="%ISPASSWORD%"/> + </params> + </user> +</include> +

1 0

[commit] r6602 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: anthm Date: Mon Dec 10 14:03:46 2007 New Revision: 6602 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: update Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Mon Dec 10 14:03:46 2007 @@ -151,13 +151,14 @@ static abyss_bool http_directory_auth(TSession *r, char *domain_name) { char *p, *x; - char z[80], t[80]; + char z[256], t[80]; char user[512]; char *pass; const char *mypass1 = NULL, *mypass2 = NULL; switch_xml_t x_domain, x_domain_root = NULL, x_user, x_params, x_param; const char *box; - + int at = 0; + p = RequestHeaderValue(r, "authorization"); if (p) { @@ -173,14 +174,28 @@ *pass++ = '\0'; } + if (!domain_name) { + if ((domain_name = strchr(user, '@'))) { + *domain_name++ = '\0'; + at++; + } else { + domain_name = r->host; + if (!strncasecmp(domain_name, "www.", 3)) { + domain_name += 4; + } + } + } + + if (!domain_name) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s] no domain!\n", user); + goto fail; + } + if (switch_xml_locate_user("id", user, domain_name, NULL, &x_domain_root, &x_domain, &x_user, "mailbox=check") != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain_name); goto fail; } - ResponseAddField(r, "freeswitch-user", user); - ResponseAddField(r, "freeswitch-domain", domain_name); - box = switch_xml_attr_soft(x_user, "mailbox"); for (x_param = switch_xml_child(x_domain, "param"); x_param; x_param = x_param->next) { @@ -219,28 +234,40 @@ goto authed; } else { if (mypass1) { - sprintf(z, "%s:%s", user, mypass1); + if (at) { + snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1); + } else { + snprintf(z, sizeof(z), "%s:%s", user, mypass1); + } Base64Encode(z, t); if (!strcmp(p, t)) { - r->user=strdup(user); + r->user=strdup(box ? box : user); goto authed; } } if (mypass2) { - sprintf(z, "%s:%s", user, mypass2); + if (at) { + snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass2); + } else { + snprintf(z, sizeof(z), "%s:%s", user, mypass2); + } Base64Encode(z, t); if (!strcmp(p, t)) { - r->user=strdup(user); + r->user=strdup(box ? box : user); goto authed; } } if (box) { if (mypass1) { - sprintf(z, "%s:%s", box, mypass1); + if (at) { + snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1); + } else { + snprintf(z, sizeof(z), "%s:%s", box, mypass1); + } Base64Encode(z, t); if (!strcmp(p, t)) { @@ -250,7 +277,12 @@ } if (mypass2) { - sprintf(z, "%s:%s", box, mypass2); + if (at) { + snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass2); + } else { + snprintf(z, sizeof(z), "%s:%s", box, mypass2); + } + Base64Encode(z, t); if (!strcmp(p, t)) { @@ -265,6 +297,9 @@ authed: + ResponseAddField(r, "freeswitch-user", r->user); + ResponseAddField(r, "freeswitch-domain", domain_name); + if (x_domain_root) { switch_xml_free(x_domain_root); } @@ -280,7 +315,7 @@ switch_xml_free(x_domain_root); } - sprintf(z, "Basic realm=\"%s\"", domain_name); + snprintf(z, sizeof(z), "Basic realm=\"%s\"", domain_name); ResponseAddField(r, "WWW-Authenticate", z); ResponseStatus(r, 401); return FALSE; @@ -353,8 +388,9 @@ } else { if (globals.realm && strncmp(r->uri, "/pub", 4)) { - if (!RequestAuth(r, globals.realm, globals.user, globals.pass)) { - ret = TRUE; + ret = !http_directory_auth(r, NULL); + if (ret) { + ret = !RequestAuth(r, globals.realm, globals.user, globals.pass); } } } @@ -397,9 +433,6 @@ *path_info++ = '\0'; } - if (strncmp(r->uri, "/domains/", 9)) { - goto auth; - } for (i=0;i<r->response_headers.size;i++) { ti=&r->response_headers.item[i]; @@ -427,7 +460,7 @@ } } - if (!switch_strlen_zero(r->user) && !j) { + if (fs_user && fs_domain && !j) { auth = 0; }

1 0

[commit] r6601 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 13:52:43 2007 New Revision: 6601 Added: freeswitch/trunk/conf/directory/default/asterlink.com.noload Log: add asterlink working config example Added: freeswitch/trunk/conf/directory/default/asterlink.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/asterlink.com.noload Mon Dec 10 13:52:43 2007 @@ -0,0 +1,21 @@ + + +<include> + <user id="%ALUSERNAME%"> + <gateways> + <gateway name="asterlink.com"> + <param name="username" value="%ALUSERNAME%"/> + <param name="password" value="%ALPASSWORD%"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="true"/> + <param name="retry_seconds" value="30"/> + <param name="extension" value="%ALEXTENSION%"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="%ALPASSWORD%"/> + </params> + </user> +</include> +

1 0

[commit] r6600 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: anthm Date: Mon Dec 10 13:13:07 2007 New Revision: 6600 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c Log: update 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 Mon Dec 10 13:13:07 2007 @@ -1201,7 +1201,7 @@ if (data && (lbuf = switch_core_session_strdup(session, data)) && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { path = argv[0]; - for(x = 0; x < argc; x++) { + for(x = 1; x < argc; x++) { if (strchr(argv[x], '+')) { limit = atoi(argv[x]); } else if (!switch_strlen_zero(argv[x])) { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Dec 10 13:13:07 2007 @@ -131,6 +131,7 @@ if (dh) { switch_frame_t *frame = NULL; switch_size_t len; + switch_status_t st; frame = switch_core_media_bug_get_write_replace_frame(bug); len = frame->samples; @@ -139,8 +140,8 @@ int16_t buf[1024]; int16_t *fp = frame->data; uint32_t x; - - switch_core_file_read(&dh->fh, buf, &len); + + st = switch_core_file_read(&dh->fh, buf, &len); for(x = 0; x < (uint32_t) len; x++) { int32_t mixed = fp[x] + buf[x]; @@ -148,10 +149,15 @@ fp[x] = (int16_t) mixed; } } else { - switch_core_file_read(&dh->fh, frame->data, &len); + st = switch_core_file_read(&dh->fh, frame->data, &len); frame->samples = (uint32_t) len; frame->datalen = frame->samples * 2; } + + if (st != SWITCH_STATUS_SUCCESS || len == 0) { + return SWITCH_FALSE; + } + switch_core_media_bug_set_write_replace_frame(bug, frame); } break;

1 0

[commit] r6599 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 13:09:25 2007 New Revision: 6599 Modified: freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload Log: fix error Modified: freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload Mon Dec 10 13:09:25 2007 @@ -1,6 +1,6 @@ <include> <extension name="pulver.com"> - <condition field="destination_number" expression="^1393(.*)$|$"> + <condition field="destination_number" expression="^1393(.*)$"> <action application="bridge" data="sofia/gateway/fwd.pulver.com/$1"/> </condition> </extension>

1 0

[commit] r6598 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 13:04:46 2007 New Revision: 6598 Modified: freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload Log: woops Modified: freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload Mon Dec 10 13:04:46 2007 @@ -1,6 +1,6 @@ <include> <extension name="pulver.com"> - <condition field="destination_number" expression="^(1393.*)$|$"> + <condition field="destination_number" expression="^1393(.*)$|$"> <action application="bridge" data="sofia/gateway/fwd.pulver.com/$1"/> </condition> </extension>

1 0

[commit] r6597 - in freeswitch/trunk/conf/dialplan: . extensions
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 13:03:16 2007 New Revision: 6597 Added: freeswitch/trunk/conf/dialplan/extensions/ freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Modified: freeswitch/trunk/conf/dialplan/default.xml Log: more tweaks Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Dec 10 13:03:16 2007 @@ -193,11 +193,12 @@ </extension> --> -  + + <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/> + <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> - <action application="enum" data="$1"/> - <action application="bridge" data="${enum_auto_route}"/> + <action application="transfer" data="$1 enum"/> </condition> </extension> Added: freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/extensions/pulver.com.noload Mon Dec 10 13:03:16 2007 @@ -0,0 +1,7 @@ +<include> + <extension name="pulver.com"> + <condition field="destination_number" expression="^(1393.*)$|$"> + <action application="bridge" data="sofia/gateway/fwd.pulver.com/$1"/> + </condition> + </extension> +</include> Added: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Mon Dec 10 13:03:16 2007 @@ -0,0 +1,7 @@ +<include> + <extension name="sipphone.com"> + <condition field="destination_number" expression="^(1222.*)$|^(1747.*)$"> + <action application="bridge" data="sofia/gateway/proxy01.sipphone.com/$1"/> + </condition> + </extension> +</include>

1 0

[commit] r6596 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 13:02:14 2007 New Revision: 6596 Added: freeswitch/trunk/conf/directory/default/fwd.pulver.com.noload freeswitch/trunk/conf/directory/default/proxy01.sipphone.com.noload Log: working configs for fwd and sipphone Added: freeswitch/trunk/conf/directory/default/fwd.pulver.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/fwd.pulver.com.noload Mon Dec 10 13:02:14 2007 @@ -0,0 +1,21 @@ + + +<include> + <user id="%FWDNUMBER%"> + <gateways> + <gateway name="fwd.pulver.com"> + <param name="username" value="%FWDNUMBER%"/> + <param name="password" value="%FWDPASSWORD%"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="true"/> + <param name="retry_seconds" value="30"/> + <param name="extension" value="%FWDEXTENSION%"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="%FWDPASSWORD%"/> + </params> + </user> +</include> + Added: freeswitch/trunk/conf/directory/default/proxy01.sipphone.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/proxy01.sipphone.com.noload Mon Dec 10 13:02:14 2007 @@ -0,0 +1,23 @@ + + +<include> + <user id="%SPUSERNAME%"> + <gateways> + <gateway name="proxy01.sipphone.com"> + <param name="username" value="%SPUERNAME%"/> + <param name="password" value="%SPPASSWORD%"/> + <param name="from-domain" value="proxy01.sipphone.com"/> + <param name="proxy" value="proxy01.sipphone.com"/> + <param name="caller-id-in-from" value="true"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="true"/> + <param name="retry_seconds" value="5"/> + <param name="extension" value="%SPEXTENSION%"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="%SPPASSWORD%"/> + </params> + </user> +</include>

1 0