- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11471 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: brian Date: Fri Jan 23 15:40:54 2009 New Revision: 11471 Log: lets default to zero Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 23 15:40:54 2009 @@ -919,6 +919,10 @@ globals.codec_ms = 20; } + if (!globals.dual_streams) { + globals.dual_streams = 0; + } + if (!globals.ring_interval) { globals.ring_interval = 5; }

1 0

[commit] r11470 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: brian Date: Fri Jan 23 15:34:43 2009 New Revision: 11470 Log: make this param optional in the config on all platforms but solaris since it doesn't like it anyway Modified: freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml Fri Jan 23 15:34:43 2009 @@ -15,6 +15,8 @@    +  +   <param name="hold-file" value="$${hold_music}"/> Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 23 15:34:43 2009 @@ -782,8 +782,6 @@ /* dual streams makes portaudio on solaris choke */ #if defined(sun) || defined(__sun) globals.dual_streams = 0; -#else - globals.dual_streams = 1; #endif if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { @@ -863,6 +861,12 @@ set_global_ring_file(val); } else if (!strcmp(var, "hold-file")) { set_global_hold_file(val); + } else if (!strcmp(var, "dual-streams")) { + if (switch_true(val)) { + globals.dual_streams = 1; + } else { + globals.dual_streams = 0; + } } else if (!strcmp(var, "timer-name")) { set_global_timer_name(val); } else if (!strcmp(var, "sample-rate")) {

1 0

[commit] r11469 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: brian Date: Fri Jan 23 15:27:24 2009 New Revision: 11469 Log: remove rate option from call desc. Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 23 15:27:24 2009 @@ -1777,7 +1777,7 @@ "pa help\n" "pa dump\n" "pa rescan\n" - "pa call <dest> [<dialplan> <cid_name> <cid_num> <rate>]\n" + "pa call <dest> [<dialplan> <cid_name> <cid_num>]\n" "pa answer [<call_id>]\n" "pa hangup [<call_id>]\n" "pa list\n"

1 0

