Author: wdoekes Date: Wed Oct 1 05:09:05 2014 New Revision: 424183 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424183 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 Modified: branches/12/ (props changed) branches/12/channels/chan_sip.c Propchange: branches/12/ ------------------------------------------------------------------------------ Binary property 'branch-11-merged' - no diff available. Modified: branches/12/channels/chan_sip.c URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_sip.c?view=diff&rev=424183&r1=424182&r2=424183 ============================================================================== --- branches/12/channels/chan_sip.c (original) +++ branches/12/channels/chan_sip.c Wed Oct 1 05:09:05 2014 @@ -3285,15 +3285,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 @@ -15850,11 +15841,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
