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

[SVN commits to the Asterisk project]

Author: twilson
Date: Thu Dec  9 16:10:31 2010
New Revision: 297960

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

........
  r297959 | twilson | 2010-12-09 16:00:30 -0600 (Thu, 09 Dec 2010) | 14 lines
  
  Ignore spurious REGISTER requests
  
  If a REGISTER request with a Call-ID matching an existing transaction is received
  it was possible that the REGISTER request would overwrite the initreq of the
  private structure. This info is used to generate messages for other responses in
  the transaction. This patch ignores REGISTER requests that match non-REGISTER
  transactions.
  
  (closes issue #18051)
  Reported by: eeman
  Tested by: twilson
  
  Review: https://reviewboard.asterisk.org/r/1050/
........

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=297960&r1=297959&r2=297960
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Thu Dec  9 16:10:31 2010
@@ -21774,6 +21774,13 @@
 static int handle_request_register(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, char *e)
 {
 	enum check_auth_result res;
+
+	/* If this is not the intial request, and the initial request isn't
+	 * a register, something screwy happened, so bail */
+	if (p->initreq.headers && p->initreq.method != SIP_REGISTER) {
+		ast_log(LOG_WARNING, "Ignoring spurious REGISTER with Call-ID: %s\n", p->callid);
+		return -1;
+	}
 
 	/* Use this as the basis */
 	copy_request(&p->initreq, req);