Fix query-combining for queries with class other than IN.

Along the way, use of extract_request() and extract_name() got further
refined.
This commit is contained in:
Simon Kelley
2025-02-09 22:03:22 +00:00
parent 0ccbdf8087
commit 7c1212e3d1
4 changed files with 77 additions and 71 deletions

View File

@@ -2141,7 +2141,7 @@ static void do_tcp_connection(struct listener *listener, time_t now, int slot)
cache_recv_insert() calls pop_and_retry_query() after the result
arrives via the pipe to the parent. */
int swap_to_tcp(struct frec *forward, time_t now, int status, struct dns_header *header,
ssize_t *plen, int class, struct server *server, int *keycount, int *validatecount)
ssize_t *plen, char *name, int class, struct server *server, int *keycount, int *validatecount)
{
struct server *s;
@@ -2215,8 +2215,7 @@ int swap_to_tcp(struct frec *forward, time_t now, int status, struct dns_header
}
}
status = tcp_from_udp(now, status, header, plen, class, daemon->namebuff, daemon->keyname,
server, keycount, validatecount);
status = tcp_from_udp(now, status, header, plen, class, name, server, keycount, validatecount);
/* close upstream connections. */
for (s = daemon->servers; s; s = s->next)