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

passthrouth: fix passthrouth ttl

Browse Source
This commit is contained in:
Nick Peng
2022-05-03 10:25:33 +08:00
parent 29a5803860
commit 34691154fb
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dns_server.c
View File

@@ -2111,7 +2111,7 @@ static int _dns_server_process_answer(struct dns_request *request, char *domain,
} }
static int _dns_server_passthrough_rule_check(struct dns_request *request, char *domain, struct dns_packet *packet, static int _dns_server_passthrough_rule_check(struct dns_request *request, char *domain, struct dns_packet *packet,
unsigned int result_flag) unsigned int result_flag, int *pttl)
{ {
int ttl; int ttl;
char name[DNS_MAX_CNAME_LEN] = {0}; char name[DNS_MAX_CNAME_LEN] = {0};
@@ -2199,6 +2199,8 @@ static int _dns_server_passthrough_rule_check(struct dns_request *request, char
} }
} }
*pttl = ttl;
if (is_result_discard == 1) { if (is_result_discard == 1) {
return 0; return 0;
} }
@@ -2350,17 +2352,23 @@ static int dns_server_resolve_callback(char *domain, dns_result_type rtype, unsi
if (rtype == DNS_QUERY_RESULT) { if (rtype == DNS_QUERY_RESULT) {
if (request->passthrough) { if (request->passthrough) {
struct dns_server_post_context context; struct dns_server_post_context context;
ret = _dns_server_passthrough_rule_check(request, domain, packet, result_flag); int ttl = 0;
ret = _dns_server_passthrough_rule_check(request, domain, packet, result_flag, &ttl);
if (ret == 0) { if (ret == 0) {
return 0; return 0;
} }
ttl = _dns_server_get_conf_ttl(ttl);
if ( ttl > dns_conf_rr_ttl_reply_max && dns_conf_rr_ttl_reply_max > 0) {
ttl = dns_conf_rr_ttl_reply_max;
}
_dns_server_post_context_init_from(&context, request, packet, inpacket, inpacket_len); _dns_server_post_context_init_from(&context, request, packet, inpacket, inpacket_len);
context.do_cache = 1; context.do_cache = 1;
context.do_audit = 1; context.do_audit = 1;
context.do_reply = 1; context.do_reply = 1;
context.do_ipset = 1; context.do_ipset = 1;
context.reply_ttl = dns_conf_rr_ttl_reply_max; context.reply_ttl = ttl;
return _dns_server_reply_passthrouth(&context); return _dns_server_reply_passthrouth(&context);
} }
_dns_server_process_answer(request, domain, packet, result_flag); _dns_server_process_answer(request, domain, packet, result_flag);