2018-05-12 14:37:33 +00:00
|
|
|
From e27825b0ef1e79ab05b1752c8c838cb43ad39d79 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
|
|
|
Date: Fri, 11 May 2018 17:20:47 +0100
|
2018-06-03 03:44:12 +00:00
|
|
|
Subject: [PATCH 08/17] Fix logging in previous.
|
2018-05-12 14:37:33 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
|
|
|
---
|
|
|
|
|
src/forward.c | 15 +++++++--------
|
|
|
|
|
1 file changed, 7 insertions(+), 8 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/src/forward.c
|
|
|
|
|
+++ b/src/forward.c
|
|
|
|
|
@@ -835,14 +835,6 @@ void reply_query(int fd, int family, tim
|
|
|
|
|
plen = forward->stash_len;
|
|
|
|
|
|
|
|
|
|
forward->forwardall = 2; /* only retry once */
|
|
|
|
|
-
|
|
|
|
|
- if (forward->sentto->addr.sa.sa_family == AF_INET)
|
|
|
|
|
- log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, "retry", (struct all_addr *)&forward->sentto->addr.in.sin_addr, "dnssec");
|
|
|
|
|
-#ifdef HAVE_IPV6
|
|
|
|
|
- else
|
|
|
|
|
- log_query(F_NOEXTRA | F_DNSSEC | F_IPV6, "retry", (struct all_addr *)&forward->sentto->addr.in6.sin6_addr, "dnssec");
|
|
|
|
|
-#endif
|
|
|
|
|
-
|
|
|
|
|
start = forward->sentto;
|
|
|
|
|
|
|
|
|
|
/* for non-domain specific servers, see if we can find another to try. */
|
|
|
|
|
@@ -886,6 +878,13 @@ void reply_query(int fd, int family, tim
|
|
|
|
|
&start->addr.sa,
|
|
|
|
|
sa_len(&start->addr))));
|
|
|
|
|
|
|
|
|
|
+ if (start->addr.sa.sa_family == AF_INET)
|
|
|
|
|
+ log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, "retry", (struct all_addr *)&start->addr.in.sin_addr, "dnssec");
|
|
|
|
|
+#ifdef HAVE_IPV6
|
|
|
|
|
+ else
|
|
|
|
|
+ log_query(F_NOEXTRA | F_DNSSEC | F_IPV6, "retry", (struct all_addr *)&start->addr.in6.sin6_addr, "dnssec");
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
