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

DOn't churn a query though the blockdata store twice when forwarding it.

Browse Source
This commit is contained in:
Simon Kelley
2024-11-01 16:50:15 +00:00
parent 3b6df06fb8
commit 5d6399b71c
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/forward.c
View File

@@ -168,7 +168,8 @@ 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, int fast_retry) struct frec *forward, int ad_reqd, int do_bit, int fast_retry,
struct blockdata *saved_question)
{ {
unsigned int flags = 0; unsigned int flags = 0;
unsigned int fwd_flags = 0; unsigned int fwd_flags = 0;
@@ -184,6 +185,9 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
unsigned char *pheader; unsigned char *pheader;
int ede = EDE_UNSET; int ede = EDE_UNSET;
(void)do_bit; (void)do_bit;
if (saved_question)
blockdata_retrieve(saved_question, plen, header);
if (header->hb4 & HB4_CD) if (header->hb4 & HB4_CD)
fwd_flags |= FREC_CHECKING_DISABLED; fwd_flags |= FREC_CHECKING_DISABLED;
@@ -340,7 +344,13 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
} }
/* Keep copy of query. */ /* Keep copy of query. */
forward->stash = blockdata_alloc((char *)header, plen); if (saved_question)
{
forward->stash = saved_question;
saved_question = NULL; /* don't free */
}
else
forward->stash = blockdata_alloc((char *)header, plen);
forward->stash_len = plen; forward->stash_len = plen;
forward->frec_src.log_id = daemon->log_id; forward->frec_src.log_id = daemon->log_id;
@@ -414,7 +424,10 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
/* Find suitable servers: should never fail. */ /* Find suitable servers: should never fail. */
if (!filter_servers(forward->sentto->arrayposn, F_DNSSECOK, &first, &last)) if (!filter_servers(forward->sentto->arrayposn, F_DNSSECOK, &first, &last))
return 0; {
blockdata_free(saved_question);
return 0;
}
is_dnssec = 1; is_dnssec = 1;
forward->forwardall = 1; forward->forwardall = 1;
@@ -552,6 +565,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
if (forwarded || is_dnssec) if (forwarded || is_dnssec)
{ {
forward->forward_timestamp = dnsmasq_milliseconds(); forward->forward_timestamp = dnsmasq_milliseconds();
blockdata_free(saved_question);
return 1; return 1;
} }
@@ -564,7 +578,10 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
if (udpfd != -1) if (udpfd != -1)
{ {
if (!(plen = make_local_answer(flags, gotname, plen, header, daemon->namebuff, limit, first, last, ede))) if (!(plen = make_local_answer(flags, gotname, plen, header, daemon->namebuff, limit, first, last, ede)))
return 0; {
blockdata_free(saved_question);
return 0;
}
if (oph) if (oph)
{ {
@@ -589,6 +606,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
send_from(udpfd, option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND), (char *)header, plen, udpaddr, dst_addr, dst_iface); send_from(udpfd, option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND), (char *)header, plen, udpaddr, dst_addr, dst_iface);
} }
blockdata_free(saved_question);
return 0; return 0;
} }
@@ -635,7 +653,7 @@ int fast_retry(time_t now)
daemon->log_source_addr = NULL; daemon->log_source_addr = NULL;
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, 1); f->flags & FREC_AD_QUESTION, f->flags & FREC_DO_QUESTION, 1, NULL);
to_run = f->forward_delay = 2 * f->forward_delay; to_run = f->forward_delay = 2 * f->forward_delay;
} }
@@ -1236,7 +1254,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, 0); forward->flags & FREC_AD_QUESTION, forward->flags & FREC_DO_QUESTION, 0, NULL);
return; return;
} }
} }
@@ -1894,16 +1912,14 @@ void receive_query(struct listener *listen, time_t now)
{ {
if (m == 0) if (m == 0)
{ {
blockdata_retrieve(saved_question, (size_t)n, header); if (forward_query(fd, &source_addr, &dst_addr, if_index, header, (size_t)n,
((char *) header) + udp_size, now, NULL, ad_reqd, do_bit, 0, saved_question))
if (forward_query(fd, &source_addr, &dst_addr, if_index,
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]++;
} }
else
blockdata_free(saved_question); blockdata_free(saved_question);
} }
} }
} }