move dnsmasq_diagnosis_warning() into FTL_dnsmasq_log()

Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>

Author: darkexplosiveqwx

src/database/message-table.c

@@ -1456,9 +1456,9 @@ void logg_rate_limit_message(const char *clientIP, const unsigned int rate_limit
 
 }
 
-void logg_warn_dnsmasq_message(char *message)
+void logg_warn_dnsmasq_message(const char *message)
 {
-	// Create message
+	// Create message (dnsmasq limits is message length to 1KiB to conform with RFC 3164; See MAX_MESSAGE in dnsmasq/log.c), account for our 'dnsmasq: ' prefix
 	char buf[2048];
 	format_dnsmasq_warn_message(buf, sizeof(buf), NULL, 0, message);
 

src/database/message-table.h

@@ -25,7 +25,7 @@ void logg_subnet_warning(const char *ip, const int matching_count, const char *m
 void log_hostname_warning(const char *ip, const char *name, const unsigned int pos);
 void logg_fatal_dnsmasq_message(const char *message);
 void logg_rate_limit_message(const char *clientIP, const unsigned int rate_limit_count);
-void logg_warn_dnsmasq_message(char *message);
+void logg_warn_dnsmasq_message(const char *message);
 void log_resource_shortage(const double load, const int nprocs, const int shmem, const int disk, const char *path, const char *msg);
 void logg_inaccessible_adlist(const int dbindex, const char *address);
 void log_certificate_domain_mismatch(const char *certfile, const char *domain);

src/dnsmasq/log.c

@@ -329,19 +329,6 @@ void my_syslog(int priority, const char *format, ...)
   va_end(ap);
   FTL_dnsmasq_log(buffer, priority, func, len > MAX_MESSAGE ? MAX_MESSAGE : len);
 
-  /* Pi-hole diagnosis system */
-  if(priority == LOG_WARNING)
-    {
-      char *message;
-      va_start(ap, format);
-      if(vasprintf(&message, format, ap))
-        {
-          dnsmasq_diagnosis_warning(message);
-          free(message);
-        }
-      va_end(ap);
-    }
-
   /* Pi-hole: FTL owns pihole.log.  Bypass dnsmasq's file-write path
      and syslog fallback entirely. */
   return;

src/dnsmasq_interface.c

@@ -4138,6 +4138,10 @@ void FTL_dnsmasq_log(const char *payload, const int priority, const char *func,
 
 	// Write to pihole.log via shared writer (FTL owns this file now)
 	FTL_write_dnsmasq_log(payload, func);
+
+	/* Pi-hole diagnosis system */
+	if(priority == LOG_WARNING)
+		dnsmasq_diagnosis_warning(payload);
 }
 
 static const char *check_dnsmasq_name(const char *name)

src/log.c

@@ -810,7 +810,7 @@ void print_FTL_version(void)
 }
 
 // Skip leading string if found
-static char *skipStr(const char *startstr, char *message)
+static const char *skipStr(const char *startstr, const char *message)
 {
 	const size_t startlen = strlen(startstr);
 	if(strncmp(startstr, message, startlen) == 0)
@@ -819,7 +819,7 @@ static char *skipStr(const char *startstr, char *message)
 		return message;
 }
 
-void dnsmasq_diagnosis_warning(char *message)
+void dnsmasq_diagnosis_warning(const char *message)
 {
 	// Crop away any existing initial "warning: "
 	logg_warn_dnsmasq_message(skipStr("warning: ", message));

src/log.h

@@ -58,7 +58,7 @@ const char *priostr(const int priority, const enum debug_flag flag)  __attribute
 const char *debugstr(const enum debug_flag flag) __attribute__((const));
 const char *get_ordinal_suffix(unsigned int number) __attribute__ ((const));
 void print_FTL_version(void);
-void dnsmasq_diagnosis_warning(char *message);
+void dnsmasq_diagnosis_warning(const char *message);
 
 // The actual logging routine can take extra options for specialized logging
 // The more general interfaces can be defined here as appropriate shortcuts