From 56610126e76ec71ac84585b59700fefcec751f92 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 16 Jun 2021 22:20:57 +0200
Subject: [PATCH] Port more verbose DNSSEC logging to FTL' dnsmasq debug mode

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 .vscode/settings.json | 3 ++-
 src/dnsmasq/cache.c   | 8 +++++---
 test/run.sh           | 5 +++++
 test/test_suite.bats  | 6 ++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index f6d854b8..5931241c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -25,6 +25,7 @@
         "files.associations": {
                 "config.h": "c",
                 "stdint.h": "c",
-                "stdint-gcc.h": "c"
+                "stdint-gcc.h": "c",
+                "dnsmasq.h": "c"
         }
 }
\ No newline at end of file
diff --git a/src/dnsmasq/cache.c b/src/dnsmasq/cache.c
index e6b021e0..b611013b 100644
--- a/src/dnsmasq/cache.c
+++ b/src/dnsmasq/cache.c
@@ -1978,11 +1978,13 @@ if(debug_dnsmasq_lines != 0)
 {
   if (option_bool(OPT_EXTRALOG))
     {
-      int port = prettyprint_addr(daemon->log_source_addr, daemon->addrbuff2);
       if (flags & F_NOEXTRA)
-	my_syslog(LOG_INFO, "* %s/%u %s %s %s %s (%s:%d)", daemon->addrbuff2, port, source, name, verb, dest, file, line);
+	my_syslog(LOG_INFO, "%u %s %s %s %s (%s:%d)", daemon->log_display_id, source, name, verb, dest, file, line);
       else
-	my_syslog(LOG_INFO, "%u %s/%u %s %s %s %s (%s:%d)", daemon->log_display_id, daemon->addrbuff2, port, source, name, verb, dest, file, line);
+	{
+	   int port = prettyprint_addr(daemon->log_source_addr, daemon->addrbuff2);
+	   my_syslog(LOG_INFO, "%u %s/%u %s %s %s %s (%s:%d)", daemon->log_display_id, daemon->addrbuff2, port, source, name, verb, dest, file, line);
+	}
     }
   else
     my_syslog(LOG_INFO, "%s %s %s %s (%s:%d)", source, name, verb, dest, file, line);
diff --git a/test/run.sh b/test/run.sh
index b7fd9823..d3f57e6d 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -94,7 +94,12 @@ test/libs/bats/bin/bats "test/test_suite.bats"
 RET=$?
 
 if [[ $RET != 0 ]]; then
+  echo -n "pihole.log: "
+  openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /var/log/pihole.log
+  echo ""
+  echo -n "pihole-FTL.log: "
   openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /var/log/pihole-FTL.log
+  echo ""
 fi
 
 # Kill pihole-FTL after having completed tests
diff --git a/test/test_suite.bats b/test/test_suite.bats
index 8c9e76bc..8a4f26d0 100644
--- a/test/test_suite.bats
+++ b/test/test_suite.bats
@@ -495,18 +495,24 @@
 }
 
 @test "No WARNING messages in pihole-FTL.log (besides known capability issues)" {
+  run bash -c 'grep "WARNING" /var/log/pihole-FTL.log'
+  printf "%s\n" "${lines[@]}"
   run bash -c 'grep "WARNING" /var/log/pihole-FTL.log | grep -c -v -E "CAP_NET_ADMIN|CAP_NET_RAW|CAP_SYS_NICE"'
   printf "%s\n" "${lines[@]}"
   [[ ${lines[0]} == "0" ]]
 }
 
 @test "No ERROR messages in pihole-FTL.log" {
+  run bash -c 'grep "ERROR" /var/log/pihole-FTL.log'
+  printf "%s\n" "${lines[@]}"
   run bash -c 'grep -c "ERROR" /var/log/pihole-FTL.log'
   printf "%s\n" "${lines[@]}"
   [[ ${lines[0]} == "0" ]]
 }
 
 @test "No FATAL messages in pihole-FTL.log (besides error due to starting FTL more than once)" {
+  run bash -c 'grep "FATAL" /var/log/pihole-FTL.log'
+  printf "%s\n" "${lines[@]}"
   run bash -c 'grep "FATAL:" /var/log/pihole-FTL.log | grep -c -v "FATAL: create_shm(): Failed to create shared memory object \"FTL-lock\": File exists"'
   printf "%s\n" "${lines[@]}"
   [[ ${lines[0]} == "0" ]]