[commit] r11468 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: anthm Date: Fri Jan 23 14:33:30 2009 New Revision: 11468 Log: allow <params> tag in gateways as well as <variables> with direction inbound/outbound (default both) and call counter 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 freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Jan 23 14:33:30 2009 @@ -1503,22 +1503,25 @@ switch_assert(gp->state < REG_STATE_LAST); stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(gp->name)); - stream->write_function(stream, "Scheme \t\t%s\n", switch_str_nil(gp->register_scheme)); - stream->write_function(stream, "Realm \t\t%s\n", switch_str_nil(gp->register_realm)); - stream->write_function(stream, "Username\t\t%s\n", switch_str_nil(gp->register_username)); - stream->write_function(stream, "Password\t\t%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); - stream->write_function(stream, "From \t\t%s\n", switch_str_nil(gp->register_from)); - stream->write_function(stream, "Contact \t\t%s\n", switch_str_nil(gp->register_contact)); - stream->write_function(stream, "To \t\t%s\n", switch_str_nil(gp->register_to)); - stream->write_function(stream, "Proxy \t\t%s\n", switch_str_nil(gp->register_proxy)); - stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(gp->register_context)); - stream->write_function(stream, "Expires \t\t%s\n", switch_str_nil(gp->expires_str)); - stream->write_function(stream, "Freq \t\t%d\n", gp->freq); - stream->write_function(stream, "Ping \t\t%d\n", gp->ping); - stream->write_function(stream, "PingFreq\t\t%d\n", gp->ping_freq); - stream->write_function(stream, "State \t\t%s\n", sofia_state_names[gp->state]); - stream->write_function(stream, "Status \t\t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, "Name \t%s\n", switch_str_nil(gp->name)); + stream->write_function(stream, "Scheme \t%s\n", switch_str_nil(gp->register_scheme)); + stream->write_function(stream, "Realm \t%s\n", switch_str_nil(gp->register_realm)); + stream->write_function(stream, "Username\t%s\n", switch_str_nil(gp->register_username)); + stream->write_function(stream, "Password\t%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); + stream->write_function(stream, "From \t%s\n", switch_str_nil(gp->register_from)); + stream->write_function(stream, "Contact \t%s\n", switch_str_nil(gp->register_contact)); + stream->write_function(stream, "Exten \t%s\n", switch_str_nil(gp->extension)); + stream->write_function(stream, "To \t%s\n", switch_str_nil(gp->register_to)); + stream->write_function(stream, "Proxy \t%s\n", switch_str_nil(gp->register_proxy)); + stream->write_function(stream, "Context \t%s\n", switch_str_nil(gp->register_context)); + stream->write_function(stream, "Expires \t%s\n", switch_str_nil(gp->expires_str)); + stream->write_function(stream, "Freq \t%d\n", gp->freq); + stream->write_function(stream, "Ping \t%d\n", gp->ping); + stream->write_function(stream, "PingFreq\t%d\n", gp->ping_freq); + stream->write_function(stream, "State \t%s\n", sofia_state_names[gp->state]); + stream->write_function(stream, "Status \t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, "CallsIN \t%d\n", gp->ib_calls); + stream->write_function(stream, "CallsOUT\t%d\n", gp->ob_calls); stream->write_function(stream, "%s\n", line); sofia_reg_release_gateway(gp); } else { @@ -1531,51 +1534,51 @@ if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) { if (!argv[2] || strcasecmp(argv[2], "reg")) { stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(argv[1])); - stream->write_function(stream, "Domain Name \t\t%s\n", profile->domain_name ? profile->domain_name : "N/A"); + stream->write_function(stream, "Name \t%s\n", switch_str_nil(argv[1])); + stream->write_function(stream, "Domain Name \t%s\n", profile->domain_name ? profile->domain_name : "N/A"); if (strcasecmp(argv[1], profile->name)) { - stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); + stream->write_function(stream, "Alias Of \t%s\n", switch_str_nil(profile->name)); } - stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); - stream->write_function(stream, "Pres Hosts \t\t%s\n", switch_str_nil(profile->presence_hosts)); - stream->write_function(stream, "Dialplan \t\t%s\n", switch_str_nil(profile->dialplan)); - stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(profile->context)); - stream->write_function(stream, "Challenge Realm\t\t%s\n", + stream->write_function(stream, "DBName \t%s\n", switch_str_nil(profile->dbname)); + stream->write_function(stream, "Pres Hosts \t%s\n", switch_str_nil(profile->presence_hosts)); + stream->write_function(stream, "Dialplan \t%s\n", switch_str_nil(profile->dialplan)); + stream->write_function(stream, "Context \t%s\n", switch_str_nil(profile->context)); + stream->write_function(stream, "Challenge Realm \t%s\n", switch_strlen_zero(profile->challenge_realm) ? "auto_to" : profile->challenge_realm); - stream->write_function(stream, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); + stream->write_function(stream, "RTP-IP \t%s\n", switch_str_nil(profile->rtpip)); if (profile->extrtpip) { - stream->write_function(stream, "Ext-RTP-IP \t\t%s\n", profile->extrtpip); + stream->write_function(stream, "Ext-RTP-IP \t%s\n", profile->extrtpip); } - stream->write_function(stream, "SIP-IP \t\t%s\n", switch_str_nil(profile->sipip)); + stream->write_function(stream, "SIP-IP \t%s\n", switch_str_nil(profile->sipip)); if (profile->extsipip) { - stream->write_function(stream, "Ext-SIP-IP \t\t%s\n", profile->extsipip); + stream->write_function(stream, "Ext-SIP-IP \t%s\n", profile->extsipip); } - stream->write_function(stream, "URL \t\t%s\n", switch_str_nil(profile->url)); - stream->write_function(stream, "BIND-URL \t\t%s\n", switch_str_nil(profile->bindurl)); + stream->write_function(stream, "URL \t%s\n", switch_str_nil(profile->url)); + stream->write_function(stream, "BIND-URL \t%s\n", switch_str_nil(profile->bindurl)); if (sofia_test_pflag(profile, PFLAG_TLS)) { - stream->write_function(stream, "TLS-URL \t\t%s\n", switch_str_nil(profile->tls_url)); - stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); + stream->write_function(stream, "TLS-URL \t%s\n", switch_str_nil(profile->tls_url)); + stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); } - stream->write_function(stream, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); - stream->write_function(stream, "CODECS \t\t%s\n", switch_str_nil(profile->codec_string)); - stream->write_function(stream, "TEL-EVENT \t\t%d\n", profile->te); + stream->write_function(stream, "HOLD-MUSIC \t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); + stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string)); + stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te); if (profile->dtmf_type == DTMF_2833) { - stream->write_function(stream, "DTMF-MODE \t\trfc2833\n"); + stream->write_function(stream, "DTMF-MODE \trfc2833\n"); } else if (profile->dtmf_type == DTMF_INFO) { - stream->write_function(stream, "DTMF-MODE \t\tinfo\n"); + stream->write_function(stream, "DTMF-MODE \tinfo\n"); } else { - stream->write_function(stream, "DTMF-MODE \t\tnone\n"); + stream->write_function(stream, "DTMF-MODE \tnone\n"); } - stream->write_function(stream, "CNG \t\t%d\n", profile->cng_pt); - stream->write_function(stream, "SESSION-TO \t\t%d\n", profile->session_timeout); - stream->write_function(stream, "MAX-DIALOG \t\t%d\n", profile->max_proceeding); - stream->write_function(stream, "NOMEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); - stream->write_function(stream, "LATE-NEG \t\t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); - stream->write_function(stream, "PROXY-MEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, "AGGRESSIVENAT \t\t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); - stream->write_function(stream, "STUN_ENABLED \t\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); - stream->write_function(stream, "STUN_AUTO_DISABLE \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + stream->write_function(stream, "CNG \t%d\n", profile->cng_pt); + stream->write_function(stream, "SESSION-TO \t%d\n", profile->session_timeout); + stream->write_function(stream, "MAX-DIALOG \t%d\n", profile->max_proceeding); + stream->write_function(stream, "NOMEDIA \t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); + stream->write_function(stream, "LATE-NEG \t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); + stream->write_function(stream, "PROXY-MEDIA \t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); + stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); + stream->write_function(stream, "STUN_ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); + stream->write_function(stream, "STUN_AUTO_DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); } stream->write_function(stream, "\nRegistrations:\n%s\n", line); @@ -1695,6 +1698,7 @@ stream->write_function(stream, "<Password>%s</Password>\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); stream->write_function(stream, "<From>%s</From>\n", switch_amp_encode(switch_str_nil(gp->register_from),xmlbuf,buflen)); stream->write_function(stream, "<Contact>%s</Contact>\n", switch_amp_encode(switch_str_nil(gp->register_contact),xmlbuf,buflen)); + stream->write_function(stream, "<Exten>%s</Exten>\n", switch_amp_encode(switch_str_nil(gp->extension),xmlbuf,buflen)); stream->write_function(stream, "<To>%s</To>\n", switch_str_nil(gp->register_to)); stream->write_function(stream, "<Proxy>%s</Proxy>\n", switch_str_nil(gp->register_proxy)); stream->write_function(stream, "<Context>%s</Context>\n", switch_str_nil(gp->register_context)); @@ -1704,6 +1708,8 @@ stream->write_function(stream, "<PingFreq>%d</PingFreq>\n", gp->ping_freq); stream->write_function(stream, "<State>%s</State>\n", sofia_state_names[gp->state]); stream->write_function(stream, "<Status>%s%s</Status>\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, "<CallsIN>%d</CallsIN>\n", gp->ib_calls); + stream->write_function(stream, "<CallsOUT>%d</CallsOUT>\n", gp->ob_calls); stream->write_function(stream, "</Gateway>\n"); sofia_reg_release_gateway(gp); } else { @@ -2424,10 +2430,12 @@ } else { tech_pvt->invite_contact = switch_core_session_strdup(nsession, gateway_ptr->register_contact); } + + gateway_ptr->ob_calls++; - if (gateway_ptr->vars) { + if (gateway_ptr->ob_vars) { switch_event_header_t *hp; - for(hp = gateway_ptr->vars->headers; hp; hp = hp->next) { + for(hp = gateway_ptr->ob_vars->headers; hp; hp = hp->next) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n", switch_channel_get_name(nchannel), hp->name, hp->value); switch_channel_set_variable(nchannel, hp->name, hp->value); 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 Jan 23 14:33:30 2009 @@ -315,6 +315,7 @@ char *register_password; char *register_from; char *register_contact; + char *extension; char *register_to; char *register_proxy; char *register_sticky_proxy; @@ -334,7 +335,10 @@ reg_state_t state; switch_memory_pool_t *pool; int deleted; - switch_event_t *vars; + switch_event_t *ib_vars; + switch_event_t *ob_vars; + uint32_t ib_calls; + uint32_t ob_calls; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; int failures; struct sofia_gateway *next; 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 Jan 23 14:33:30 2009 @@ -953,7 +953,7 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag) { - switch_xml_t gateway_tag, param, gw_subs_tag; + switch_xml_t gateway_tag, param = NULL, x_params, gw_subs_tag; sofia_gateway_t *gp; for (gateway_tag = switch_xml_child(gateways_tag, "gateway"); gateway_tag; gateway_tag = gateway_tag->next) { @@ -1001,8 +1001,55 @@ gateway->next = NULL; gateway->ping = 0; gateway->ping_freq = 0; + + + if ((x_params = switch_xml_child(gateway_tag, "variables"))) { + param = switch_xml_child(x_params, "variable"); + } else { + param = switch_xml_child(gateway_tag, "variable"); + } + + + for (; param; param = param->next) { + const char *var = switch_xml_attr(param, "name"); + const char *val = switch_xml_attr(param, "value"); + const char *direction = switch_xml_attr(param, "direction"); + int in = 0, out = 0; + + if (var && val) { + if (direction) { + if (!strcasecmp(direction, "inbound")) { + in = 1; + } else if (!strcasecmp(direction, "outbound")) { + out = 1; + } + } else { + in = out = 1; + } + + if (in) { + if (!gateway->ib_vars) { + switch_event_create(&gateway->ib_vars, SWITCH_EVENT_GENERAL); + } + switch_event_add_header_string(gateway->ib_vars, SWITCH_STACK_BOTTOM, var, val); + } + + if (out) { + if (!gateway->ob_vars) { + switch_event_create(&gateway->ob_vars, SWITCH_EVENT_GENERAL); + } + switch_event_add_header_string(gateway->ob_vars, SWITCH_STACK_BOTTOM, var, val); + } + } + } - for (param = switch_xml_child(gateway_tag, "param"); param; param = param->next) { + if ((x_params = switch_xml_child(gateway_tag, "params"))) { + param = switch_xml_child(x_params, "param"); + } else { + param = switch_xml_child(gateway_tag, "param"); + } + + for (; param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -1144,12 +1191,13 @@ 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; - format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>" : "<sip:%s@%s:%d%s>"; - gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension, + format = strchr(sipip, ':') ? "<sip:gw+%s@[%s]:%d%s>" : "<sip:gw+%s@%s:%d%s>"; + gateway->extension = switch_core_strdup(gateway->pool, extension); + gateway->register_contact = switch_core_sprintf(gateway->pool, format, gateway->name, sipip, - sofia_glue_transport_has_tls(gateway->register_transport) ? profile->tls_sip_port : profile-> - sip_port, params); - + sofia_glue_transport_has_tls(gateway->register_transport) ? + profile->tls_sip_port : profile->sip_port, params); + if (!strncasecmp(proxy, "sip:", 4)) { gateway->register_proxy = switch_core_strdup(gateway->pool, proxy); gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy + 4); @@ -4024,6 +4072,7 @@ check_decode(destination_number, session); } + if (sip->sip_to && sip->sip_to->a_url) { const char *host, *user; int port; @@ -4174,20 +4223,6 @@ switch_channel_set_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); } - if (sip->sip_request->rq_url) { - sofia_gateway_t *gateway; - char *from_key; - char *user = (char *) sip->sip_request->rq_url->url_user; - check_decode(user, session); - from_key = switch_core_session_sprintf(session, "sip:%s@%s", user, sip->sip_request->rq_url->url_host); - - if ((gateway = sofia_reg_find_gateway(from_key))) { - context = gateway->register_context; - switch_channel_set_variable(channel, "sip_gateway", gateway->name); - sofia_reg_release_gateway(gateway); - } - } - if (!context) { context = switch_channel_get_variable(channel, "user_context"); } @@ -4220,6 +4255,35 @@ free(tmp); } + + if (strstr(destination_number, "gw+")) { + const char *gw_name = destination_number + 3; + sofia_gateway_t *gateway; + if (gw_name && (gateway = sofia_reg_find_gateway(gw_name))) { + context = switch_core_session_strdup(session, gateway->register_context); + switch_channel_set_variable(channel, "sip_gateway", gateway->name); + + if (gateway->extension) { + destination_number = switch_core_session_strdup(session, gateway->extension); + } + + gateway->ib_calls++; + + if (gateway->ib_vars) { + switch_event_header_t *hp; + for(hp = gateway->ib_vars->headers; hp; hp = hp->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n", + switch_channel_get_name(channel), hp->name, hp->value); + switch_channel_set_variable(channel, hp->name, hp->value); + } + } + + sofia_reg_release_gateway(gateway); + } + } + + + check_decode(displayname, session); tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), from_user, 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 Jan 23 14:33:30 2009 @@ -194,8 +194,11 @@ switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_from); switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_contact); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleted gateway %s\n", gateway_ptr->name); - if (gateway_ptr->vars) { - switch_event_destroy(&gateway_ptr->vars); + if (gateway_ptr->ob_vars) { + switch_event_destroy(&gateway_ptr->ob_vars); + } + if (gateway_ptr->ib_vars) { + switch_event_destroy(&gateway_ptr->ib_vars); } } else { last = gateway_ptr;

1 0

[commit] r11467 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: brian Date: Fri Jan 23 14:33:25 2009 New Revision: 11467 Log: fix unloop bug Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Jan 23 14:33:25 2009 @@ -15,7 +15,7 @@ <context name="default"> <extension name="unloop"> - <condition field="$${unroll_loops}" expression="^true$"/> + <condition field="${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$"> <action application="deflect" data="${destination_number}"/> </condition> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri Jan 23 14:33:25 2009 @@ -14,7 +14,7 @@ <context name="public"> <extension name="unloop"> - <condition field="$${unroll_loops}" expression="^true$"/> + <condition field="${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$"> <action application="deflect" data="${destination_number}"/> </condition>

1 0

[commit] r11466 - in freeswitch/trunk/src: . include mod/applications/mod_fifo
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: anthm Date: Fri Jan 23 12:44:25 2009 New Revision: 11466 Log: pause media bugs while not in a bridge while inside mod_fifo Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_core_media_bug.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Jan 23 12:44:25 2009 @@ -143,6 +143,10 @@ _In_ switch_media_bug_callback_t callback, _In_opt_ void *user_data, _In_ time_t stop_time, _In_ switch_media_bug_flag_t flags, _Out_ switch_media_bug_t **new_bug); + +SWITCH_DECLARE(void) switch_core_media_bug_pause(switch_core_session_t *session); +SWITCH_DECLARE(void) switch_core_media_bug_resume(switch_core_session_t *session); + /*! \brief Obtain private data from a media bug \param bug the bug to get the data from Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Jan 23 12:44:25 2009 @@ -841,7 +841,7 @@ CF_INNER_BRIDGE, CF_REQ_MEDIA, CF_VERBOSE_EVENTS, - + CF_PAUSE_BUGS, /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */ CF_FLAG_MAX } switch_channel_flag_t; Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Jan 23 12:44:25 2009 @@ -767,6 +767,8 @@ check_string(moh); switch_assert(node); + switch_core_media_bug_pause(session); + if (!consumer) { switch_core_session_t *other_session; switch_channel_t *other_channel; @@ -926,7 +928,7 @@ if (!aborted && switch_channel_ready(channel)) { switch_channel_set_state(channel, CS_HIBERNATE); - return; + goto done; } else { ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); @@ -956,7 +958,8 @@ switch_ivr_session_transfer(session, cd.orbit_exten, NULL, NULL); } - return; + goto done; + } else { /* consumer */ void *pop = NULL; switch_frame_t *read_frame; @@ -987,7 +990,7 @@ strat = STRAT_WAITING_LONGER; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid strategy\n"); - return; + goto done; } } @@ -996,7 +999,7 @@ do_wait = 0; } else if (strcasecmp(argv[2], "wait")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); - return; + goto done; } } @@ -1235,8 +1238,12 @@ switch_ivr_record_session(session, expanded, 0, NULL); } + switch_core_media_bug_resume(session); + switch_core_media_bug_resume(other_session); switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session); - + switch_core_media_bug_pause(session); + switch_core_media_bug_pause(other_session); + if (record_template) { switch_ivr_stop_record_session(session, expanded); if (expanded != record_template) { @@ -1299,7 +1306,7 @@ if (!switch_strlen_zero(fifo_consumer_wrapup_key) && strcmp(buf, fifo_consumer_wrapup_key)) { while(switch_channel_ready(channel)) { char terminator = 0; - + if (fifo_consumer_wrapup_time) { wrapup_time_elapsed = (switch_timestamp_now() - wrapup_time_started) / 1000; if (wrapup_time_elapsed > fifo_consumer_wrapup_time) { @@ -1362,6 +1369,11 @@ } } } + + done: + + switch_core_media_bug_resume(session); + } struct xml_helper { Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Fri Jan 23 12:44:25 2009 @@ -46,6 +46,16 @@ } } +SWITCH_DECLARE(void) switch_core_media_bug_pause(switch_core_session_t *session) +{ + switch_channel_set_flag(session->channel, CF_PAUSE_BUGS); +} + +SWITCH_DECLARE(void) switch_core_media_bug_resume(switch_core_session_t *session) +{ + switch_channel_clear_flag(session->channel, CF_PAUSE_BUGS); +} + SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(switch_media_bug_t *bug, uint32_t flag) { return switch_test_flag(bug, flag);

1 0

[commit] r11463 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: mikej Date: Fri Jan 23 10:22:50 2009 New Revision: 11463 Log: mod_sofia: fix segfault due to missing contact header in invite (MODENDP-177) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Jan 23 10:22:50 2009 @@ -3769,6 +3769,12 @@ return; } + if (!(sip->sip_contact && sip->sip_contact->m_url)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); + nua_respond(nh, 400, "Missing Contact Header", TAG_END()); + return; + } + get_addr(network_ip, sizeof(network_ip), my_addrinfo->ai_addr, my_addrinfo->ai_addrlen); network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); @@ -3860,12 +3866,6 @@ is_auth++; } - if (!(sip->sip_contact && sip->sip_contact->m_url)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); - nua_respond(nh, 400, "Missing Contact Header", TAG_END()); - return; - } - if (sofia_endpoint_interface) { if (profile->pflags & PFLAG_CALLID_AS_UUID) { session = switch_core_session_request_uuid(sofia_endpoint_interface, NULL, sip->sip_call_id->i_id);

1 0

[commit] r11462 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: mrene Date: Fri Jan 23 08:16:34 2009 New Revision: 11462 Log: FSCORE-279 Prevent media setup on failed originates Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Jan 23 08:16:34 2009 @@ -2044,7 +2044,7 @@ switch_ivr_sleep(*bleg, 0, SWITCH_TRUE, NULL); } - if (oglobals.session) { + if (oglobals.session && status == SWITCH_STATUS_SUCCESS) { switch_ivr_sleep(oglobals.session, 0, SWITCH_TRUE, NULL); }

1 0

[commit] r11460 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: andrew Date: Thu Jan 22 21:40:20 2009 New Revision: 11460 Log: Added some initial work to allow mod_erlang_event to spawn processes on other nodes Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Thu Jan 22 21:40:20 2009 @@ -122,6 +122,80 @@ } +/* function to spawn a process on a remote node */ +int ei_spawn(struct ei_cnode_s *ec, int sockfd, char *module, char *function, int argc, char **argv) +{ + ei_x_buff buf; + ei_x_new_with_version(&buf); + erlang_ref ref; + int i; + + ei_x_encode_tuple_header(&buf, 3); + ei_x_encode_atom(&buf, "$gen_call"); + ei_x_encode_tuple_header(&buf, 2); + ei_x_encode_pid(&buf, ei_self(ec)); + /* TODO - use this reference to determine the response */ + ei_init_ref(ec, &ref); + ei_x_encode_ref(&buf, &ref); + ei_x_encode_tuple_header(&buf, 5); + ei_x_encode_atom(&buf, "spawn"); + ei_x_encode_atom(&buf, module); + ei_x_encode_atom(&buf, function); + + /* argument list */ + ei_x_encode_list_header(&buf, argc); + for(i = 0; i < argc && argv[i]; i++) { + ei_x_encode_atom(&buf, argv[i]); + } + + ei_x_encode_empty_list(&buf); + + /*if (i != argc - 1) {*/ + /* horked argument list */ + /*}*/ + + ei_x_encode_pid(&buf, ei_self(ec)); /* should really be a valid group leader */ + + char *pbuf = 0; + i = 1; + ei_s_print_term(&pbuf, buf.buff, &i); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "spawn returning %s\n", pbuf); + + return ei_reg_send(ec, sockfd, "net_kernel", buf.buff, buf.index); +} + + +/* stolen from erts/emulator/beam/erl_term.h */ +#define _REF_NUM_SIZE 18 +#define MAX_REFERENCE (1 << _REF_NUM_SIZE) + +/* function to fill in an erlang reference struct */ +void ei_init_ref(ei_cnode *ec, erlang_ref *ref) +{ + memset(ref, 0, sizeof(*ref)); /* zero out the struct */ + snprintf(ref->node, MAXATOMLEN, ec->thisnodename); + + switch_mutex_lock(globals.ref_mutex); + globals.reference0++; + if (globals.reference0 >= MAX_REFERENCE) { + globals.reference0 = 0; + globals.reference1++; + if (globals.reference1 == 0) { + globals.reference2++; + } + } + + ref->n[0] = globals.reference0; + ref->n[1] = globals.reference1; + ref->n[2] = globals.reference2; + + switch_mutex_unlock(globals.ref_mutex); + + ref->creation = 1; /* why is this 1 */ + ref->len = 3; /* why is this 3 */ +} + + switch_status_t initialise_ei(struct ei_cnode_s *ec) { switch_status_t rv; @@ -167,7 +241,6 @@ return SWITCH_STATUS_FALSE; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ei initialized node at %s\n", thisnodename); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Thu Jan 22 21:40:20 2009 @@ -592,6 +592,8 @@ static void listener_main_loop(listener_t *listener) { int status = 1; + /*int i = 1;*/ + /*char *pbuf = 0;*/ while ((status >= 0 || erl_errno == ETIMEDOUT || erl_errno == EAGAIN) && !prefs.done) { erlang_msg msg; @@ -613,12 +615,20 @@ switch(msg.msgtype) { case ERL_SEND : /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_send\n");*/ + /*i = 1;*/ + /*ei_s_print_term(&pbuf, buf.buff, &i);*/ + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_send was message %s\n", pbuf);*/ + if (handle_msg(listener, &msg, &buf, &rbuf)) { return; } break; case ERL_REG_SEND : - /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_reg_send\n");*/ + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_reg_send to %s\n", msg.toname);*/ + /*i = 1;*/ + /*ei_s_print_term(&pbuf, buf.buff, &i);*/ + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_reg_send was message %s\n", pbuf);*/ + if (handle_msg(listener, &msg, &buf, &rbuf)) { return; } @@ -980,6 +990,12 @@ switch_application_interface_t *app_interface; switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); + + /* intialize the unique reference stuff */ + switch_mutex_init(&globals.ref_mutex, SWITCH_MUTEX_NESTED, pool); + globals.reference0 = 0; + globals.reference1 = 0; + globals.reference2 = 0; if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); @@ -1099,7 +1115,7 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected and published erlang cnode\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected and published erlang cnode at %s\n", ec.thisnodename); listen_list.ready = 1; Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Thu Jan 22 21:40:20 2009 @@ -128,6 +128,10 @@ struct globals_struct { switch_mutex_t *listener_mutex; switch_event_node_t *node; + unsigned int reference0; + unsigned int reference1; + unsigned int reference2; + switch_mutex_t *ref_mutex; }; typedef struct globals_struct globals_t; @@ -182,6 +186,8 @@ void ei_link(listener_t *listener, erlang_pid *from, erlang_pid *to); void ei_encode_switch_event_headers(ei_x_buff *ebuf, switch_event_t *event); void ei_encode_switch_event_tag(ei_x_buff *ebuf, switch_event_t *event, char *tag); +int ei_spawn(struct ei_cnode_s *ec, int sockfd, char *module, char *function, int argc, char **argv); +void ei_init_ref(struct ei_cnode_s *ec, erlang_ref *ref); switch_status_t initialise_ei(struct ei_cnode_s *ec); #define ei_encode_switch_event(_b, _e) ei_encode_switch_event_tag(_b, _e, "event")

1 0

[commit] r11455 - freeswitch/trunk/scripts/contrib/seven
by FreeSWITCH SVN 23 Jan '09

23 Jan '09

Author: seven Date: Thu Jan 22 19:19:15 2009 New Revision: 11455 Log: test new contrib dir Added: freeswitch/trunk/scripts/contrib/seven/README Added: freeswitch/trunk/scripts/contrib/seven/README ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/seven/README Thu Jan 22 19:19:15 2009 @@ -0,0 +1 @@ +Currently blank...

1 0