August 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9291 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by Freeswitch SVN 14 Aug '08

14 Aug '08

Author: mikej Date: Thu Aug 14 12:01:39 2008 New Revision: 9291 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Log: Thu Aug 14 11:21:21 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nta: when in UAS mode, respond to CANCEL and INVITE with same tag Added mreply(), internal function for responding to a request message Also, tag INVITE before responding to CANCEL. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Aug 14 12:01:39 2008 @@ -1 +1 @@ -Thu Aug 14 11:37:23 EDT 2008 +Thu Aug 14 12:01:19 EDT 2008 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 Aug 14 12:01:39 2008 @@ -139,7 +139,17 @@ int status, char const *phrase, msg_t *request); -#define IF_SIGCOMP_TPTAG_COMPARTMENT(cc) TAG_IF(cc, TPTAG_COMPARTMENT(cc)), +static int mreply(nta_agent_t *agent, + msg_t *reply, + int status, char const *phrase, + msg_t *req_msg, + tport_t *tport, + int incomplete, + int sdwn_after, + char const *to_tag, + tag_type_t tag, tag_value_t value, ...); + +#define IF_SIGCOMP_TPTAG_COMPARTMENT(cc) TAG_IF(cc && cc != NONE, TPTAG_COMPARTMENT(cc)), #define IF_SIGCOMP_TPTAG_COMPARTMENT_REF(cc) TPTAG_COMPARTMENT_REF(cc), struct sigcomp_compartment; @@ -2301,11 +2311,9 @@ SU_DEBUG_5(("nta: %s (%u) is %s\n", method_name, cseq, sip_413_Request_too_large)); agent->sa_stats->as_bad_request++; - nta_msg_treply(agent, msg, SIP_413_REQUEST_TOO_LARGE, - NTATAG_TPORT(tport), - NTATAG_INCOMPLETE(1), - TPTAG_SDWN_AFTER(stream), - TAG_END()); + mreply(agent, NULL, SIP_413_REQUEST_TOO_LARGE, msg, + tport, 1, stream, NULL, + TAG_END()); return; } @@ -2346,25 +2354,19 @@ if (sip->sip_via && method != sip_method_ack) { msg_t *reply = nta_msg_create(agent, 0); - - if (reply) { - agent_check_request_via(agent, msg, sip, sip->sip_via, tport); - if (badname) - phrase = su_sprintf(msg_home(reply), "Bad %s Header", badname); - else - phrase = sip_400_Bad_request; + agent_check_request_via(agent, msg, sip, sip->sip_via, tport); + + if (badname && reply) + phrase = su_sprintf(msg_home(reply), "Bad %s Header", badname); + else + phrase = sip_400_Bad_request; - SU_DEBUG_5(("nta: %s (%u) is %s\n", method_name, cseq, phrase)); + SU_DEBUG_5(("nta: %s (%u) is %s\n", method_name, cseq, phrase)); - nta_msg_mreply(agent, reply, sip_object(reply), - 400, phrase, - msg, - NTATAG_TPORT(tport), - NTATAG_INCOMPLETE(1), - TPTAG_SDWN_AFTER(stream), - TAG_END()); - } + mreply(agent, reply, 400, phrase, msg, + tport, 1, stream, NULL, + TAG_END()); } else { msg_destroy(msg); @@ -2382,10 +2384,9 @@ SU_DEBUG_5(("nta: bad version %s for %s (%u)\n", sip->sip_request->rq_version, method_name, cseq)); - nta_msg_treply(agent, msg, SIP_505_VERSION_NOT_SUPPORTED, - NTATAG_TPORT(tport), - TPTAG_SDWN_AFTER(stream), - TAG_END()); + mreply(agent, NULL, SIP_505_VERSION_NOT_SUPPORTED, msg, + tport, 0, stream, NULL, + TAG_END()); return; } @@ -2475,9 +2476,9 @@ agent->sa_in.proceeding->q_length >= agent->sa_max_proceeding) { SU_DEBUG_5(("nta: proceeding queue full for %s (%u)\n", method_name, cseq)); - nta_msg_treply(agent, msg, SIP_503_SERVICE_UNAVAILABLE, - NTATAG_TPORT(tport), - TAG_END()); + mreply(agent, NULL, SIP_503_SERVICE_UNAVAILABLE, msg, + tport, 0, 0, NULL, + TAG_END()); return; } else { @@ -2499,9 +2500,9 @@ method_name, cseq, "not processed by application: returning 501")); if (method != sip_method_ack) - nta_msg_treply(agent, msg, SIP_501_NOT_IMPLEMENTED, - NTATAG_TPORT(tport), - TAG_END()); + mreply(agent, NULL, SIP_501_NOT_IMPLEMENTED, msg, + tport, 0, 0, NULL, + TAG_END()); else msg_destroy(msg); } @@ -3007,8 +3008,9 @@ ta_start(ta, tag, value); - retval = nta_msg_mreply(agent, NULL, NULL, status, phrase, req_msg, - ta_tags(ta)); + retval = mreply(agent, NULL, status, phrase, req_msg, + NULL, 0, 0, NULL, + ta_tags(ta)); ta_end(ta); return retval; @@ -3026,13 +3028,36 @@ msg_t *req_msg, tag_type_t tag, tag_value_t value, ...) { + int retval = -1; + ta_list ta; + + ta_start(ta, tag, value); + + retval = mreply(agent, reply, status, phrase, req_msg, + NULL, 0, 0, NULL, + ta_tags(ta)); + ta_end(ta); + + return retval; +} + +static +int mreply(nta_agent_t *agent, + msg_t *reply, + int status, char const *phrase, + msg_t *req_msg, + tport_t *tport, + int incomplete, + int sdwn_after, + char const *to_tag, + tag_type_t tag, tag_value_t value, ...) +{ ta_list ta; + sip_t *sip; + int *use_rport = NULL; + int retry_without_rport = 0; tp_name_t tpn[1]; int retval = -1; - tport_t *tport = NULL; - struct sigcomp_compartment *cc = NONE; - int *use_rport = NULL; - int retry_without_rport = 0, incomplete = 0; if (!agent) return -1; @@ -3042,20 +3067,15 @@ ta_start(ta, tag, value); - tl_gets(ta_args(ta), - NTATAG_TPORT_REF(tport), - NTATAG_INCOMPLETE_REF(incomplete), - TPTAG_COMPARTMENT_REF(cc), - /* XXX - should also check ntatag_sigcomp_close() */ - TAG_END()); + tl_gets(ta_args(ta), NTATAG_TPORT_REF(tport), TAG_END()); if (reply == NULL) { reply = nta_msg_create(agent, 0); - sip = sip_object(reply); } + sip = sip_object(reply); if (!sip) { - SU_DEBUG_3(("%s: no msg\n", __func__)); + SU_DEBUG_3(("%s: cannot create response msg\n", __func__)); } else if (sip_add_tl(reply, sip, ta_tags(ta)) < 0) { SU_DEBUG_3(("%s: cannot add user headers\n", __func__)); @@ -3066,15 +3086,19 @@ } else if (sip->sip_status && sip->sip_status->st_status > 100 && sip->sip_to && !sip->sip_to->a_tag && - sip->sip_cseq && sip->sip_cseq->cs_method != sip_method_cancel && - sip_to_tag(msg_home(reply), sip->sip_to, - nta_agent_newtag(msg_home(reply), "tag=%s", agent)) < 0) { + (to_tag == NONE ? 0 : + to_tag != NULL + ? sip_to_tag(msg_home(reply), sip->sip_to, to_tag) < 0 + : sip_to_tag(msg_home(reply), sip->sip_to, + nta_agent_newtag(msg_home(reply), "tag=%s", agent)) < 0)) { SU_DEBUG_3(("%s: cannot add To tag\n", __func__)); } else if (nta_tpn_by_via(tpn, sip->sip_via, use_rport) < 0) { SU_DEBUG_3(("%s: no Via\n", __func__)); } else { + struct sigcomp_compartment *cc = NONE; + if (tport == NULL) tport = tport_delivered_by(agent->sa_tports, req_msg); @@ -3091,6 +3115,9 @@ tpn->tpn_port = sip_via_port(sip->sip_via, NULL); if (tport && tpn->tpn_comp) { + tl_gets(ta_args(ta), TPTAG_COMPARTMENT_REF(cc), + /* XXX - should also check ntatag_sigcomp_close() */ + TAG_END()); if (cc == NONE) cc = agent_compression_compartment(agent, tport, tpn, -1); @@ -3102,7 +3129,9 @@ if (tport_tsend(tport, reply, tpn, IF_SIGCOMP_TPTAG_COMPARTMENT(cc) - TPTAG_MTU(INT_MAX), ta_tags(ta))) { + TPTAG_MTU(INT_MAX), + TPTAG_SDWN_AFTER(sdwn_after), + ta_tags(ta))) { agent->sa_stats->as_sent_msg++; agent->sa_stats->as_sent_response++; retval = 0; /* Success! */ @@ -4153,20 +4182,18 @@ /* RFC-3262 section 3 (page 4) */ if (agent->sa_is_a_uas && method == sip_method_prack) { - nta_msg_treply(agent, msg, - 481, "No such response", - NTATAG_TPORT(tport), - TAG_END()); + mreply(agent, NULL, 481, "No such response", msg, + tport, 0, 0, NULL, + TAG_END()); return; } if (!(irq = incoming_create(agent, msg, sip, tport, tag))) { SU_DEBUG_3(("nta: leg_recv(%p): cannot create transaction for %s\n", (void *)leg, method_name)); - nta_msg_treply(agent, msg, - SIP_500_INTERNAL_SERVER_ERROR, - NTATAG_TPORT(tport), - TAG_END()); + mreply(agent, NULL, SIP_500_INTERNAL_SERVER_ERROR, msg, + tport, 0, 0, NULL, + TAG_END()); return; } @@ -5532,19 +5559,23 @@ { nta_agent_t *agent = irq->irq_agent; - /* According to the spec, this INVITE has been destroyed */ + /* According to the RFC 3261, this INVITE has been destroyed */ if (irq->irq_method == sip_method_invite && 200 <= irq->irq_status && irq->irq_status < 300) { - nta_msg_treply(agent, msg, SIP_481_NO_TRANSACTION, - NTATAG_TPORT(tport), - TAG_END()); + mreply(agent, NULL, SIP_481_NO_TRANSACTION, msg, + tport, 0, 0, NULL, + TAG_END()); return 0; } - nta_msg_treply(agent, msg_ref_create(msg), SIP_200_OK, - NTATAG_TPORT(tport), - SIPTAG_TO(irq->irq_to), - TAG_END()); + /* UAS MUST use same tag in final response to CANCEL and INVITE */ + if (agent->sa_is_a_uas && irq->irq_tag == NULL) { + nta_incoming_tag(irq, NULL); + } + + mreply(agent, NULL, SIP_200_OK, msg_ref_create(msg), + tport, 0, 0, irq->irq_tag, + TAG_END()); /* We have already sent final response */ if (irq->irq_completed || irq->irq_method != sip_method_invite) { @@ -5585,9 +5616,9 @@ } else { SU_DEBUG_3(("nta: request_merge(): cannot create transaction for %s\n", sip->sip_request->rq_method_name)); - nta_msg_treply(agent, msg, 482, "Request merged", - NTATAG_TPORT(tport), - TAG_END()); + mreply(agent, NULL, 482, "Request merged", msg, + tport, 0, 0, NULL, + TAG_END()); } } @@ -10251,10 +10282,10 @@ pr_irq = incoming_create(irq->irq_agent, msg, sip, tp, irq->irq_tag); if (!pr_irq) { - nta_msg_treply(irq->irq_agent, msg, - SIP_500_INTERNAL_SERVER_ERROR, - NTATAG_TPORT(tp), - TAG_END()); + mreply(irq->irq_agent, NULL, + SIP_500_INTERNAL_SERVER_ERROR, msg, + tp, 0, 0, NULL, + TAG_END()); return 0; }

