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

dns_server: make max ttl no countdown

Browse Source
This commit is contained in:
Nick Peng
2022-05-02 22:53:51 +08:00
parent 1de5557430
commit ebd820bcbb
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/dns_server.c
View File

@@ -1263,6 +1263,7 @@ int _dns_server_reply_all_pending_list(struct dns_request *request, struct dns_s
static int _dns_server_request_complete(struct dns_request *request) static int _dns_server_request_complete(struct dns_request *request)
{ {
int force_A = 0; int force_A = 0;
int ttl = DNS_SERVER_TMOUT_TTL;
if (request->prefetch == 1) { if (request->prefetch == 1) {
return 0; return 0;
@@ -1277,6 +1278,7 @@ static int _dns_server_request_complete(struct dns_request *request)
if (request->has_ping_result == 0 && request->ttl_v4 > DNS_SERVER_TMOUT_TTL) { if (request->has_ping_result == 0 && request->ttl_v4 > DNS_SERVER_TMOUT_TTL) {
request->ttl_v4 = DNS_SERVER_TMOUT_TTL; request->ttl_v4 = DNS_SERVER_TMOUT_TTL;
} }
ttl = request->ttl_v4;
} else if (request->qtype == DNS_T_AAAA) { } else if (request->qtype == DNS_T_AAAA) {
if (request->has_ipv6) { if (request->has_ipv6) {
if (request->has_ping_result == 0 && request->ttl_v6 > DNS_SERVER_TMOUT_TTL) { if (request->has_ping_result == 0 && request->ttl_v6 > DNS_SERVER_TMOUT_TTL) {
@@ -1284,6 +1286,7 @@ static int _dns_server_request_complete(struct dns_request *request)
} }
request->has_soa = 0; request->has_soa = 0;
ttl = request->ttl_v6;
} }
if (request->has_ipv4 && (request->ping_ttl_v4 > 0)) { if (request->has_ipv4 && (request->ping_ttl_v4 > 0)) {
@@ -1308,6 +1311,15 @@ static int _dns_server_request_complete(struct dns_request *request)
out: out:
_dns_server_dualstack_selection_cache_A(request); _dns_server_dualstack_selection_cache_A(request);
if (dns_conf_rr_ttl_rely_max > 0) {
if (ttl > dns_conf_rr_ttl_rely_max) {
ttl = dns_conf_rr_ttl_rely_max;
}
} else {
/* no need upate ttl */
ttl = -1;
}
struct dns_server_post_context context; struct dns_server_post_context context;
_dns_server_post_context_init(&context, request); _dns_server_post_context_init(&context, request);
context.do_cache = 1; context.do_cache = 1;
@@ -1315,7 +1327,7 @@ out:
context.do_force_soa = force_A; context.do_force_soa = force_A;
context.do_audit = 1; context.do_audit = 1;
context.do_reply = 1; context.do_reply = 1;
context.reply_ttl = dns_conf_rr_ttl_rely_max; context.reply_ttl = ttl;
context.skip_notify_count = 1; context.skip_notify_count = 1;
_dns_request_post(&context); _dns_request_post(&context);
@@ -2742,16 +2754,11 @@ static int _dns_server_get_expired_ttl_reply(struct dns_cache *dns_cache)
{ {
int ttl = dns_cache_get_ttl(dns_cache); int ttl = dns_cache_get_ttl(dns_cache);
if (ttl > 0) { if (ttl > 0) {
int ttl_reply = 0; if (dns_conf_rr_ttl_rely_max > 0 && ttl > dns_conf_rr_ttl_rely_max) {
if (dns_conf_rr_ttl_rely_max > 0) { ttl = dns_conf_rr_ttl_rely_max;
ttl_reply = ttl % dns_conf_rr_ttl_rely_max;
} }
if (ttl_reply == 0) { return ttl;
ttl_reply = (ttl > dns_conf_rr_ttl_rely_max) ? dns_conf_rr_ttl_rely_max : ttl;
}
return ttl_reply;
} }
return dns_conf_serve_expired_reply_ttl; return dns_conf_serve_expired_reply_ttl;