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

dns_client: avoid disconnect with server after query complete

Browse Source
This commit is contained in:
Nick Peng
2020-08-24 23:54:06 +08:00
parent b8a36ccb8c
commit a3d3364a32
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dns_client.c
View File

@@ -1468,7 +1468,7 @@ static int _dns_client_recv(struct dns_server_info *server_info, unsigned char *
} }
_dns_client_query_release(query); _dns_client_query_release(query);
return ret; return 0;
} }
static int _dns_client_create_socket_udp(struct dns_server_info *server_info) static int _dns_client_create_socket_udp(struct dns_server_info *server_info)

12
src/dns_server.c
View File

@@ -1778,19 +1778,19 @@ static int _dns_server_setup_ipset_packet(struct dns_request *request, struct dn
struct dns_rule_flags *rule_flags = NULL; struct dns_rule_flags *rule_flags = NULL;
if (_dns_server_has_bind_flag(request, BIND_FLAG_NO_RULE_IPSET) == 0) { if (_dns_server_has_bind_flag(request, BIND_FLAG_NO_RULE_IPSET) == 0) {
return -1; return 0;
} }
/* check ipset rule */ /* check ipset rule */
rule_flags = request->domain_rule.rules[DOMAIN_RULE_FLAGS]; rule_flags = request->domain_rule.rules[DOMAIN_RULE_FLAGS];
if (rule_flags) { if (rule_flags) {
if (rule_flags->flags & DOMAIN_FLAG_IPSET_IGNORE) { if (rule_flags->flags & DOMAIN_FLAG_IPSET_IGNORE) {
return -1; return 0;
} }
} }
ipset_rule = request->domain_rule.rules[DOMAIN_RULE_IPSET]; ipset_rule = request->domain_rule.rules[DOMAIN_RULE_IPSET];
if (ipset_rule == NULL) { if (ipset_rule == NULL) {
return -1; return 0;
} }
for (j = 1; j < DNS_RRS_END; j++) { for (j = 1; j < DNS_RRS_END; j++) {
@@ -1883,7 +1883,11 @@ static int _dns_server_reply_passthrouth(struct dns_request *request, struct dns
} }
} }
return _dns_server_setup_ipset_packet(request, packet); if(_dns_server_setup_ipset_packet(request, packet) != 0) {
tlog(TLOG_DEBUG, "setup ipset failed.");
}
return 0;
} }
static int dns_server_resolve_callback(char *domain, dns_result_type rtype, unsigned int result_flag, static int dns_server_resolve_callback(char *domain, dns_result_type rtype, unsigned int result_flag,