From c5d93825bd37ad11936c26970cb95822ad8d5cfe Mon Sep 17 00:00:00 2001
From: buffermet <29265684+buffermet@users.noreply.github.com>
Date: Wed, 9 Oct 2024 20:07:22 +0200
Subject: [PATCH] Catch RR nil value, improve debug logs readability.

---
 modules/dns_proxy/dns_proxy_base_filters.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/dns_proxy/dns_proxy_base_filters.go b/modules/dns_proxy/dns_proxy_base_filters.go
index ad12db76..d66b0ad1 100644
--- a/modules/dns_proxy/dns_proxy_base_filters.go
+++ b/modules/dns_proxy/dns_proxy_base_filters.go
@@ -17,7 +17,9 @@ func questionsToStrings(qs []dns.Question) []string {
 func recordsToStrings(rrs []dns.RR) []string {
 	records := []string{}
 	for _, rr := range rrs {
-		records = append(records, tabsToSpaces(rr.String()))
+		if rr != nil {
+			records = append(records, tabsToSpaces(rr.String()))
+		}
 	}
 	return records
 }
@@ -57,7 +59,7 @@ func (p *DNSProxy) logResponseAction(m *dns.Msg, clientIP string) {
 }
 
 func (p *DNSProxy) onRequestFilter(query *dns.Msg, clientIP string) (req, res *dns.Msg) {
-	p.Debug("< %s %s",
+	p.Debug("< %s q[%s]",
 		clientIP,
 		strings.Join(questionsToStrings(query.Question), ","))
 
@@ -89,7 +91,7 @@ func (p *DNSProxy) onResponseFilter(req, res *dns.Msg, clientIP string) *dns.Msg
 		return nil
 	}
 
-	p.Debug("> %s %s [%s] [%s] [%s]",
+	p.Debug("> %s q[%s] a[%s] e[%s] n[%s]",
 		clientIP,
 		strings.Join(questionsToStrings(res.Question), ","),
 		strings.Join(recordsToStrings(res.Answer), ","),