Merged revisions 80849 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80849 | russell | 2007-08-24 16:22:50 -0500 (Fri, 24 Aug 2007) | 5 lines

If dnsmgr is in use, and no DNS servers are available when Asterisk first
starts, then don't give up on poking peers.  Allow the poke to get rescheduled
so that it will work once the dnsmgr is able to resolve the host.
(closes issue #10521, patch by jamesgolovich)

........

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 9290f232cd78f7246b4ab324836e6ed90e963dbe..bf92ba9692bfc66a46a7f349a411d9c3d058d080 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -9001,8 +9001,8 @@ static int iax2_poke_peer_cb(void *obj, void *arg, int flags)
 
 static int iax2_poke_peer(struct iax2_peer *peer, int heldcall)
 {
-       if (!peer->maxms || !peer->addr.sin_addr.s_addr) {
-               /* IF we have no IP, or this isn't to be monitored, return
+       if (!peer->maxms || (!peer->addr.sin_addr.s_addr && !peer->dnsmgr)) {
+               /* IF we have no IP without dnsmgr, or this isn't to be monitored, return
                  immediately after clearing things out */
                peer->lastms = 0;
                peer->historicms = 0;