From: Terry Wilson <twilson@digium.com>
Date: Tue, 8 Feb 2011 20:18:08 +0000 (+0000)
Subject: Merged revisions 306973 via svnmerge from
X-Git-Tag: 1.8.4-rc1~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd3b672f45f770958a5fa1bd350a01f33509745e;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@306979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 64188592f5..0aa9d8f67b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14730,8 +14730,8 @@ static int get_refer_info(struct sip_pvt *transferer, struct sip_request *outgoi
 
 		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;
 		}