Merged revisions 333837 via svnmerge from

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

................
  r333837 | twilson | 2011-08-29 16:41:13 -0500 (Mon, 29 Aug 2011) | 22 lines

  Merged revisions 333836 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r333836 | twilson | 2011-08-29 16:38:31 -0500 (Mon, 29 Aug 2011) | 15 lines

    Refresh peer address if DNS unavailable at peer creation

    If Asterisk starts and no DNS is available, outbound registrations will fail
    indefinitely. This patch copies the address from the sip_registry struct, which
    will be updated, to the peer->addr when necessary.

    If dnsmgr is enabled, the registration fails without the patch because even
    though the address on the registry is updated via dnsmgr, the address is just
    copied on the first try. Since we use ast_sockaddr_copy, dnsmgr can't update
    the address that is copied to the sip_pvt or peers.

    Closes issue ASTERISK-18000

    Review: https://reviewboard.asterisk.org/r/1335/
  ........
................

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 1a5c079..6d5d008 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12916,8 +12916,17 @@ static int sip_reg_timeout(const void *data)
        }
 
        if (r->dnsmgr) {
+               struct sip_peer *peer;
                /* If the registration has timed out, maybe the IP changed.  Force a refresh. */
                ast_dnsmgr_refresh(r->dnsmgr);
+               /* If we are resolving a peer, we have to make sure the refreshed address gets copied */
+               if ((peer = find_peer(r->hostname, NULL, TRUE, FINDPEERS, FALSE, 0))) {
+                       ast_sockaddr_copy(&peer->addr, &r->us);
+                       if (r->portno) {
+                               ast_sockaddr_set_port(&peer->addr, r->portno);
+                       }
+                       peer = unref_peer(peer, "unref after find_peer");
+               }
        }
 
        /* If the initial tranmission failed, we may not have an existing dialog,
@@ -13036,6 +13045,16 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char *
                        ast_sockaddr_set_port(&r->us, r->portno);
                }
 
+               /* It is possible that DNS is unavailable at the time the peer is created. Here, if
+                * we've updated the address in the registry, we copy it to the peer so that
+                * create_addr() can copy it to the dialog via create_addr_from_peer */
+               if ((peer = find_peer(r->hostname, NULL, TRUE, FINDPEERS, FALSE, 0))) {
+                       if (ast_sockaddr_isnull(&peer->addr) && !(ast_sockaddr_isnull(&r->us))) {
+                               ast_sockaddr_copy(&peer->addr, &r->us);
+                       }
+                       peer = unref_peer(peer, "unref after find_peer");
+               }
+
                /* Find address to hostname */
                if (create_addr(p, S_OR(r->peername, r->hostname), &r->us, 0, NULL)) {
                        /* we have what we hope is a temporary network error,