Author: wdoekes
Date: Wed Oct 1 05:06:33 2014
New Revision: 424181
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424181
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)
Modified:
branches/1.8/channels/chan_sip.c
Modified: branches/1.8/channels/chan_sip.c
URL:
http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=424181&r1=424180&r2=424181
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Wed Oct 1 05:06:33 2014
@@ -3044,15 +3044,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
@@ -14249,11 +14240,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");
}
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
