move logging from libknot to server

src/Makefile.am

@@ -127,14 +127,12 @@ nobase_libknot_la_HEADERS =				\
 	libknot/internal/base32hex.h		\
 	libknot/internal/base64.h		\
 	libknot/internal/binsearch.h		\
-	libknot/internal/debug.h		\
 	libknot/internal/endian.h		\
 	libknot/internal/errors.h		\
 	libknot/internal/getline.h		\
 	libknot/internal/heap.h			\
 	libknot/internal/hhash.h		\
 	libknot/internal/lists.h		\
-	libknot/internal/log.h			\
 	libknot/internal/macros.h		\
 	libknot/internal/mem.h			\
 	libknot/internal/mempattern.h		\
@@ -186,7 +184,6 @@ libknot_la_SOURCES =				\
 	libknot/internal/heap.c			\
 	libknot/internal/hhash.c		\
 	libknot/internal/lists.c		\
-	libknot/internal/log.c			\
 	libknot/internal/mem.c			\
 	libknot/internal/mempattern.c		\
 	libknot/internal/mempool.c		\
@@ -263,6 +260,8 @@ libknotd_la_SOURCES =				\
 	knot/common/evsched.h			\
 	knot/common/fdset.c			\
 	knot/common/fdset.h			\
+	knot/common/log.c			\
+	knot/common/log.h			\
 	knot/common/ref.c			\
 	knot/common/ref.h			\
 	knot/common/time.h			\

src/knot/common/debug.h

@@ -38,9 +38,464 @@
   #define KNOTD_SEMCHECK_DEBUG
 #endif
 
-#include "libknot/internal/log.h"
+#include <stdint.h>
+#include <stdio.h>
+
+#include "knot/common/log.h"
 #include "libknot/internal/print.h"
 
