Merged revisions 297960 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r297960 | twilson | 2010-12-09 16:10:31 -0600 (Thu, 09 Dec 2010) | 21 lines

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

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c87c56f34c69d91d33ef3ff4e2820aead8f25e24..ede666b781434fdb1fa250df53a907faa7cbd951 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -23453,6 +23453,13 @@ static int handle_request_register(struct sip_pvt *p, struct sip_request *req, s
 {
        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);
        if (sipdebug)