Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak server-selection logic in the fast-retry case.

Browse Source
This commit is contained in:
Simon Kelley
2022-09-15 23:54:53 +01:00
parent a2ee2426bf
commit d882dfdae9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/forward.c
View File

@@ -170,7 +170,7 @@ static int domain_no_rebind(char *domain)
static int forward_query(int udpfd, union mysockaddr *udpaddr, static int forward_query(int udpfd, union mysockaddr *udpaddr,
union all_addr *dst_addr, unsigned int dst_iface, union all_addr *dst_addr, unsigned int dst_iface,
struct dns_header *header, size_t plen, char *limit, time_t now, struct dns_header *header, size_t plen, char *limit, time_t now,
struct frec *forward, int ad_reqd, int do_bit) struct frec *forward, int ad_reqd, int do_bit, int fast_retry)
{ {
unsigned int flags = 0; unsigned int flags = 0;
unsigned int fwd_flags = 0; unsigned int fwd_flags = 0;
@@ -389,7 +389,8 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
#endif #endif
{ {
/* retry on existing query, from original source. Send to all available servers */ /* retry on existing query, from original source. Send to all available servers */
forward->sentto->failed_queries++; if (!fast_retry)
forward->sentto->failed_queries++;
if (!filter_servers(forward->sentto->arrayposn, F_SERVER, &first, &last)) if (!filter_servers(forward->sentto->arrayposn, F_SERVER, &first, &last))
goto reply; goto reply;
@@ -397,13 +398,13 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
master = daemon->serverarray[first]; master = daemon->serverarray[first];
/* Forward to all available servers on retry of query from same host. */ /* Forward to all available servers on retry of query from same host. */
if (!option_bool(OPT_ORDER) && old_src) if (!option_bool(OPT_ORDER) && old_src && !fast_retry)
forward->forwardall = 1; forward->forwardall = 1;
else else
{ {
start = forward->sentto->arrayposn; start = forward->sentto->arrayposn;
if (option_bool(OPT_ORDER)) if (option_bool(OPT_ORDER) && !fast_retry)
{ {
/* In strict order mode, there must be a server later in the list /* In strict order mode, there must be a server later in the list
left to send to, otherwise without the forwardall mechanism, left to send to, otherwise without the forwardall mechanism,
@@ -636,7 +637,7 @@ int fast_retry(time_t now)
daemon->log_display_id = f->frec_src.log_id; daemon->log_display_id = f->frec_src.log_id;
forward_query(-1, NULL, NULL, 0, header, f->stash_len, ((char *) header) + udp_size, now, f, forward_query(-1, NULL, NULL, 0, header, f->stash_len, ((char *) header) + udp_size, now, f,
f->flags & FREC_AD_QUESTION, f->flags & FREC_DO_QUESTION); f->flags & FREC_AD_QUESTION, f->flags & FREC_DO_QUESTION, 1);
to_run = f->forward_delay = 2 * f->forward_delay; to_run = f->forward_delay = 2 * f->forward_delay;
} }
@@ -1202,7 +1203,7 @@ void reply_query(int fd, time_t now)
if (nn) if (nn)
{ {
forward_query(-1, NULL, NULL, 0, header, nn, ((char *) header) + udp_size, now, forward, forward_query(-1, NULL, NULL, 0, header, nn, ((char *) header) + udp_size, now, forward,
forward->flags & FREC_AD_QUESTION, forward->flags & FREC_DO_QUESTION); forward->flags & FREC_AD_QUESTION, forward->flags & FREC_DO_QUESTION, 0);
return; return;
} }
} }
@@ -1841,7 +1842,7 @@ void receive_query(struct listener *listen, time_t now)
} }
if (forward_query(fd, &source_addr, &dst_addr, if_index, if (forward_query(fd, &source_addr, &dst_addr, if_index,
header, (size_t)n, ((char *) header) + udp_size, now, NULL, ad_reqd, do_bit)) header, (size_t)n, ((char *) header) + udp_size, now, NULL, ad_reqd, do_bit, 0))
daemon->metrics[METRIC_DNS_QUERIES_FORWARDED]++; daemon->metrics[METRIC_DNS_QUERIES_FORWARDED]++;
else else
daemon->metrics[METRIC_DNS_LOCAL_ANSWERED]++; daemon->metrics[METRIC_DNS_LOCAL_ANSWERED]++;