From 5f5136952e77eb84b5778f627958fabf3126916c Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Thu, 16 Oct 2008 20:58:26 +0000 Subject: [PATCH] Merged revisions 150207 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r150207 | mmichelson | 2008-10-16 15:57:18 -0500 (Thu, 16 Oct 2008) | 12 lines 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/branches/1.6.1@150208 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fcc9a43375..57ed9b6f55 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7816,7 +7816,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) {