From 303547231e19ba13269c362cc720d7a7a7c0c7fc Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Wed, 1 Oct 2014 10:09:49 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@424184 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index af75cab329..d1ac4ca563 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3243,15 +3243,6 @@ static void unlink_all_peers_from_tables(void) 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 @@ -15863,11 +15854,12 @@ static int expire_register(const void *data) 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"); }