From 2cb5178d296db20ff43f686423abe453233edff7 Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@digium.com>
Date: Mon, 17 Oct 2011 15:45:18 +0000
Subject: [PATCH] Don't try to remove peers without IPs from peers_by_ip
(closes issue ASTERISK-18696)
........
Merged revisions 341088 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 341089 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ff96898954..319ce5769f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -27372,7 +27372,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
found++;
/* we've unlinked the peer from the peers container but not unlinked from the peers_by_ip container yet
this leads to a wrong refcounter and the peer object is never destroyed */
- ao2_t_unlink(peers_by_ip, peer, "ao2_unlink peer from peers_by_ip table");
+ if (!ast_sockaddr_isnull(&peer->addr)) {
+ ao2_t_unlink(peers_by_ip, peer, "ao2_unlink peer from peers_by_ip table");
+ }
if (!(peer->the_mark))
firstpass = 0;
} else {
--
GitLab