From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 16 Oct 2008 20:57:18 +0000 (+0000)
Subject: INVITES with proxy auth were sent with a different branch
X-Git-Tag: 1.6.2.0-beta1~1086
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d983e34cf17fd6a3286a6200ba02fb2e9b21a9b;p=thirdparty%2Fasterisk.git

INVITES with proxy auth were sent with a different branch
than what was in the invite_branch of a sip_pvt, meaning
that if a CANCEL were sent later, the branch in the CANCEL
would not match the branch in the latest INVITE sent out, leading
to some endpoints responding to the CANCEL with a 481.

(closes issue #13714)
Reported by: fnordian
Patches:
      invite_branch.patch uploaded by fnordian (license 110)



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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 88a1593359..e75cf55e9f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8004,7 +8004,7 @@ static int reqprep(struct sip_request *req, struct sip_pvt *p, int sipmethod, in
 		seqno = p->ocseq;
 	}
 	
-	if (sipmethod == SIP_CANCEL) {
+	if (sipmethod == SIP_CANCEL || sipmethod == SIP_INVITE) {
 		p->branch = p->invite_branch;
 		build_via(p);
 	} else if (newbranch) {