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

Fix potential race bug

Browse Source
This commit is contained in:
Nick Peng
2018-08-10 18:29:17 +08:00
parent 56a273e3ed
commit 8bdb6362b4
4 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf.c
View File

@@ -306,6 +306,11 @@ int config_rr_ttl_max(char *value)
return 0;
}
int conf_bogus_nxdomain(char *value)
{
return 0;
}
int config_addtional_file(char *value)
{
char *file_path = value;
@@ -339,6 +344,7 @@ struct config_item config_item[] = {
{"rr-ttl", config_rr_ttl},
{"rr-ttl-min", config_rr_ttl_min},
{"rr-ttl-max", config_rr_ttl_max},
{"bogus-nxdomain", conf_bogus_nxdomain},
{"conf-file", config_addtional_file},
};
int config_item_num = sizeof(config_item) / sizeof(struct config_item);

30
src/dns_client.c
View File

@@ -246,6 +246,16 @@ errout:
return -1;
}
static void _dns_client_close_socket(struct dns_server_info *server_info)
{
if (server_info->fd <= 0) {
return;
}
epoll_ctl(client.epoll_fd, EPOLL_CTL_DEL, server_info->fd, NULL);
close(server_info->fd);
server_info->fd = -1;
}
/* remove all servers information */
void _dns_client_server_remove_all(void)
{
@@ -260,9 +270,8 @@ void _dns_client_server_remove_all(void)
tlog(TLOG_ERROR, "stop ping failed.\n");
}
}
if (server_info->fd > 0) {
close(server_info->fd);
}
_dns_client_close_socket(server_info);
free(server_info);
}
pthread_mutex_unlock(&client.server_list_lock);
@@ -459,10 +468,9 @@ void _dns_client_period_run(void)
list_for_each_entry(server_info, &client.dns_server_list, list)
{
if (server_info->last_send - 5 > server_info->last_recv) {
if (server_info->fd > 0) {
close(server_info->fd);
server_info->fd = -1;
}
server_info->recv_buff.len = 0;
server_info->send_buff.len = 0;
_dns_client_close_socket(server_info);
}
}
pthread_mutex_unlock(&client.server_list_lock);
@@ -776,8 +784,7 @@ static int _dns_client_process_tcp(struct dns_server_info *server_info, struct e
/* peer server close */
if (len == 0) {
pthread_mutex_lock(&client.server_list_lock);
close(server_info->fd);
server_info->fd = 0;
_dns_client_close_socket(server_info);
server_info->recv_buff.len = 0;
if (server_info->send_buff.len > 0) {
/* still remain request data, reconnect and send*/
@@ -838,10 +845,7 @@ errout:
pthread_mutex_lock(&client.server_list_lock);
server_info->recv_buff.len = 0;
server_info->send_buff.len = 0;
if (server_info->fd > 0) {
close(server_info->fd);
server_info->fd = -1;
}
_dns_client_close_socket(server_info);
pthread_mutex_unlock(&client.server_list_lock);
return -1;