[asterisk-commits] twilson: branch 1.6.2 r306618 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Feb  7 15:59:54 2011
New Revision: 306618

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

........
  r306617 | twilson | 2011-02-07 13:51:43 -0800 (Mon, 07 Feb 2011) | 10 lines
  
  Don't allow a REFER w/replaces to replace its own dialog
  
  Asterisk currently accepts a REFER with a Refer-To with an embedded Replaces
  header that matches the dialog of the REFER. This would be a situation like A
  calls B, A calls C, A transfers B to A, which is just silly. This patch makes
  the transfer fail instead of making Asterisk freak out and forget to hang other
  channels up.
  
  Review: https://reviewboard.asterisk.org/r/1093/
........

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

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=306618&r1=306617&r2=306618
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Mon Feb  7 15:59:54 2011
@@ -14045,7 +14045,15 @@
 				*to = '\0';
 			ast_copy_string(referdata->replaces_callid_fromtag, ptr, sizeof(referdata->replaces_callid_fromtag));
 		}
-		
+
+		if (!strcmp(referdata->replaces_callid, transferer->callid) &&
+			(!sip_cfg.pedanticsipchecking ||
+			(!strcmp(referdata->replaces_callid_fromtag, transferer->tag) &&
+			!strcmp(referdata->replaces_callid_totag, transferer->theirtag)))) {
+				ast_log(LOG_WARNING, "Got an attempt to replace own Call-ID on %s\n", transferer->callid);
+				return -4;
+		}
+
 		if (!sip_cfg.pedanticsipchecking)
 			ast_debug(2, "Attended transfer: Will use Replace-Call-ID : %s (No check of from/to tags)\n", referdata->replaces_callid );
 		else