+/*
+ * Debug macros
+ */
+#ifdef KNOT_ZONES_DEBUG
+  #define KNOT_ZONE_DEBUG
+  #define KNOT_ZONEDIFF_DEBUG
+#endif
+
+#ifdef KNOT_NS_DEBUG
+  #define KNOT_EDNS_DEBUG
+#endif
+
+#ifdef KNOT_PACKET_DEBUG
+  #define KNOT_RESPONSE_DEBUG
+#endif
+
+#ifdef KNOT_RR_DEBUG
+  #define KNOT_RRSET_DEBUG
+#endif
+
+#ifdef KNOT_XFR_DEBUG
+  #define KNOT_TSIG_DEBUG
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_NS_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_ns(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_ns_hex(data, len)  hex_log((data), (len))
+#define dbg_ns_exec(cmds) do { cmds } while (0)
+#else
+#define dbg_ns(msg...)
+#define dbg_ns_hex(data, len)
+#define dbg_ns_exec(cmds)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_ns_verb(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_ns_hex_verb(data, len) hex_log((data), (len))
+#define dbg_ns_exec_verb(cmds) do { cmds } while (0)
+#else
+#define dbg_ns_verb(msg...)
+#define dbg_ns_hex_verb(data, len)
+#define dbg_ns_exec_verb(cmds)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_ns_detail(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_ns_hex_detail(data, len)  hex_log((data), (len))
+#define dbg_ns_exec_detail(cmds) do { cmds } while (0)
+#else
+#define dbg_ns_detail(msg...)
+#define dbg_ns_hex_detail(data, len)
+#define dbg_ns_exec_detail(cmds)
+#endif
+
+/* No messages. */
+#else
+#define dbg_ns(msg...)
+#define dbg_ns_hex(data, len)
+#define dbg_ns_exec(cmds)
+#define dbg_ns_verb(msg...)
+#define dbg_ns_hex_verb(data, len)
+#define dbg_ns_exec_verb(cmds)
+#define dbg_ns_detail(msg...)
+#define dbg_ns_hex_detail(data, len)
+#define dbg_ns_exec_detail(cmds)
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_ZONE_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_zone(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_zone_hex(data, len)  hex_log((data), (len))
+#define dbg_zone_exec(cmds) do { cmds } while (0)
+#else
+#define dbg_zone(msg...)
+#define dbg_zone_hex(data, len)
+#define dbg_zone_exec(cmds)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_zone_verb(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_zone_hex_verb(data, len)  hex_log((data), (len))
+#define dbg_zone_exec_verb(cmds) do { cmds } while (0)
+#else
+#define dbg_zone_verb(msg...)
+#define dbg_zone_hex_verb(data, len)
+#define dbg_zone_exec_verb(cmds)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_zone_detail(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_zone_hex_detail(data, len)  hex_log((data), (len))
+#define dbg_zone_exec_detail(cmds) do { cmds } while (0)
+#else
+#define dbg_zone_detail(msg...)
+#define dbg_zone_hex_detail(data, len)
+#define dbg_zone_exec_detail(cmds)
+#endif
+
+/* No messages. */
+#else
+#define dbg_zone(msg...)
+#define dbg_zone_hex(data, len)
+#define dbg_zone_exec(cmds)
+#define dbg_zone_verb(msg...)
+#define dbg_zone_hex_verb(data, len)
+#define dbg_zone_exec_verb(cmds)
+#define dbg_zone_detail(msg...)
+#define dbg_zone_hex_detail(data, len)
+#define dbg_zone_exec_detail(cmds)
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_ZONEDIFF_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_zonediff(msg...) fprintf(stderr, msg)
+#define dbg_zonediff_hex(data, len)  hex_print((data), (len))
+#else
+#define dbg_zonediff(msg...)
+#define dbg_zonediff_hex(data, len)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_zonediff_verb(msg...) fprintf(stderr, msg)
+#define dbg_zonediff_hex_verb(data, len)  hex_print((data), (len))
+#else
+#define dbg_zonediff_verb(msg...)
+#define dbg_zonediff_hex_verb(data, len)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_zonediff_detail(msg...) fprintf(stderr, msg)
+#define dbg_zonediff_hex_detail(data, len)  hex_print((data), (len))
+#define dbg_zonediff_exec_detail(cmds) do { cmds } while (0)
+#else
+#define dbg_zonediff_detail(msg...)
+#define dbg_zonediff_hex_detail(data, len)
+#define dbg_zonediff_exec_detail(cmds)
+#endif
+
+/* No messages. */
+#else
+#define dbg_zonediff(msg...)
+#define dbg_zonediff_hex(data, len)
+#define dbg_zonediff_verb(msg...)
+#define dbg_zonediff_hex_verb(data, len)
+#define dbg_zonediff_detail(msg...)
+#define dbg_zonediff_hex_detail(data, len)
+#define dbg_zonediff_exec_detail(cmds)
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_RESPONSE_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_response(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_response_hex(data, len)  hex_log((data), (len))
+#define dbg_response_exec(cmds) do { cmds } while (0)
+#else
+#define dbg_response(msg...)
+#define dbg_response_hex(data, len)
+#define dbg_response_exec(cmds)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_response_verb(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_response_hex_verb(data, len)  hex_log((data), (len))
+#define dbg_response_exec_verb(cmds) do { cmds } while (0)
+#else
+#define dbg_response_verb(msg...)
+#define dbg_response_hex_verb(data, len)
+#define dbg_response_exec_verb(cmds)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_response_detail(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_response_hex_detail(data, len)  hex_log((data), (len))
+#define dbg_response_exec_detail(cmds) do { cmds } while (0)
+#else
+#define dbg_response_detail(msg...)
+#define dbg_response_hex_detail(data, len)
+#define dbg_response_exec_detail(cmds)
+#endif
+
+/* No messages. */
+#else
+#define dbg_response(msg...)
+#define dbg_response_hex(data, len)
+#define dbg_response_exec(cmds)
+#define dbg_response_verb(msg...)
+#define dbg_response_hex_verb(data, len)
+#define dbg_response_exec_verb(cmds)
+#define dbg_response_detail(msg...)
+#define dbg_response_hex_detail(data, len)
+#define dbg_response_exec_detail(cmds)
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_PACKET_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_packet(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_packet_hex(data, len)  hex_log((data), (len))
+#define dbg_packet_exec(cmds) do { cmds } while (0)
+#else
+#define dbg_packet(msg...)
+#define dbg_packet_hex(data, len)
+#define dbg_packet_exec(cmds)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_packet_verb(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_packet_hex_verb(data, len)  hex_log((data), (len))
+#define dbg_packet_exec_verb(cmds) do { cmds } while (0)
+#else
+#define dbg_packet_verb(msg...)
+#define dbg_packet_hex_verb(data, len)
+#define dbg_packet_exec_verb(cmds)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_packet_detail(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_packet_hex_detail(data, len)  hex_log((data), (len))
+#define dbg_packet_exec_detail(cmds) do { cmds } while (0)
+#else
+#define dbg_packet_detail(msg...)
+#define dbg_packet_hex_detail(data, len)
+#define dbg_packet_exec_detail(cmds)
+#endif
+
+/* No messages. */
+#else
+#define dbg_packet(msg...)
+#define dbg_packet_hex(data, len)
+#define dbg_packet_exec(cmds)
+#define dbg_packet_verb(msg...)
+#define dbg_packet_hex_verb(data, len)
+#define dbg_packet_exec_verb(cmds)
+#define dbg_packet_detail(msg...)
+#define dbg_packet_hex_detail(data, len)
+#define dbg_packet_exec_detail(cmds)
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_EDNS_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_edns(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_edns_hex(data, len)  hex_log((data), (len))
+#else
+#define dbg_edns(msg...)
+#define dbg_edns_hex(data, len)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_edns_verb(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_edns_hex_verb(data, len)  hex_log((data), (len))
+#else
+#define dbg_edns_verb(msg...)
+#define dbg_edns_hex_verb(data, len)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_edns_detail(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_edns_hex_detail(data, len)  hex_log((data), (len))
+#else
+#define dbg_edns_detail(msg...)
+#define dbg_edns_hex_detail(data, len)
+#endif
+
+/* No messages. */
+#else
+#define dbg_edns(msg...)
+#define dbg_edns_hex(data, len)
+#define dbg_edns_verb(msg...)
+#define dbg_edns_hex_verb(data, len)
+#define dbg_edns_detail(msg...)
+#define dbg_edns_hex_detail(data, len)
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_TSIG_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_tsig(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_tsig_hex(data, len)  hex_log((data), (len))
+#else
+#define dbg_tsig(msg...)
+#define dbg_tsig_hex(data, len)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_tsig_verb(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_tsig_hex_verb(data, len)  hex_log((data), (len))
+#else
+#define dbg_tsig_verb(msg...)
+#define dbg_tsig_hex_verb(data, len)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_tsig_detail(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_tsig_hex_detail(data, len)  hex_log((data), (len))
+#else
+#define dbg_tsig_detail(msg...)
+#define dbg_tsig_hex_detail(data, len)
+#endif
+
+/* No messages. */
+#else
+#define dbg_tsig(msg...)
+#define dbg_tsig_hex(data, len)
+#define dbg_tsig_verb(msg...)
+#define dbg_tsig_hex_verb(data, len)
+#define dbg_tsig_detail(msg...)
+#define dbg_tsig_hex_detail(data, len)
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_RRSET_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_rrset(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_rrset_hex(data, len)  hex_log((data), (len))
+#define dbg_rrset_exec(cmds) do { cmds } while (0)
+#else
+#define dbg_rrset(msg...)
+#define dbg_rrset_hex(data, len)
+#define dbg_rrset_exec(cmds)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_rrset_verb(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_rrset_hex_verb(data, len)  hex_log((data), (len))
+#define dbg_rrset_exec_verb(cmds) do { cmds } while (0)
+#else
+#define dbg_rrset_verb(msg...)
+#define dbg_rrset_hex_verb(data, len)
+#define dbg_rrset_exec_verb(cmds)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_rrset_detail(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_rrset_hex_detail(data, len)  hex_log((data), (len))
+#define dbg_rrset_exec_detail(cmds) do { cmds } while (0)
+#else
+#define dbg_rrset_detail(msg...)
+#define dbg_rrset_hex_detail(data, len)
+#define dbg_rrset_exec_detail(cmds)
+#endif
+
+/* No messages. */
+#else
+#define dbg_rrset(msg...)
+#define dbg_rrset_hex(data, len)
+#define dbg_rrset_exec(cmds)
+#define dbg_rrset_verb(msg...)
+#define dbg_rrset_hex_verb(data, len)
+#define dbg_rrset_exec_verb(cmds)
+#define dbg_rrset_detail(msg...)
+#define dbg_rrset_hex_detail(data, len)
+#define dbg_rrset_exec_detail(cmds)
+#endif
+
+/******************************************************************************/
+
+#ifdef KNOT_DNSSEC_DEBUG
+
+/* Brief messages. */
+#ifdef DEBUG_ENABLE_BRIEF
+#define dbg_dnssec(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_dnssec_hex(data, len)  hex_log((data), (len))
+#define dbg_dnssec_exec(cmds) do { cmds } while (0)
+#else
+#define dbg_dnssec(msg...)
+#define dbg_dnssec_hex(data, len)
+#define dbg_dnssec_exec(cmds)
+#endif
+
+/* Verbose messages. */
+#ifdef DEBUG_ENABLE_VERBOSE
+#define dbg_dnssec_verb(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_dnssec_hex_verb(data, len) hex_log((data), (len))
+#define dbg_dnssec_exec_verb(cmds) do { cmds } while (0)
+#else
+#define dbg_dnssec_verb(msg...)
+#define dbg_dnssec_hex_verb(data, len)
+#define dbg_dnssec_exec_verb(cmds)
+#endif
+
+/* Detail messages. */
+#ifdef DEBUG_ENABLE_DETAILS
+#define dbg_dnssec_detail(msg...) log_msg(LOG_DEBUG, msg)
+#define dbg_dnssec_hex_detail(data, len)  hex_log((data), (len))
+#define dbg_dnssec_exec_detail(cmds) do { cmds } while (0)
+#else
+#define dbg_dnssec_detail(msg...)
+#define dbg_dnssec_hex_detail(data, len)
+#define dbg_dnssec_exec_detail(cmds)
+#endif
+
+/* No messages. */
+#else
+#define dbg_dnssec(msg...)
+#define dbg_dnssec_hex(data, len)
+#define dbg_dnssec_exec(cmds)
+#define dbg_dnssec_verb(msg...)
+#define dbg_dnssec_hex_verb(data, len)
+#define dbg_dnssec_exec_verb(cmds)
+#define dbg_dnssec_detail(msg...)
+#define dbg_dnssec_hex_detail(data, len)
+#define dbg_dnssec_exec_detail(cmds)
+#endif
+
+/******************************************************************************/
+
 /******************************************************************************/
 
 #ifdef KNOTD_SERVER_DEBUG

src/libknot/internal/log.c → src/knot/common/log.c

@@ -28,11 +28,11 @@
 #include <systemd/sd-journal.h>
 #endif
 
-#include "libknot/internal/log.h"
+#include "knot/common/log.h"
+#include "libknot/errcode.h"
 #include "libknot/internal/lists.h"
-#include "libknot/internal/strlcpy.h"
 #include "libknot/internal/macros.h"
-#include "libknot/errcode.h"
+#include "libknot/internal/strlcpy.h"
 
 /* Single log message buffer length (one line). */
 #define LOG_BUFLEN 512

src/knot/conf/cf-lex.l

@@ -37,7 +37,7 @@
 #include "knot/conf/conf.h"
 #include "knot/conf/includes.h"
 #include "knot/conf/extra.h"
-#include "libknot/internal/log.h"
+#include "knot/common/log.h"
 #include "libknotd_la-cf-parse.h" /* Automake generated header. */
 
 /* Imported symbols. */

src/knot/conf/conf.h

@@ -39,7 +39,7 @@
 #include "libknot/dnssec/policy.h"
 #include "libknot/internal/lists.h"
 #include "libknot/internal/namedb/namedb.h"
-#include "libknot/internal/log.h"
+#include "knot/common/log.h"
 #include "knot/updates/acl.h"
 #include "libknot/internal/sockaddr.h"
 #include "libknot/internal/trie/hat-trie.h"

src/knot/ctl/remote.c

@@ -18,6 +18,7 @@
 #include <sys/stat.h>
 #include "knot/common/debug.h"
 #include "knot/common/fdset.h"
+#include "knot/common/log.h"
 #include "knot/conf/conf.h"
 #include "knot/ctl/remote.h"
 #include "knot/dnssec/zone-sign.h"
@@ -25,7 +26,6 @@
 #include "knot/server/tcp-handler.h"
 #include "knot/zone/timers.h"
 #include "libknot/libknot.h"
-#include "libknot/internal/log.h"
 #include "libknot/internal/macros.h"
 #include "libknot/internal/mem.h"
 #include "libknot/internal/net.h"

src/knot/dnssec/nsec-chain.c

@@ -17,7 +17,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "knot/dnssec/nsec-chain.h"
 #include "knot/dnssec/zone-sign.h"
 #include "libknot/dnssec/rrset-sign.h"

src/knot/dnssec/zone-events.c

@@ -24,7 +24,7 @@
 #include "knot/dnssec/zone-keys.h"
 #include "knot/dnssec/zone-nsec.h"
 #include "knot/dnssec/zone-sign.h"
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "knot/zone/zone.h"
 
 static int init_dnssec_structs(const zone_contents_t *zone,

src/knot/dnssec/zone-keys.c

@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "libknot/internal/mem.h"
 #include "libknot/internal/macros.h"
 #include "libknot/errcode.h"

src/knot/dnssec/zone-nsec.c

@@ -21,7 +21,7 @@
 #include <limits.h>
 
 #include "libknot/internal/base32hex.h"
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "libknot/descriptor.h"
 #include "libknot/dnssec/bitmap.h"
 #include "libknot/internal/utils.h"

src/knot/dnssec/zone-sign.c

@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "libknot/descriptor.h"
 #include "libknot/errcode.h"
 #include "libknot/internal/trie/hat-trie.h"

src/knot/nameserver/axfr.c

@@ -20,7 +20,7 @@
 #include "knot/nameserver/process_answer.h"
 #include "knot/updates/apply.h"
 #include "knot/zone/zonefile.h"
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "libknot/descriptor.h"
 #include "libknot/internal/lists.h"
 

src/knot/nameserver/internet.c

@@ -14,7 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "libknot/descriptor.h"
 #include "libknot/rrtype/rdname.h"
 #include "libknot/rrtype/soa.h"

src/knot/nameserver/ixfr.c

@@ -20,7 +20,7 @@
 #include "knot/nameserver/process_query.h"
 #include "knot/nameserver/process_answer.h"
 #include "knot/updates/apply.h"
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "libknot/descriptor.h"
 #include "libknot/internal/utils.h"
 #include "libknot/rrtype/soa.h"

src/knot/nameserver/notify.c

@@ -31,7 +31,7 @@
 #include "knot/common/debug.h"
 #include "knot/server/server.h"
 #include "knot/nameserver/internet.h"
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "knot/nameserver/process_query.h"
 #include "knot/nameserver/tsig_ctx.h"
 #include "knot/nameserver/process_answer.h"

src/knot/nameserver/nsec_proofs.c

@@ -3,7 +3,7 @@
 #include "knot/nameserver/internet.h"
 #include "knot/dnssec/zone-nsec.h"
 
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 
 #define DNSSEC_ENABLED 1
 

src/knot/nameserver/process_query.c

@@ -16,7 +16,7 @@
 #include "libknot/rrtype/opt.h"
 #include "libknot/tsig-op.h"
 #include "libknot/descriptor.h"
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "libknot/internal/macros.h"
 
 /*! \brief Accessor to query-specific data. */

src/knot/nameserver/update.c

@@ -19,7 +19,7 @@
 #include "knot/nameserver/process_query.h"
 #include "knot/updates/apply.h"
 #include "knot/dnssec/zone-sign.h"
-#include "libknot/internal/debug.h"
+#include "knot/common/debug.h"
 #include "libknot/internal/macros.h"
 #include "knot/dnssec/zone-events.h"
 #include "knot/updates/ddns.h"

src/knot/server/dthreads.c

@@ -30,9 +30,9 @@
 #endif /* HAVE_PTHREAD_NP_H */
 
 #include "knot/common/debug.h"
+#include "knot/common/log.h"
 #include "knot/server/dthreads.h"
 #include "libknot/libknot.h"
-#include "libknot/internal/log.h"
 
 /* BSD cpu set compatibility. */
 #if defined(HAVE_CPUSET_BSD)