- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13310 - freeswitch/trunk/src/include/private
by FreeSWITCH SVN 14 May '09

14 May '09

Author: anthm Date: Thu May 14 16:07:39 2009 New Revision: 13310 Log: FSCORE-368 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Thu May 14 16:07:39 2009 @@ -127,7 +127,7 @@ void *streams[SWITCH_MAX_STREAMS]; int stream_count; - char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + char uuid_str[128]; void *private_info; switch_queue_t *event_queue; switch_queue_t *message_queue;

1 0

[commit] r13309 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 May '09

14 May '09

Author: anthm Date: Thu May 14 13:55:17 2009 New Revision: 13309 Log: tweak code logic Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu May 14 13:55:17 2009 @@ -2603,7 +2603,7 @@ stream = tech_pvt->profile->hold_music; } - if (stream && switch_is_moh(stream)) { + if (stream && strcasecmp(stream, "silence")) { if (!strcasecmp(stream, "indicate_hold")) { switch_channel_set_flag(tech_pvt->channel, CF_SUSPEND); switch_channel_set_flag(tech_pvt->channel, CF_HOLD);

1 0

[commit] r13308 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta
by FreeSWITCH SVN 14 May '09

14 May '09

Author: anthm Date: Thu May 14 13:30:50 2009 New Revision: 13308 Log: add checks to find issue in FSCORE-338 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Thu May 14 13:30:50 2009 @@ -1048,11 +1048,14 @@ nta_outgoing_t *orq = oht->oht_table[i]; if (!orq->orq_destroyed) - SU_DEBUG_3(("%s: destroying %s client transaction to <" + SU_DEBUG_3(("%s: destroying %s%s client transaction to <" URL_PRINT_FORMAT ">\n", - __func__, orq->orq_method_name, + __func__, + (orq->orq_forking || orq->orq_forks) ? "forked " : "forking", + orq->orq_method_name, URL_PRINT_ARGS(orq->orq_to->a_url))); + orq->orq_forks = NULL, orq->orq_forking = NULL; outgoing_free(orq); } @@ -8493,6 +8496,7 @@ void outgoing_free(nta_outgoing_t *orq) { SU_DEBUG_9(("nta: outgoing_free(%p)\n", (void *)orq)); + assert(orq->orq_forks == NULL && orq->orq_forking == NULL); outgoing_cut_off(orq); outgoing_reclaim(orq); } @@ -8585,7 +8589,10 @@ void outgoing_destroy(nta_outgoing_t *orq) { if (orq->orq_terminated || orq->orq_default) { - outgoing_free(orq); + if (!orq->orq_forking && !orq->orq_forks) { + outgoing_free(orq); + return; + } } /* Application is expected to handle 200 OK statelessly => kill transaction immediately */ @@ -8596,12 +8603,12 @@ && !orq->orq_forking && !orq->orq_forks) { orq->orq_destroyed = 1; outgoing_terminate(orq); + return; } - else { - orq->orq_destroyed = 1; - orq->orq_callback = outgoing_default_cb; - orq->orq_magic = NULL; - } + + orq->orq_destroyed = 1; + orq->orq_callback = outgoing_default_cb; + orq->orq_magic = NULL; } /** @internal Outgoing transaction timer routine. @@ -8882,6 +8889,8 @@ "terminate", orq->orq_method_name, orq->orq_cseq->cs_seq, orq->orq_tag)); + orq->orq_forking = NULL; + if (outgoing_terminate(orq)) continue;

1 0

[commit] r13307 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta
by FreeSWITCH SVN 14 May '09

14 May '09

Author: anthm Date: Thu May 14 12:36:44 2009 New Revision: 13307 Log: temp solution to assert Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Thu May 14 12:36:44 2009 @@ -8872,7 +8872,11 @@ orq = original->orq_forks; original->orq_forks = orq->orq_forks; - assert(orq->orq_forking == original); + //assert(orq->orq_forking == original); + + if (orq->orq_forking != original) { + break; + } SU_DEBUG_5(("nta: timer %s fired, %s %s (%u);tag=%s\n", "D", "terminate", orq->orq_method_name, orq->orq_cseq->cs_seq,

1 0

[commit] r13306 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 May '09

14 May '09

Author: brian Date: Thu May 14 11:56:18 2009 New Revision: 13306 Log: now pickup, barge-in and various other things will work with SLA is turned on 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 Thu May 14 11:56:18 2009 @@ -4575,16 +4575,21 @@ tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s>", tech_pvt->to_uri); } } else { - const char *url; - - if ((url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url)) { - if (strchr(url, '>')) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport)); + if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<sip:%s@%s>", user, host); + } else { + + const char *url; + + if ((url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url)) { + if (strchr(url, '>')) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport)); + } else { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport)); + } } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport)); + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } - } else { - switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } } } else {

1 0

[commit] r13305 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 May '09

14 May '09

Author: brian Date: Thu May 14 11:18:33 2009 New Revision: 13305 Log: should be ; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu May 14 11:18:33 2009 @@ -839,10 +839,10 @@ if (strchr(stripped, ';')) { if (params) { - new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s;%s%s", + new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s;%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), params, uri_only ? "" : ">"); } else { - new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s%s", + new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); } } else {

1 0

[commit] r13304 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 14 May '09

14 May '09

Author: anthm Date: Thu May 14 11:16:03 2009 New Revision: 13304 Log: comment out assert Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_server.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_server.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_server.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_server.c Thu May 14 11:16:03 2009 @@ -505,7 +505,8 @@ #endif if (sr->sr_response.msg == NULL) { - assert(sr->sr_status == 500); + //assert(sr->sr_status == 500); + SU_DEBUG_0(("sr without msg, sr_status=%u", sr->sr_status)); goto internal_error; }

1 0

[commit] r13303 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 May '09

14 May '09

Author: brian Date: Thu May 14 10:44:43 2009 New Revision: 13303 Log: preserve the transport on SLA interactions, still needs work for TLS but should work for UDP and TCP Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c Thu May 14 10:44:43 2009 @@ -27,7 +27,7 @@ * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> * Paul D. Tinsley <pdt at jackhammer.org> * Bret McDanel <trixter AT 0xdecafbad.com> - * + * Brian West <brian(a)freeswitch.org> * * sofia_sla.c -- SOFIA SIP Endpoint (support for shared line appearance) * This file (and calls into it) developed by Matthew T Kaufman <matthew(a)matthew.at> @@ -35,21 +35,17 @@ */ #include "mod_sofia.h" - static int sofia_sla_sub_callback(void *pArg, int argc, char **argv, char **columnNames); - struct sla_helper { char call_id[1024]; }; - static int get_call_id_callback(void *pArg, int argc, char **argv, char **columnNames) { struct sla_helper *sh = (struct sla_helper *) pArg; switch_set_string(sh->call_id, argv[0]); - return 0; } @@ -79,14 +75,14 @@ char *sql; struct sla_helper sh = { { 0 } }; char *contact_str = strip_uri(full_contact); - + sofia_transport_t transport = sofia_glue_url2transport(sip->sip_contact->m_url); sql = switch_mprintf("select call_id from sip_shared_appearance_dialogs where hostname='%q' and profile_name='%q' and contact_str='%q'", mod_sofia_globals.hostname, profile->name, contact_str); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, get_call_id_callback, &sh); free(sql); - + if (*sh.call_id) { if (!(nh = nua_handle_by_call_id(profile->nua, sh.call_id))) { if ((sql = switch_mprintf("delete from sip_shared_appearance_dialogs where hostname='%q' and profile_name='%q' and contact_str='%q'", @@ -103,11 +99,11 @@ nua_handle_bind(nh, &mod_sofia_globals.keep_private); switch_snprintf(exp_str, sizeof(exp_str), "%ld", exptime + 30); - switch_snprintf(my_contact, sizeof(my_contact), "%s;expires=%s", profile->sla_contact, exp_str); - + switch_snprintf(my_contact, sizeof(my_contact), "<%s;transport=%s>;expires=%s", profile->sla_contact, sofia_glue_transport2str(transport), exp_str); + nua_subscribe(nh, SIPTAG_TO(sip->sip_to), - SIPTAG_FROM(sip->sip_to), // ? + SIPTAG_FROM(sip->sip_to), SIPTAG_CONTACT_STR(my_contact), SIPTAG_EXPIRES_STR(exp_str), SIPTAG_EVENT_STR("dialog;sla"), /* some phones want ;include-session-description too? */ @@ -128,7 +124,9 @@ char *subscriber = NULL; char *sql = NULL; char *route_uri = NULL; - + char *sla_contact = NULL; + sofia_transport_t transport = sofia_glue_url2transport(sip->sip_contact->m_url); + /* * XXX MTK FIXME - we don't look at the tag to see if NUTAG_SUBSTATE(nua_substate_terminated) or * a Subscription-State header with state "terminated" and/or expiration of 0. So we never forget @@ -143,7 +141,8 @@ * so we do what openser's pua_bla does and... */ - aor = switch_mprintf("sip:%s@%s",sip->sip_contact->m_url->url_user, sip->sip_from->a_url->url_host); + aor = switch_mprintf("sip:%s@%s;transport=%s", sip->sip_contact->m_url->url_user, + sip->sip_from->a_url->url_host, sofia_glue_transport2str(transport)); /* * ok, and now that we HAVE the AOR, we REALLY should go check in the XML config and see if this particular @@ -153,9 +152,9 @@ /* then the subscriber is the user at their network location... this is arguably the wrong way, but works so far... */ - subscriber = switch_mprintf("sip:%s@%s",sip->sip_from->a_url->url_user, sip->sip_contact->m_url->url_host); + subscriber = switch_mprintf("sip:%s@%s;transport=%s", sip->sip_from->a_url->url_user, + sip->sip_contact->m_url->url_host, sofia_glue_transport2str(transport)); - if ((sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where subscriber='%q' and profile_name='%q' and hostname='%q'", subscriber, profile->name, mod_sofia_globals.hostname @@ -170,7 +169,6 @@ sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } - if (strstr(contact_str, ";fs_nat")) { char *p; route_uri = sofia_glue_get_url_from_contact((char *)contact_str, 1); @@ -179,7 +177,6 @@ } } - if (route_uri) { char *p; @@ -191,16 +188,19 @@ } } - nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(profile->sla_contact), NUTAG_WITH_THIS(nua), + sla_contact = switch_mprintf("<%s;transport=%s>", profile->sla_contact, sofia_glue_transport2str(transport)); + + nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(sla_contact), NUTAG_WITH_THIS(nua), TAG_IF(route_uri, NUTAG_PROXY(route_uri)), SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=300"), /* you thought the OTHER time was fake... need delta here FIXME XXX MTK */ SIPTAG_EXPIRES_STR("300"), /* likewise, totally fake - FIXME XXX MTK */ - /* sofia_presence says something about needing TAG_IF(sticky, NUTAG_PROXY(sticky)) for NAT stuff? */ - TAG_END()); + /* sofia_presence says something about needing TAG_IF(sticky, NUTAG_PROXY(sticky)) for NAT stuff? */ + TAG_END()); switch_safe_free(aor); switch_safe_free(subscriber); switch_safe_free(route_uri); + switch_safe_free(sla_contact); switch_safe_free(sql); } @@ -234,7 +234,6 @@ free(contact_str); } - } void sofia_sla_handle_sip_i_notify(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]) @@ -243,6 +242,7 @@ struct sla_notify_helper helper; char *aor = NULL; char *contact = NULL; + sofia_transport_t transport = sofia_glue_url2transport(sip->sip_contact->m_url); /* * things we know we don't do: @@ -276,7 +276,8 @@ } /* calculate the AOR we're trying to tell people about. should probably double-check before derferencing XXX MTK */ - aor = switch_mprintf("sip:%s@%s",sip->sip_to->a_url->url_user, sip->sip_to->a_url->url_host); + aor = switch_mprintf("sip:%s@%s;transport=%s", sip->sip_to->a_url->url_user, + sip->sip_to->a_url->url_host, sofia_glue_transport2str(transport)); /* this isn't sufficient because on things like the polycom, the subscriber is the 'main' ext number, but the * 'main' ext number isn't in ANY of the headers they send us in the notify. of course. @@ -285,7 +286,8 @@ * so we don't reflect it back at anyone who is the "boss" config, but we do reflect it back at the "secretary" * config. if that breaks the phone, just set them all up as the "boss" config where ext#==third-party# */ - contact = switch_mprintf("sip:%s@%s",sip->sip_contact->m_url->url_user, sip->sip_contact->m_url->url_host); + contact = switch_mprintf("sip:%s@%s;transport=%s",sip->sip_contact->m_url->url_user, + sip->sip_contact->m_url->url_host, sofia_glue_transport2str(transport)); if (sip->sip_payload && sip->sip_payload->pl_data) { sql = switch_mprintf("select subscriber,call_id,aor,profile_name,hostname,contact_str from sip_shared_appearance_subscriptions where " @@ -351,4 +353,3 @@ } return 0; } -

1 0

[commit] r13302 - freeswitch/trunk/src
by FreeSWITCH SVN 14 May '09

14 May '09

Author: mikej Date: Thu May 14 09:58:58 2009 New Revision: 13302 Log: FSBUILD-159 Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu May 14 09:58:58 2009 @@ -725,6 +725,8 @@ switch_byte_t *sendbuf = NULL; uint32_t sendlen = 0; + switch_assert(read_frame); + if (switch_test_flag(read_frame, SFF_CNG)) { sendlen = bpf; switch_assert(sendlen <= SWITCH_RECOMMENDED_BUFFER_SIZE);

1 0

[commit] r13301 - freeswitch/trunk/src
by FreeSWITCH SVN 14 May '09

14 May '09

Author: anthm Date: Thu May 14 08:48:11 2009 New Revision: 13301 Log: FSCORE-367 Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu May 14 08:48:11 2009 @@ -638,7 +638,7 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; switch_channel_t *channel = switch_core_session_get_channel(session); - switch_frame_t *read_frame; + switch_frame_t *read_frame = NULL; int stream_id = 0; switch_event_t *event; switch_unicast_conninfo_t *conninfo = NULL;

1 0