When a device registers we need to unlink them (if linked) from the peers_by_ip conta...

(closes issue #13811)
Reported by: pj

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@163629 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 51fc59b2a28a673b704cf78577b8e0d1fbeae58e..ae9e99c0c307e275f73b3552fc8831c44922024c 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11153,6 +11153,11 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
 
        oldsin = peer->addr;
 
+       /* If we were already linked into the peers_by_ip container unlink ourselves so nobody can find us */
+       if (peer->addr.sin_addr.s_addr) {
+               ao2_t_unlink(peers_by_ip, peer, "ao2_unlink of peer from peers_by_ip table");
+       }
+
        /* Check that they're allowed to register at this IP */
        /* XXX This could block for a long time XXX */
        /*! \todo Check NAPTR/SRV if we have not got a port in the URI */
@@ -11184,6 +11189,9 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
                peer->addr = pvt->recv;
        }
 
+       /* Now that our address has been updated put ourselves back into the container for lookups */
+       ao2_t_link(peers_by_ip, peer, "ao2_link into peers_by_ip table");
+
        /* Save SIP options profile */
        peer->sipoptions = pvt->sipoptions;