Merged revisions 306979 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Tue, 8 Feb 2011 20:42:44 +0000 (20:42 +0000)
committerTerry Wilson <twilson@digium.com>
Tue, 8 Feb 2011 20:42:44 +0000 (20:42 +0000)
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
    ........
  ................
................

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

channels/chan_sip.c

index 14f1cfe..f91261b 100644 (file)
@@ -14961,8 +14961,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;
                }