[svn-commits] tilghman: branch 1.6.0 r257507 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Apr 15 15:34:28 2010
New Revision: 257507

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=257507
Log:
Merged revisions 257493 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257493 | tilghman | 2010-04-15 15:30:15 -0500 (Thu, 15 Apr 2010) | 20 lines
  
  Merged revisions 257467 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257467 | tilghman | 2010-04-15 15:24:50 -0500 (Thu, 15 Apr 2010) | 13 lines
    
    Don't recreate peer, when responding to a repeated deregistration attempt.
    
    When a reply to a deregistration is lost in transmit, the client retries the
    deregistration.  Previously, this would cause a realtime/autocreate peer to be
    loaded back into memory, after it had already been correctly purged.  Instead,
    we just want to resend the reply without loading the peer.
    
    (closes issue #16908)
     Reported by: kkm
     Patches: 
           20100412__issue16908.diff.txt uploaded by tilghman (license 14)
     Tested by: kkm
  ........
................

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=257507&r1=257506&r2=257507
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Apr 15 15:34:28 2010
@@ -11624,6 +11624,21 @@
 
 	ast_string_field_set(p, exten, name);
 	build_contact(p);
+	if (req->ignore) {
+		/* Expires is a special case, where we only want to load the peer if this isn't a deregistration attempt */
+		const char *expires = get_header(req, "Expires");
+		int expire = atoi(expires);
+
+		if (ast_strlen_zero(expires)) { /* No expires header; look in Contact */
+			if ((expires = strcasestr(get_header(req, "Contact"), ";expires="))) {
+				expire = atoi(expires + 9);
+			}
+		}
+		if (!ast_strlen_zero(expires) && expire == 0) {
+			transmit_response_with_date(p, "200 OK", req);
+			return 0;
+		}
+	}
 	peer = find_peer(name, NULL, 1, 0, 0);
 	if (!(peer && ast_apply_ha(peer->ha, sin))) {
 		/* Peer fails ACL check */