[asterisk-commits] oej: branch 1.6.1 r171540 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Jan 27 09:19:52 2009
New Revision: 171540

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=171540
Log:
Merged revisions 171528 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r171528 | oej | 2009-01-27 16:00:19 +0100 (Tis, 27 Jan 2009) | 23 lines

Solving the same issue, but a bit different in trunk...

Merged revisions 171527 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r171527 | oej | 2009-01-27 15:33:20 +0100 (Tis, 27 Jan 2009) | 13 lines

Use the same branch tag in CANCEL as in INVITE

Originally putnopvut implemented some changes in revision 142079 that according to the bug report seemed to have worked then, but somehow fails now.
I guess code, as humans, get old and forget stuff. Anyway, this bug caused CANCEL not to work with picky systems. 

Thanks Fredrik for pointing out where the bug in the SIP messaging was.

(closes issue #14346)
Reported by: oej
Patches: 
      bug14346.diff uploaded by oej (license 306)
Tested by: oej

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=171540&r1=171539&r2=171540
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue Jan 27 09:19:52 2009
@@ -9314,7 +9314,8 @@
 	if (init > 1)
 		initreqprep(&req, p, sipmethod);
 	else
-		reqprep(&req, p, sipmethod, 0, 1);
+		/* If init=1, we should not generate a new branch. If it's 0, we need a new branch. */
+		reqprep(&req, p, sipmethod, 0, init ? 0 : 1);
 		
 	if (p->options && p->options->auth)
 		add_header(&req, p->options->authheader, p->options->auth);