Set sin_family in ast_get_ip_or_srv() and removed the 'last' member of the ast_dnsmgr...

(closes issue #15827)
Reported by: DennisD
Patches:
      (modified) dnsmgr_15827.patch uploaded by chappell (license 8)

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

diff --git a/main/acl.c b/main/acl.c
index 5a7017da9ba0e84ff66f2bd24e7c1182b1ced94b..53eb0b996adf5ea19fcd8d32778fe5d7f0554805 100644 (file)
--- a/main/acl.c
+++ b/main/acl.c
@@ -395,6 +395,7 @@ int ast_get_ip_or_srv(struct sockaddr_in *sin, const char *value, const char *se
        }
        hp = ast_gethostbyname(value, &ahp);
        if (hp) {
+               sin->sin_family = hp->h_addrtype;
                memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr));
        } else {
                ast_log(LOG_WARNING, "Unable to lookup '%s'\n", value);

diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index 6be5720d045de0813fab9236a7e9f9f22c0cdad4..0dadb69d942ce8d1304839452936a100d2b13610 100644 (file)
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -55,8 +55,6 @@ static pthread_t refresh_thread = AST_PTHREADT_NULL;
 struct ast_dnsmgr_entry {
        /*! where we will store the resulting address */
        struct in_addr *result;
-       /*! the last result, used to check if address has changed */
-       struct in_addr last;
        /*! Set to 1 if the entry changes */
        int changed:1;
        ast_mutex_t lock;
@@ -96,7 +94,6 @@ struct ast_dnsmgr_entry *ast_dnsmgr_get(const char *name, struct in_addr *result
        entry->result = result;
        ast_mutex_init(&entry->lock);
        strcpy(entry->name, name);
-       memcpy(&entry->last, result, sizeof(entry->last));
 
        AST_LIST_LOCK(&entry_list);
        AST_LIST_INSERT_HEAD(&entry_list, entry, list);
@@ -172,13 +169,12 @@ static int dnsmgr_refresh(struct ast_dnsmgr_entry *entry, int verbose)
        if ((hp = ast_gethostbyname(entry->name, &ahp))) {
                /* check to see if it has changed, do callback if requested (where de callback is defined ????) */
                memcpy(&tmp, hp->h_addr, sizeof(tmp));
-               if (tmp.s_addr != entry->last.s_addr) {
-                       ast_copy_string(iabuf, ast_inet_ntoa(entry->last), sizeof(iabuf));
+               if (tmp.s_addr != entry->result->s_addr) {
+                       ast_copy_string(iabuf, ast_inet_ntoa(*entry->result), sizeof(iabuf));
                        ast_copy_string(iabuf2, ast_inet_ntoa(tmp), sizeof(iabuf2));
                        ast_log(LOG_NOTICE, "host '%s' changed from %s to %s\n", 
                                entry->name, iabuf, iabuf2);
                        memcpy(entry->result, hp->h_addr, sizeof(entry->result));
-                       memcpy(&entry->last, hp->h_addr, sizeof(entry->last));
                        changed = entry->changed = 1;
                }