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

Update code

Browse Source
This commit is contained in:
Nick Peng
2018-05-26 00:14:37 +08:00
parent a86f5e7459
commit fc736d666c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dns_client.c
View File

@@ -366,7 +366,7 @@ void _dns_client_period_run()
{ {
if (now - query->send_tick > 500) { if (now - query->send_tick > 500) {
atomic_set(&query->dns_request_sent, -1); atomic_set(&query->dns_request_sent, -1);
_dns_client_query_release(query, 1); //_dns_client_query_release(query, 1);
} }
} }
pthread_mutex_unlock(&client.domain_map_lock); pthread_mutex_unlock(&client.domain_map_lock);
@@ -584,6 +584,7 @@ static int _dns_client_send_udp(struct dns_server_info *server_info, void *packe
send_len = sendto(client.udp, packet, len, 0, (struct sockaddr *)&server_info->addr, server_info->addr_len); send_len = sendto(client.udp, packet, len, 0, (struct sockaddr *)&server_info->addr, server_info->addr_len);
if (send_len != len) { if (send_len != len) {
printf("send to server failed."); printf("send to server failed.");
abort();
return -1; return -1;
} }
@@ -612,6 +613,7 @@ static int _dns_client_send_packet(struct dns_query_struct *query, void *packet,
continue; continue;
} }
atomic_inc(&query->dns_request_sent); atomic_inc(&query->dns_request_sent);
} }
pthread_mutex_unlock(&client.server_list_lock); pthread_mutex_unlock(&client.server_list_lock);
@@ -669,13 +671,6 @@ int dns_client_query(char *domain, dns_client_callback callback, void *user_ptr)
query->sid = atomic_inc_return(&dns_client_sid); query->sid = atomic_inc_return(&dns_client_sid);
_dns_client_query_get(query); _dns_client_query_get(query);
ret = _dns_client_send_query(query, domain);
if (ret != 0) {
goto errout_del_list;
}
tlog(TLOG_INFO, "send request %s, id %d\n", domain, query->sid);
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);
@@ -683,6 +678,13 @@ int dns_client_query(char *domain, dns_client_callback callback, void *user_ptr)
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);
ret = _dns_client_send_query(query, domain);
if (ret != 0) {
goto errout_del_list;
}
tlog(TLOG_INFO, "send request %s, id %d\n", domain, query->sid);
return 0; return 0;
errout_del_list: errout_del_list:
atomic_dec(&query->refcnt); atomic_dec(&query->refcnt);