[asterisk-commits] twilson: trunk r307061 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Feb  8 14:42:44 2011
New Revision: 307061

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

................
  r306979 | twilson | 2011-02-08 12:18:08 -0800 (Tue, 08 Feb 2011) | 16 lines
  
  Merged revisions 306973 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r306973 | twilson | 2011-02-08 12:14:09 -0800 (Tue, 08 Feb 2011) | 9 lines
    
    Merged revisions 306972 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r306972 | twilson | 2011-02-08 12:05:13 -0800 (Tue, 08 Feb 2011) | 2 lines
      
      Fix comparison for REFER Replaces tags with pedantic=yes
    ........
  ................
................

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=307061&r1=307060&r2=307061
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Feb  8 14:42:44 2011
@@ -14961,8 +14961,8 @@
 
 		if (!strcmp(referdata->replaces_callid, transferer->callid) &&
 			(!sip_cfg.pedanticsipchecking ||
-			(!strcmp(referdata->replaces_callid_fromtag, transferer->tag) &&
-			!strcmp(referdata->replaces_callid_totag, transferer->theirtag)))) {
+			(!strcmp(referdata->replaces_callid_fromtag, transferer->theirtag) &&
+			!strcmp(referdata->replaces_callid_totag, transferer->tag)))) {
 				ast_log(LOG_WARNING, "Got an attempt to replace own Call-ID on %s\n", transferer->callid);
 				return -4;
 		}