- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

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

10 Dec '07

Author: brian Date: Mon Dec 10 12:50:12 2007 New Revision: 6595 Modified: freeswitch/trunk/conf/directory/default.xml Log: tweak Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Mon Dec 10 12:50:12 2007 @@ -1,6 +1,6 @@ <include>  <domain name="$${domain}"> - <X-PRE-PROCESS cmd="include" data="*/*.xml"/> + <X-PRE-PROCESS cmd="include" data="default/*.xml"/> </domain> </include>

1 0

[commit] r6594 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: trixter Date: Mon Dec 10 12:32:58 2007 New Revision: 6594 Modified: freeswitch/trunk/scripts/contrib/trixter/disa.js Log: update the callback to better deal with chat events Modified: freeswitch/trunk/scripts/contrib/trixter/disa.js ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/disa.js (original) +++ freeswitch/trunk/scripts/contrib/trixter/disa.js Mon Dec 10 12:32:58 2007 @@ -115,6 +115,7 @@ if(digits!='false') { return digits; } return false; // stop playback if any } + return true; // we can be here if we got an event perhaps text chat }

1 0

[commit] r6593 - in freeswitch/trunk/conf/sip_profiles: . outbound
by Freeswitch SVN 10 Dec '07

10 Dec '07

Author: brian Date: Mon Dec 10 12:23:34 2007 New Revision: 6593 Added: freeswitch/trunk/conf/sip_profiles/outbound/ freeswitch/trunk/conf/sip_profiles/outbound/example.xml Modified: freeswitch/trunk/conf/sip_profiles/nat.xml Log: more tweaks Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Mon Dec 10 12:23:34 2007 @@ -3,11 +3,6 @@ <X-PRE-PROCESS cmd="include" data="nat/*.xml"/> </gateways> - <domains> -  -  - </domains> - <settings> <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> @@ -21,7 +16,7 @@ <param name="manage-presence" value="true"/> <param name="inbound-codec-negotiation" value="generous"/> <param name="nonce-ttl" value="60"/> - <param name="auth-calls" value="false"/> + <param name="auth-calls" value="true"/> <param name="rtp-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> Added: freeswitch/trunk/conf/sip_profiles/outbound/example.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/outbound/example.xml Mon Dec 10 12:23:34 2007 @@ -0,0 +1,34 @@ +<include> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +</include>

1 0