[asterisk-commits] wdoekes: trunk r424185 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Wed Oct  1 05:10:41 2014
New Revision: 424185

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424185
Log:
chan_sip: Simplify some unref code by removing unlink_peer_from_tables.

ASTERISK-22945 #related
Reported by: ibercom
Patches:
  asterisk11-chan_sip-simplifies.patch uploaded by ibercom (License #6599)
........

Merged revisions 424181 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 424182 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 424183 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 424184 from http://svn.asterisk.org/svn/asterisk/branches/13

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-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=424185&r1=424184&r2=424185
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Oct  1 05:10:41 2014
@@ -3244,15 +3244,6 @@
 	unlink_peers_from_tables(SIP_PEERS_ALL);
 }
 
-/* \brief Unlink single peer from all ao2 containers */
-static void unlink_peer_from_tables(struct sip_peer *peer)
-{
-	ao2_t_unlink(peers, peer, "ao2_unlink of peer from peers table");
-	if (!ast_sockaddr_isnull(&peer->addr)) {
-		ao2_t_unlink(peers_by_ip, peer, "ao2_unlink of peer from peers_by_ip table");
-	}
-}
-
 /*! \brief maintain proper refcounts for a sip_pvt's outboundproxy
  *
  * This function sets pvt's outboundproxy pointer to the one referenced
@@ -15869,11 +15860,12 @@
 
 	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, peer, "ao2_unlink of peer from peers table");
+	}
+	if (!ast_sockaddr_isnull(&peer->addr)) {
+		/* 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");
 	}