kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-07 15:19:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(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
This commit is contained in:
Matthew Nicholson
2010-06-17 15:11:27 +00:00
parent 25a613a993
commit e3ee8deffd
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/acl.c
+1
View File
@@ -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);
main/dnsmgr.c
+2 -6
View File
@@ -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;
}