[asterisk-commits] twilson: trunk r319212 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon May 16 13:21:17 2011
New Revision: 319212

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

................
  r319204 | twilson | 2011-05-16 13:17:43 -0500 (Mon, 16 May 2011) | 11 lines
  
  Merged revisions 319202 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r319202 | twilson | 2011-05-16 11:00:21 -0700 (Mon, 16 May 2011) | 4 lines
    
    Unlink a peer from peers_by_ip when expiring a registration
    
    Review: https://reviewboard.asterisk.org/r/1218/
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=319212&r1=319211&r2=319212
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon May 16 13:21:17 2011
@@ -13398,6 +13398,11 @@
 	if (peer->selfdestruct ||
 	    ast_test_flag(&peer->flags[1], SIP_PAGE2_RTAUTOCLEAR)) {
 		unlink_peer_from_tables(peer);
+	} else if (!ast_sockaddr_isnull(&peer->addr)) {
+		/* If we aren't self-destructing a temp_peer, we still need to unlink the peer
+		 * from the peers_by_ip table, otherwise we end up with multiple copies hanging
+		 * around each time a registration expires and the peer re-registers. */
+		ao2_t_unlink(peers_by_ip, peer, "ao2_unlink of peer from peers_by_ip table");
 	}
 
 	/* Only clear the addr after we check for destruction.  The addr must remain