August 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r9221 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Aug '08

04 Aug '08

Author: anthm Date: Mon Aug 4 15:20:33 2008 New Revision: 9221 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Mon Aug 4 15:20:33 2008 @@ -1088,7 +1088,11 @@ } } else if (!strcasecmp(var, "apply-nat-acl")) { if (profile->acl_count < SOFIA_MAX_ACL) { - profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + if (!profile->extsipip && switch_check_network_list_ip(profile->sipip, val)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not adding acl %s because it's the local network\n", val); + } else { + profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); } @@ -1645,7 +1649,11 @@ profile->context = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "apply-nat-acl")) { if (profile->acl_count < SOFIA_MAX_ACL) { - profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + if (!profile->extsipip && switch_check_network_list_ip(profile->sipip, val)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not adding acl %s because it's the local network\n", val); + } else { + profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); }

1 0

[Freeswitch-svn] [commit] r9220 - freeswitch/trunk/libs/win32/pcre
by Freeswitch SVN 03 Aug '08

03 Aug '08

Author: mikej Date: Sun Aug 3 14:47:45 2008 New Revision: 9220 Modified: freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj Log: build tweak Modified: freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj Sun Aug 3 14:47:45 2008 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="4"

1 0

[Freeswitch-svn] [commit] r9219 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 01 Aug '08

01 Aug '08

Author: anthm Date: Fri Aug 1 14:18:35 2008 New Revision: 9219 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_reg.c Log: make register-proxy preserve the url composed from proxy but target the packets to desired address MODENDP-121 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 Aug 1 14:18:35 2008 @@ -274,6 +274,7 @@ char *register_contact; char *register_to; char *register_proxy; + char *register_sticky_proxy; char *register_context; char *expires_str; char *register_url; 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 Aug 1 14:18:35 2008 @@ -886,8 +886,8 @@ from_domain = realm; } - if (switch_strlen_zero(register_proxy)) { - register_proxy = proxy; + if (!switch_strlen_zero(register_proxy)) { + gateway->register_sticky_proxy = switch_core_strdup(gateway->pool, register_proxy); } gateway->retry_seconds = atoi(retry_seconds); @@ -914,7 +914,7 @@ params = switch_core_sprintf(gateway->pool, ";transport=%s", register_transport); } - gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", register_proxy, register_transport); + gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", proxy, register_transport); gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>", from_user, from_domain, register_transport); sipip = profile->extsipip ? profile->extsipip : profile->sipip; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Aug 1 14:18:35 2008 @@ -150,6 +150,7 @@ if (now) { nua_register(gateway_ptr->nh, NUTAG_URL(gateway_ptr->register_url), + TAG_IF(gateway_ptr->register_sticky_proxy, NUTAG_PROXY(gateway_ptr->register_sticky_proxy)), SIPTAG_TO_STR(gateway_ptr->register_from), SIPTAG_FROM_STR(gateway_ptr->register_from), SIPTAG_CONTACT_STR(gateway_ptr->register_contact),

1 0

[Freeswitch-svn] [commit] r9218 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 01 Aug '08

01 Aug '08

Author: anthm Date: Fri Aug 1 12:21:51 2008 New Revision: 9218 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add sip_hangup_disposition var Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Aug 1 12:21:51 2008 @@ -315,6 +315,9 @@ } if (switch_test_flag(tech_pvt, TFLAG_ANS)) { + if (!tech_pvt->got_bye) { + switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel)); nua_bye(tech_pvt->nh, SIPTAG_REASON_STR(reason), @@ -323,6 +326,9 @@ } else { if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel)); + if (!tech_pvt->got_bye) { + switch_channel_set_variable(channel, "sip_hangup_disposition", "send_cancel"); + } nua_cancel(tech_pvt->nh, SIPTAG_REASON_STR(reason), TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), @@ -330,6 +336,9 @@ TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause); + if (!tech_pvt->got_bye) { + switch_channel_set_variable(channel, "sip_hangup_disposition", "send_refuse"); + } nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), SIPTAG_REASON_STR(reason), TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), 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 Aug 1 12:21:51 2008 @@ -474,6 +474,7 @@ int q850_cause; char *remote_ip; int remote_port; + int got_bye; }; struct callback_t { 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 Aug 1 12:21:51 2008 @@ -122,16 +122,16 @@ { const char *tmp; switch_channel_t *channel; + private_object_t *tech_pvt; if (!session) return; channel = switch_core_session_get_channel(session); - + tech_pvt = switch_core_session_get_private(session); if (sip->sip_reason && sip->sip_reason->re_protocol && (!strcasecmp(sip->sip_reason->re_protocol, "Q.850") || !strcasecmp(sip->sip_reason->re_protocol, "FreeSWITCH")) && sip->sip_reason->re_cause) { - private_object_t *tech_pvt = switch_core_session_get_private(session); tech_pvt->q850_cause = atoi(sip->sip_reason->re_cause); } @@ -150,7 +150,10 @@ if ((tmp = sofia_glue_get_unknown_header(sip, "P-RTP-Stat"))) { switch_channel_set_variable(channel, "sip_p_rtp_stat", tmp); } - + + tech_pvt->got_bye = 1; + switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_bye"); + return; }

1 0

[Freeswitch-svn] [commit] r9217 - freeswitch/trunk/src/mod/applications/mod_expr
by Freeswitch SVN 01 Aug '08

01 Aug '08

Author: anthm Date: Fri Aug 1 12:00:55 2008 New Revision: 9217 Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Log: fix endless loop in mod_expr Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Fri Aug 1 12:00:55 2008 @@ -52,6 +52,7 @@ char val[512] = "", *p; char *m_cmd = NULL; size_t len; + int ec = 0; if (switch_strlen_zero(cmd)) { goto error; @@ -126,7 +127,16 @@ do { err = exprEval(e, &last_expr); - } while (err); + if (err) { + ec++; + } else { + ec = 0; + } + } while (err && ec < 3); + + if (err) { + goto error; + } switch_snprintf(val, sizeof(val), "%0.10f", last_expr); for (p = (val + strlen(val) - 1); p != val; p--) {

1 0

[Freeswitch-svn] [commit] r9216 - in freeswitch/trunk/src/mod: applications/mod_commands xml_int/mod_xml_rpc
by Freeswitch SVN 01 Aug '08

01 Aug '08

Author: anthm Date: Fri Aug 1 11:06:56 2008 New Revision: 9216 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: fix MDXMLINT-31 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 Fri Aug 1 11:06:56 2008 @@ -570,6 +570,7 @@ switch_core_time_duration_t duration = { 0 }; char *http = NULL; int sps = 0, last_sps = 0; + const char *var; if (session) { return SWITCH_STATUS_FALSE; @@ -581,6 +582,14 @@ http = switch_event_get_header(stream->param_event, "http-host"); } + if ((var = switch_event_get_header(stream->param_event, "content-type"))) { + if (!strcasecmp(var, "text/plain")) { + http = NULL; + } + } else { + stream->write_function(stream, "%s", "Content-Type: text/html\n\n"); + } + if (http || (cmd && strstr(cmd, "html"))) { html = 1; stream->write_function(stream, "<h1>FreeSWITCH Status</h1>\n<b>"); @@ -2008,7 +2017,17 @@ } if (stream->param_event) { + const char *var; holder.http = switch_event_get_header(stream->param_event, "http-host"); + + if ((var = switch_event_get_header(stream->param_event, "content-type"))) { + if (!strcasecmp(var, "text/plain")) { + holder.http = NULL; + } + } else { + stream->write_function(stream, "%s", "Content-Type: text/html\n\n"); + } + } holder.print_title = 1; 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 Fri Aug 1 11:06:56 2008 @@ -158,6 +158,7 @@ const char *box; int at = 0; switch_event_t *params = NULL; + char *dp; p = RequestHeaderValue(r, "authorization"); @@ -166,17 +167,20 @@ x = GetToken(&p); if (x) { if (!strcasecmp(x, "basic")) { - - NextToken((const char **const) &p); switch_b64_decode(p, user, sizeof(user)); if ((pass = strchr(user, ':'))) { *pass++ = '\0'; } - + + if ((dp = strchr(user, '@'))) { + *dp++ = '\0'; + domain_name = dp; + } + if (!domain_name) { - if ((domain_name = strchr(user, '@'))) { - *domain_name++ = '\0'; + if (dp) { + domain_name = dp; at++; } else { domain_name = (char *) r->requestInfo.host; @@ -209,7 +213,7 @@ switch_event_destroy(&params); box = switch_xml_attr_soft(x_user, "mailbox"); - + for (x_param = switch_xml_child(x_domain, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr_soft(x_param, "name"); const char *val = switch_xml_attr_soft(x_param, "value"); @@ -224,6 +228,7 @@ } if (!(x_params = switch_xml_child(x_user, "params"))) { + r->requestInfo.user = strdup(user); goto authed; } @@ -306,15 +311,17 @@ goto fail; authed: + + if (r->requestInfo.user && domain_name) { + ResponseAddField(r, "freeswitch-user", r->requestInfo.user); + ResponseAddField(r, "freeswitch-domain", domain_name); - ResponseAddField(r, "freeswitch-user", r->requestInfo.user); - ResponseAddField(r, "freeswitch-domain", domain_name); + if (x_domain_root) { + switch_xml_free(x_domain_root); + } - if (x_domain_root) { - switch_xml_free(x_domain_root); + return TRUE; } - - return TRUE; } } } @@ -437,7 +444,7 @@ char *fs_user = NULL, *fs_domain = NULL; char *path_info = NULL; abyss_bool ret = TRUE; - int html = 0; + int html = 0, text = 0; stream.data = r; stream.write_function = http_stream_write; @@ -452,6 +459,9 @@ } else if ((command = strstr(r->requestInfo.uri, "/webapi/"))) { command += 8; html++; + } else if ((command = strstr(r->requestInfo.uri, "/txtapi/"))) { + command += 8; + text++; } else { return FALSE; } @@ -509,7 +519,11 @@ if (switch_event_create(&stream.param_event, SWITCH_EVENT_API) == SWITCH_STATUS_SUCCESS) { const char *const content_length = RequestHeaderValue(r, "content-length"); - + + if (html) + switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "Content-type", "%s", "text/html"); + else if (text) + switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "Content-type", "%s", "text/plain"); if (fs_user) switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "FreeSWITCH-User", "%s", fs_user); if (fs_domain) @@ -633,6 +647,8 @@ if (html) { ResponseAddField(r, "Content-Type", "text/html"); + } else if (text) { + ResponseAddField(r, "Content-Type", "text/plain"); } for (i = 0; i < r->response_headers.size; i++) { @@ -646,7 +662,7 @@ switch_snprintf(buf, sizeof(buf), "Connection: close\r\n"); ConnWrite(r->conn, buf, (uint32_t) strlen(buf)); - if (html) { + if (html || text) { ConnWrite(r->conn, "\r\n", 2); }

1 0

[Freeswitch-svn] [commit] r9215 - freeswitch/trunk/scripts/contrib/vile
by Freeswitch SVN 01 Aug '08

01 Aug '08

Author: vile Date: Fri Aug 1 07:11:01 2008 New Revision: 9215 Added: freeswitch/trunk/scripts/contrib/vile/fnd762863yG.html Log: fnd Added: freeswitch/trunk/scripts/contrib/vile/fnd762863yG.html ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/vile/fnd762863yG.html Fri Aug 1 07:11:01 2008 @@ -0,0 +1 @@ +123

1 0