chan_pjsip: Fix bug where custom SIP headers could be duplicated on outgoing INVITEs.
authorMark Michelson <mmichelson@digium.com>
Mon, 9 Jun 2014 20:21:42 +0000 (20:21 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 9 Jun 2014 20:21:42 +0000 (20:21 +0000)
When using PJSIP_HEADER() to add custom headers to outgoing INVITE requests, certain
situations could result in the headers being duplicated. For instance, if the request
were retransmitted, or if the INVITE were re-sent with authentication credentials,
the custom headers would be re-added to the request.

The fix here is to, after adding the custom headers to the outbound INVITE, remove
the datastore that holds the custom headers to add. This way, there is no risk in
accidentally adding them if the session supplement is called into a second or third
time.
........

Merged revisions 415579 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@415580 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_pjsip_header_funcs.c

index b5383fb..dc9d6aa 100644 (file)
@@ -592,6 +592,7 @@ static void outgoing_request(struct ast_sip_session *session, pjsip_tx_data * td
        AST_LIST_TRAVERSE(list, le, nextptr) {
                pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *) pjsip_hdr_clone(pool, le->hdr));
        }
+       ast_sip_session_remove_datastore(session, datastore->uid);
 }
 
 static struct ast_sip_session_supplement header_funcs_supplement = {