From 4d35941891c37e7850a2ba8fc8fbf76624172cc0 Mon Sep 17 00:00:00 2001 From: Kevin Harwell Date: Wed, 11 Sep 2013 14:23:28 +0000 Subject: pjsip: reinvite for connected line updates occurs when it should not Connected line updates are now only sent out if an actual update needs to occur. This happens under the following conditions: 1. The endpoint we are sending to is trusted. 2. Either a P-Asserted-Identity or Remote Party-ID header needs to be added/sent. 3. The connected id's number and name are valid. Also added an SDP when an update is sent out. (closes issue AST-1212) Reported by: John Bigelow Review: https://reviewboard.asterisk.org/r/2831/ ........ Merged revisions 398806 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398808 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_pjsip_caller_id.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'res') diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c index 440cea709..645910dbf 100644 --- a/res/res_pjsip_caller_id.c +++ b/res/res_pjsip_caller_id.c @@ -662,9 +662,6 @@ static void caller_id_outgoing_request(struct ast_sip_session *session, pjsip_tx modify_id_header(tdata->pool, from, &connected_id); modify_id_header(dlg->pool, dlg->local.info, &connected_id); - if (should_queue_connected_line_update(session, &session->endpoint->id.self)) { - queue_connected_line_update(session, &session->endpoint->id.self); - } } add_id_headers(session, tdata, &connected_id); } @@ -674,7 +671,7 @@ static void caller_id_outgoing_request(struct ast_sip_session *session, pjsip_tx * \brief Session supplement for outgoing INVITE response * * This will add P-Asserted-Identity and Remote-Party-ID headers if necessary - * + * * \param session The session on which the INVITE response is to be sent * \param tdata The outbound INVITE response */ -- cgit v1.2.3