1 0

[commit] r9290 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 14 Aug '08

14 Aug '08

Author: mikej Date: Thu Aug 14 11:37:53 2008 New Revision: 9290 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Wed Aug 13 13:03:33 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: destroying invite transaction only after nua_i_invite is sent Added nua_client_request_clean(), nua_invite_client_should_ack(). Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Aug 14 11:37:53 2008 @@ -1 +1 @@ -Thu Aug 14 11:37:00 EDT 2008 +Thu Aug 14 11:37:23 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h Thu Aug 14 11:37:53 2008 @@ -296,6 +296,7 @@ unsigned cr_dialog:1; /**< Request can initiate dialog */ /* Current state */ + unsigned cr_acked:1; /**< Final response to the request has been ACKed */ unsigned cr_waiting:1; /**< Request is waiting */ unsigned cr_challenged:1; /**< Request was challenged */ unsigned cr_wait_for_cred:1; /**< Request is pending authentication */ @@ -523,7 +524,6 @@ } void nua_client_request_complete(nua_client_request_t *); - void nua_client_request_destroy(nua_client_request_t *); int nua_client_request_queue(nua_client_request_t *cr); @@ -533,8 +533,8 @@ return cr && cr->cr_prev; } -nua_client_request_t *nua_client_request_remove(nua_client_request_t *cr); - +void nua_client_request_remove(nua_client_request_t *cr); +void nua_client_request_clean(nua_client_request_t *cr); int nua_client_bind(nua_client_request_t *cr, nua_dialog_usage_t *du); su_inline int nua_client_is_bound(nua_client_request_t const *cr) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Thu Aug 14 11:37:53 2008 @@ -197,6 +197,7 @@ int status, char const *phrase, enum nua_callstate next_state); +static int nua_invite_client_should_ack(nua_client_request_t const *cr); static int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags); static int nua_invite_client_complete(nua_client_request_t *cr); @@ -247,15 +248,6 @@ nua_client_request_t *cr, *cr_next; nua_server_request_t *sr; - cr = du->du_cr; - - if (cr != cr0 && cr && cr->cr_orq && cr->cr_status >= 200 && - cr->cr_method == sip_method_invite) { - ss->ss_reporting = 1; - nua_invite_client_ack(cr, NULL); - ss->ss_reporting = 0; - } - /* Destroy queued INVITE transactions */ for (cr = ds->ds_cr; cr; cr = cr_next) { cr_next = cr->cr_next; @@ -266,6 +258,13 @@ if (cr == cr0) continue; + if (nua_invite_client_should_ack(cr)) { + ss->ss_reporting = 1; + nua_invite_client_ack(cr, NULL); + ss->ss_reporting = 0; + nua_client_request_clean(cr); + } + if (cr == du->du_cr && cr->cr_orq) continue; @@ -1180,6 +1179,8 @@ error = nua_invite_client_ack(cr, tags); + nua_client_request_clean(cr); + if (error < 0) { if (ss->ss_reason == NULL) ss->ss_reason = "SIP;cause=500;text=\"Internal Error\""; @@ -1230,7 +1231,6 @@ assert(cr->cr_orq); assert(cr->cr_method == sip_method_invite); - if (!ds->ds_leg) { /* XXX - fix nua_dialog_usage_remove_at() instead! */ nta_outgoing_destroy(cr->cr_orq); @@ -1366,12 +1366,20 @@ if (error == -1) msg_destroy(msg); - nta_outgoing_destroy(cr->cr_orq), cr->cr_orq = NULL; nua_client_request_remove(cr); + cr->cr_acked = 1; /* ... or we have at least tried */ return error; } +static int +nua_invite_client_should_ack(nua_client_request_t const *cr) +{ + return + cr && cr->cr_orq && !cr->cr_acked && + 200 <= cr->cr_status && cr->cr_status < 300; +} + /** Complete client request */ static int nua_invite_client_complete(nua_client_request_t *cr) { @@ -1379,7 +1387,7 @@ /* Xyzzy */; else if (cr->cr_status < 200) nta_outgoing_cancel(cr->cr_orq); - else + else if (cr->cr_status < 300 && !cr->cr_acked) nua_invite_client_ack(cr, NULL); return 0; @@ -1560,10 +1568,13 @@ case nua_callstate_completed: case nua_callstate_ready: if (cri && cri->cr_orq) { - if (cri->cr_status < 200) + if (cri->cr_status < 200) { nua_client_create(nh, nua_r_cancel, &nua_cancel_client_methods, NULL); - else if (cri->cr_status < 300) + } + else if (cri->cr_status < 300 && !cri->cr_acked) { nua_invite_client_ack(cri, NULL); + nua_client_request_clean(cri); + } } if (nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL) != 0) break; @@ -1796,7 +1807,7 @@ if (status < 200) ; - else if (du->du_cr && du->du_cr->cr_orq && du->du_cr->cr_status >= 200) { + else if (nua_invite_client_should_ack(du->du_cr)) { /* There is an un-ACK-ed INVITE there */ assert(du->du_cr->cr_method == sip_method_invite); if (NH_PGET(nh, auto_ack) || @@ -1807,6 +1818,7 @@ next_state = nua_callstate_ready; else next_state = nua_callstate_terminating; + nua_client_request_clean(du->du_cr); } } @@ -3300,7 +3312,7 @@ if (status < 200) ; - else if (du->du_cr && du->du_cr->cr_orq && du->du_cr->cr_status >= 200) { + else if (nua_invite_client_should_ack(du->du_cr)) { /* There is an un-ACK-ed INVITE there */ assert(du->du_cr->cr_method == sip_method_invite); @@ -3311,6 +3323,7 @@ next_state = nua_callstate_ready; else next_state = nua_callstate_terminating; + nua_client_request_clean(du->du_cr); } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Thu Aug 14 11:37:53 2008 @@ -2092,13 +2092,17 @@ return queued; } -nua_client_request_t *nua_client_request_remove(nua_client_request_t *cr) +void nua_client_request_remove(nua_client_request_t *cr) { if (cr->cr_prev) if ((*cr->cr_prev = cr->cr_next)) cr->cr_next->cr_prev = cr->cr_prev; cr->cr_prev = NULL, cr->cr_next = NULL; - return cr; +} + +void nua_client_request_clean(nua_client_request_t *cr) +{ + nta_outgoing_destroy(cr->cr_orq), cr->cr_orq = NULL, cr->cr_acked = 0; } void nua_client_request_complete(nua_client_request_t *cr) @@ -3106,13 +3110,13 @@ if (status < 200 || /* Un-ACKed 2XX response to INVITE */ - (method == sip_method_invite && status < 300 && cr->cr_orq)) { + (method == sip_method_invite && status < 300 && !cr->cr_acked)) { cr->cr_reporting = 0, nh->nh_ds->ds_reporting = 0; return 1; } if (cr->cr_orq) - nta_outgoing_destroy(cr->cr_orq), cr->cr_orq = NULL; + nta_outgoing_destroy(cr->cr_orq), cr->cr_orq = NULL, cr->cr_acked = 0; du = cr->cr_usage;

1 0

[commit] r9289 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 14 Aug '08

14 Aug '08

Author: mikej Date: Thu Aug 14 11:37:09 2008 New Revision: 9289 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c Log: Wed Aug 13 10:23:28 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_dialog.c: clear reference in server request before freeing it Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Aug 14 11:37:09 2008 @@ -1 +1 @@ -Tue Aug 12 13:08:36 EDT 2008 +Thu Aug 14 11:37:00 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c Thu Aug 14 11:37:09 2008 @@ -398,9 +398,9 @@ for (sr = ds->ds_sr; sr; sr = sr_next) { sr_next = sr->sr_next; if (sr->sr_usage == du) { + sr->sr_usage = NULL; if (sr != sr0) nua_server_request_destroy(sr); - sr->sr_usage = NULL; } }

1 0

[commit] r9288 - in freeswitch/trunk/src: . include
by Freeswitch SVN 13 Aug '08

13 Aug '08

Author: anthm Date: Wed Aug 13 17:46:06 2008 New Revision: 9288 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_bridge.c Log: return channels to the execute state when hangup_after_bridge is false on a bridge started with the intercept app Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Wed Aug 13 17:46:06 2008 @@ -142,6 +142,9 @@ SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(_In_ switch_core_session_t *session, _In_z_ const char *extension_name, _In_z_ const char *extension_number); +SWITCH_DECLARE(switch_status_t) switch_caller_extension_clone(switch_caller_extension_t **new_ext, switch_caller_extension_t *orig, + switch_memory_pool_t *pool); + /*! \brief Add an application (instruction) to the given extension \param session session associated with the extension (bound by scope) Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Wed Aug 13 17:46:06 2008 @@ -282,6 +282,56 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "yes" : "no"); } +SWITCH_DECLARE(switch_status_t) switch_caller_extension_clone(switch_caller_extension_t **new_ext, switch_caller_extension_t *orig, + switch_memory_pool_t *pool) +{ + switch_caller_extension_t *caller_extension = NULL; + switch_caller_application_t *caller_application = NULL, *ap = NULL; + + *new_ext = NULL; + + if ((caller_extension = switch_core_alloc(pool, sizeof(switch_caller_extension_t))) != 0) { + int match = 0; + + caller_extension->extension_name = switch_core_strdup(pool, orig->extension_name); + caller_extension->extension_number = switch_core_strdup(pool, orig->extension_number); + + for(ap = orig->applications; ap; ap = ap->next) { + + if (!match) { + if (ap == orig->current_application) { + match++; + } else { + continue; + } + } + caller_application = switch_core_alloc(pool, sizeof(switch_caller_application_t)); + + caller_application->application_name = switch_core_strdup(pool, ap->application_name); + caller_application->application_data = switch_core_strdup(pool, ap->application_data); + + if (!caller_extension->applications) { + caller_extension->applications = caller_application; + } else if (caller_extension->last_application) { + caller_extension->last_application->next = caller_application; + } + + caller_extension->last_application = caller_application; + + if (ap == orig->current_application) { + caller_extension->current_application = caller_application; + } + } + + *new_ext = caller_extension; + + return SWITCH_STATUS_SUCCESS; + } + + + return SWITCH_STATUS_MEMERR; +} + SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Aug 13 17:46:06 2008 @@ -1147,6 +1147,9 @@ caller_profile->times->progress_media = channel->caller_profile->times->progress_media; caller_profile->times->created = channel->caller_profile->times->created; caller_profile->times->hungup = channel->caller_profile->times->hungup; + if (channel->caller_profile->caller_extension) { + switch_caller_extension_clone(&caller_profile->caller_extension, channel->caller_profile->caller_extension, caller_profile->pool); + } } else { caller_profile->times->created = switch_timestamp_now(); } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Aug 13 17:46:06 2008 @@ -814,13 +814,19 @@ state = switch_channel_get_state(caller_channel); if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && !inner_bridge) { - if ((state != CS_EXECUTE && state != CS_PARK && state != CS_ROUTING) || + if ((state != CS_EXECUTE && state != CS_SOFT_EXECUTE && state != CS_PARK && state != CS_ROUTING) || (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP && switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE)))) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); } } + state = switch_channel_get_state(caller_channel); + + if (state == CS_SOFT_EXECUTE || state == CS_PARK) { + switch_channel_set_state(caller_channel, CS_EXECUTE); + } + return status; }

1 0

[commit] r9287 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 13 Aug '08

13 Aug '08

Author: anthm Date: Wed Aug 13 13:24:33 2008 New Revision: 9287 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix MODAPP-126 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 Wed Aug 13 13:24:33 2008 @@ -1274,7 +1274,7 @@ if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) { 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", switch_str_nil(profile->domain_name)); + stream->write_function(stream, "Domain Name \t\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)); } @@ -1296,7 +1296,7 @@ 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, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "NONE" : profile->hold_music); + 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); if (profile->dtmf_type == DTMF_2833) { 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 Wed Aug 13 13:24:33 2008 @@ -994,6 +994,7 @@ if ((profiles = switch_xml_child(cfg, "profiles"))) { for (xprofile = switch_xml_child(profiles, "profile"); xprofile; xprofile = xprofile->next) { char *xprofilename = (char *) switch_xml_attr_soft(xprofile, "name"); + char *xprofiledomain = (char *) switch_xml_attr(xprofile, "domain"); if (strcasecmp(profile->name, xprofilename)) { continue; @@ -1004,6 +1005,10 @@ profile->acl_count = 0; profile->pflags |= PFLAG_STUN_ENABLED; + if (xprofiledomain) { + profile->domain_name = switch_core_strdup(profile->pool, xprofiledomain); + } + if ((settings = switch_xml_child(xprofile, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -1377,8 +1382,6 @@ if (xprofiledomain) { profile->domain_name = switch_core_strdup(profile->pool, xprofiledomain); - } else { - profile->domain_name = profile->name; } profile->dbname = switch_core_strdup(profile->pool, url); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Aug 13 13:24:33 2008 @@ -248,7 +248,7 @@ } } - if (profile->domain_name && profile->domain_name != host) { + if (profile->domain_name && strcasecmp(profile->domain_name, host)) { host = profile->domain_name; }

1 0

[commit] r9286 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 16:54:51 2008 New Revision: 9286 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix sqlite issue with select of the sip contact 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 Tue Aug 12 16:54:51 2008 @@ -414,6 +414,7 @@ char *sofia_reg_find_reg_url(sofia_profile_t *profile, const char *user, const char *host, char *val, switch_size_t len) { struct callback_t cbt = { 0 }; + char sql[512] = ""; if (!user) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Called with null user!\n"); @@ -424,13 +425,13 @@ cbt.len = len; if (host) { - switch_snprintf(val, len, "select contact from sip_registrations where sip_user='%s' and sip_host='%s'", user, host); + switch_snprintf(sql, sizeof(sql), "select contact from sip_registrations where sip_user='%s' and sip_host='%s'", user, host); } else { - switch_snprintf(val, len, "select contact from sip_registrations where sip_user='%s'", user); + switch_snprintf(sql, sizeof(sql), "select contact from sip_registrations where sip_user='%s'", user); } - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, val, sofia_reg_find_callback, &cbt); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_reg_find_callback, &cbt); if (cbt.matches) {

1 0

[commit] r9285 - freeswitch/trunk/src
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 15:12:38 2008 New Revision: 9285 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: byte swap on l16 read codec Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Aug 12 15:12:38 2008 @@ -731,6 +731,7 @@ const char *alt = NULL; int eof = 0; switch_size_t bread = 0; + int l16 = 0; switch_channel_pre_answer(channel); @@ -739,6 +740,10 @@ read_codec = switch_core_session_get_read_codec(session); + if (!strcasecmp(read_codec->implementation->iananame, "l16")) { + l16++; + } + if (switch_strlen_zero(file) || !read_codec) { status = SWITCH_STATUS_FALSE; goto end; @@ -1143,12 +1148,11 @@ write_frame.timestamp = timer.samplecount; } #ifndef WIN32 -#if 0 // don't seem to need it, maybe only on mac? -//#if SWITCH_BYTE_ORDER == __BIG_ENDIAN - if (!asis) { + //#if SWITCH_BYTE_ORDER == __BIG_ENDIAN + if (!asis && l16) { switch_swap_linear(write_frame.data, (int) write_frame.datalen / 2); } -#endif + //#endif #endif if (fh->vol) { switch_change_sln_volume(write_frame.data, write_frame.datalen / 2, fh->vol);

1 0

[commit] r9284 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 14:28:13 2008 New Revision: 9284 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add sip-forbid-register to user params to refuse to let a certian user register 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 Tue Aug 12 14:28:13 2008 @@ -1273,6 +1273,11 @@ const char *var = switch_xml_attr_soft(param, "name"); const char *val = switch_xml_attr_soft(param, "value"); + if (!strcasecmp(var, "sip-forbid-register") && switch_true(val)) { + ret = AUTH_FORBIDDEN; + goto end; + } + if (!strcasecmp(var, "password")) { passwd = val; } @@ -1292,6 +1297,11 @@ const char *var = switch_xml_attr_soft(param, "name"); const char *val = switch_xml_attr_soft(param, "value"); + if (!strcasecmp(var, "sip-forbid-register") && switch_true(val)) { + ret = AUTH_FORBIDDEN; + goto end; + } + if (!strcasecmp(var, "password")) { passwd = val; }

1 0

[commit] r9283 - freeswitch/trunk/src
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 14:04:59 2008 New Revision: 9283 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix compiler error Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 12 14:04:59 2008 @@ -421,7 +421,7 @@ olen = mlen; if (ringback.fh->resampler) { - olen *= ringback.fh->resampler->rfactor; + olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor); } switch_core_file_read(ringback.fh, write_frame.data, &olen); @@ -1220,7 +1220,7 @@ olen = mlen; if (ringback.fh->resampler) { - olen *= ringback.fh->resampler->rfactor; + olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor); } switch_core_file_read(ringback.fh, write_frame.data, &olen);

1 0

[commit] r9282 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 14:00:56 2008 New Revision: 9282 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_originate.c Log: make error endpoint able to forked dial 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 Tue Aug 12 14:00:56 2008 @@ -1882,6 +1882,31 @@ } } + +/* fake chan_error */ +switch_endpoint_interface_t *error_endpoint_interface; +static switch_call_cause_t error_outgoing_channel(switch_core_session_t *session, + switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags); +switch_io_routines_t error_io_routines = { + /*.outgoing_channel */ error_outgoing_channel +}; + +static switch_call_cause_t error_outgoing_channel(switch_core_session_t *session, + switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) +{ + switch_call_cause_t cause = switch_channel_str2cause(outbound_profile->destination_number); + if (cause == SWITCH_CAUSE_NONE) { + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + return cause; +} + + /* fake chan_user */ switch_endpoint_interface_t *user_endpoint_interface; static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session, @@ -2189,6 +2214,10 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + error_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); + error_endpoint_interface->interface_name = "ERROR"; + error_endpoint_interface->io_routines = &error_io_routines; + user_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); user_endpoint_interface->interface_name = "USER"; user_endpoint_interface->io_routines = &user_io_routines; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 12 14:00:56 2008 @@ -542,11 +542,6 @@ *bleg = NULL; - if (!strncasecmp(bridgeto, "error/", 6)) { - *cause = switch_channel_str2cause(bridgeto + 6); - return SWITCH_STATUS_SUCCESS; - } - switch_zmalloc(write_frame.data, SWITCH_RECOMMENDED_BUFFER_SIZE); write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;

1 0