mark/iftop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug with DNS resolution. https://bugzilla.redhat.com/show_bug.cgi?id=1120254

Browse Source
This commit is contained in:
Paul Warren
2017-02-06 21:35:37 +00:00
committed by root
parent 53e1150f66
commit 35af3cf65f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resolver.c
View File

@@ -438,11 +438,11 @@ void resolver_worker(void* ptr) {
char **ch_pp; char **ch_pp;
void **void_pp; void **void_pp;
} u_old = { &old }; } u_old = { &old };
if(hash_find(ns_hash, &addr, u_old.void_pp) == HASH_STATUS_OK) { if(hash_find(ns_hash, &addr.as_addr6, u_old.void_pp) == HASH_STATUS_OK) {
hash_delete(ns_hash, &addr); hash_delete(ns_hash, &addr);
xfree(old); xfree(old);
} }
hash_insert(ns_hash, &addr, (void*)hostname); hash_insert(ns_hash, &addr.as_addr6, (void*)hostname);
} }
} }
@@ -488,7 +488,7 @@ void resolve(int af, void* addr, char* result, int buflen) {
pthread_mutex_lock(&resolver_queue_mutex); pthread_mutex_lock(&resolver_queue_mutex);
if(hash_find(ns_hash, raddr, u_hostname.void_pp) == HASH_STATUS_OK) { if(hash_find(ns_hash, &raddr->as_addr6, u_hostname.void_pp) == HASH_STATUS_OK) {
/* Found => already resolved, or on the queue, no need to keep /* Found => already resolved, or on the queue, no need to keep
* it around */ * it around */
free(raddr); free(raddr);
@@ -497,7 +497,7 @@ void resolve(int af, void* addr, char* result, int buflen) {
hostname = xmalloc(INET6_ADDRSTRLEN); hostname = xmalloc(INET6_ADDRSTRLEN);
inet_ntop(af, &raddr->addr, hostname, INET6_ADDRSTRLEN); inet_ntop(af, &raddr->addr, hostname, INET6_ADDRSTRLEN);
hash_insert(ns_hash, raddr, hostname); hash_insert(ns_hash, &raddr->as_addr6, hostname);
if(((head + 1) % RESOLVE_QUEUE_LENGTH) == tail) { if(((head + 1) % RESOLVE_QUEUE_LENGTH) == tail) {
/* queue full */ /* queue full */