Do not skip sending MWI for a peer if an address is defined. Really just a merge...

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8dc4c5d..d27f3c8 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -23835,7 +23835,7 @@ static int sip_send_mwi_to_peer(struct sip_peer *peer, const struct ast_event *e
                return 0;
 
        /* Do we have an IP address? If not, skip this peer */
-       if (ast_sockaddr_isnull(&peer->addr) || ast_sockaddr_isnull(&peer->defaddr))
+       if (ast_sockaddr_isnull(&peer->addr) && ast_sockaddr_isnull(&peer->defaddr))
                return 0;
 
        if (event) {