Handle DNS failures on startup more gracefully (bug #3086)

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

diff --git a/acl.c b/acl.c
index dbc2065..7042eee 100755 (executable)
--- a/acl.c
+++ b/acl.c
@@ -384,3 +384,32 @@ struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_co
                ast_log(LOG_WARNING, "Out of memory!\n");
        return NULL;
 }
+
+int ast_find_ourip(struct in_addr *ourip, struct sockaddr_in bindaddr)
+{
+       char ourhost[256];
+       struct ast_hostent ahp;
+       struct hostent *hp;
+       struct in_addr saddr;
+
+       /* just use the bind address if it is nonzero */
+       if (ntohl(bindaddr.sin_addr.s_addr)) {
+               memcpy(ourip, &bindaddr.sin_addr, sizeof(*ourip));
+               return 0;
+       }
+       /* try to use our hostname */
+       if (gethostname(ourhost, sizeof(ourhost))) {
+               ast_log(LOG_WARNING, "Unable to get hostname\n");
+       } else {
+               hp = ast_gethostbyname(ourhost, &ahp);
+               if (hp) {
+                       memcpy(ourip, hp->h_addr, sizeof(*ourip));
+                       return 0;
+               }
+       }
+       /* A.ROOT-SERVERS.NET. */
+       if (inet_aton("198.41.0.4", &saddr) && !ast_ouraddrfor(&saddr, ourip))
+               return 0;
+       return -1;
+}
+

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 24af559..fb00430 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -191,7 +191,6 @@ static int restart_monitor(void);
 static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
 static int noncodeccapability = AST_RTP_DTMF;
 
-static char ourhost[256];
 static struct in_addr __ourip;
 static struct sockaddr_in outboundproxyip;
 static int ourport;
@@ -9059,10 +9058,6 @@ static int reload_config(void)
        char iabuf[INET_ADDRSTRLEN];
        struct ast_flags dummy;
        
-       if (gethostname(ourhost, sizeof(ourhost))) {
-               ast_log(LOG_WARNING, "Unable to get hostname, SIP disabled\n");
-               return 0;
-       }
        cfg = ast_config_load(config);
 
        /* We *must* have a config file otherwise stop immediately */
@@ -9297,20 +9292,9 @@ static int reload_config(void)
                }
                cat = ast_category_browse(cfg, cat);
        }
-       
-       /* Find our IP address */
-       if (ntohl(bindaddr.sin_addr.s_addr)) {
-               memcpy(&__ourip, &bindaddr.sin_addr, sizeof(__ourip));
-       } else {
-               hp = ast_gethostbyname(ourhost, &ahp);
-               if (!hp) {
-                       ast_log(LOG_WARNING, "Unable to get IP address for %s, SIP disabled\n", ourhost);
-                       if (!__ourip.s_addr) {
-                               ast_config_destroy(cfg);
-                               return 0;
-                       }
-               } else
-                       memcpy(&__ourip, hp->h_addr, sizeof(__ourip));
+       if (ast_find_ourip(&__ourip, bindaddr)) {
+               ast_log(LOG_WARNING, "Unable to get own IP address, SIP disabled\n");
+               return 0;
        }
        if (!ntohs(bindaddr.sin_port))
                bindaddr.sin_port = ntohs(DEFAULT_SIP_PORT);

diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h
index 5dff735..3aa7777 100755 (executable)
--- a/include/asterisk/acl.h
+++ b/include/asterisk/acl.h
@@ -50,6 +50,7 @@ extern struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, s
 extern int ast_netsock_free(struct ast_netsock_list *list, struct ast_netsock *netsock);
 extern int ast_netsock_release(struct ast_netsock_list *list);
 extern int ast_netsock_sockfd(struct ast_netsock *ns);
+extern int ast_find_ourip(struct in_addr *ourip, struct sockaddr_in bindaddr);
 
 /*! Compares the source address and port of two sockaddr_in */
 static inline int inaddrcmp(struct sockaddr_in *sin1, struct sockaddr_in *sin2)