[asterisk-commits] dvossel: trunk r287646 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Sep 20 16:35:46 2010
New Revision: 287646

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287646
Log:
Merged revisions 287645 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287645 | dvossel | 2010-09-20 16:34:15 -0500 (Mon, 20 Sep 2010) | 9 lines
  
  Fixes issue with registrations not working properly with pedantic=yes.
  
  (closes issue #18017)
  Reported by: schmidts
  Patches:
        issues_18017_v1.diff uploaded by dvossel (license 671)
  Tested by: schmidts
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=287646&r1=287645&r2=287646
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Sep 20 16:35:46 2010
@@ -7260,8 +7260,10 @@
 			return SIP_REQ_NOT_MATCH;
 		}
 	} else {
-		/* Verify the fromtag of Request matches the tag they provided earlier. */
-		if (strcmp(arg->fromtag, sip_pvt_ptr->theirtag)) {
+		/* Verify the fromtag of Request matches the tag they provided earlier.
+		 * If this is a Request with authentication credentials, forget their old
+		 * tag as it is not valid after the 401 or 407 response. */
+		if (!arg->authentication_present && strcmp(arg->fromtag, sip_pvt_ptr->theirtag)) {
 			/* their tag does not match the one was have stored for them */
 			return SIP_REQ_NOT_MATCH;
 		}