[svn-commits] mmichelson: trunk r150207 - /trunk/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Oct 16 15:57:18 2008
New Revision: 150207

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150207
Log:
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)


Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=150207&r1=150206&r2=150207
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Oct 16 15:57:18 2008
@@ -8004,7 +8004,7 @@
 		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) {