daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Nick Peng
2019-01-05 11:58:05 +08:00
parent 104418108a
commit d758ca5d62
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/dns_client.c
View File

@@ -448,7 +448,7 @@ int dns_server_num(void)
void _dns_client_query_get(struct dns_query_struct *query) void _dns_client_query_get(struct dns_query_struct *query)
{ {
if (atomic_inc_return(&query->refcnt) <= 0) { if (atomic_inc_return(&query->refcnt) <= 0) {
tlog(TLOG_ERROR, "BUG:query ref is invalid, domain: %s", query->domain); tlog(TLOG_ERROR, "BUG: query ref is invalid, domain: %s", query->domain);
abort(); abort();
} }
} }
@@ -1730,7 +1730,6 @@ int dns_client_query(char *domain, int qtype, dns_client_callback callback, void
key = hash_string(domain); key = hash_string(domain);
key = jhash(&query->sid, sizeof(query->sid), key); key = jhash(&query->sid, sizeof(query->sid), key);
pthread_mutex_lock(&client.domain_map_lock); pthread_mutex_lock(&client.domain_map_lock);
list_add_tail(&query->dns_request_list, &client.dns_request_list);
hash_add(client.domain_map, &query->domain_node, key); hash_add(client.domain_map, &query->domain_node, key);
pthread_mutex_unlock(&client.domain_map_lock); pthread_mutex_unlock(&client.domain_map_lock);
@@ -1738,20 +1737,22 @@ int dns_client_query(char *domain, int qtype, dns_client_callback callback, void
_dns_client_query_get(query); _dns_client_query_get(query);
ret = _dns_client_send_query(query, domain); ret = _dns_client_send_query(query, domain);
if (ret != 0) { if (ret != 0) {
_dns_client_query_release(query);
goto errout_del_list; goto errout_del_list;
} }
pthread_mutex_lock(&client.domain_map_lock);
list_add_tail(&query->dns_request_list, &client.dns_request_list);
pthread_mutex_unlock(&client.domain_map_lock);
tlog(TLOG_INFO, "send request %s, qtype %d, id %d\n", domain, qtype, query->sid); tlog(TLOG_INFO, "send request %s, qtype %d, id %d\n", domain, qtype, query->sid);
_dns_client_query_release(query); _dns_client_query_release(query);
return 0; return 0;
errout_del_list: errout_del_list:
atomic_dec(&query->refcnt); query->callback = NULL;
pthread_mutex_lock(&client.domain_map_lock); _dns_client_query_remove(query);
list_del_init(&query->dns_request_list); query = NULL;
hash_del(&query->domain_node);
pthread_mutex_unlock(&client.domain_map_lock);
_dns_client_query_release(query);
errout: errout:
if (query) { if (query) {
tlog(TLOG_ERROR, "release %p", query); tlog(TLOG_ERROR, "release %p", query);