Stop including dnstap headers from <dns/dnstap.h>

The <fstrm.h> and <protobuf-c/protobuf-c.h> headers are only directly
included where used and we stopped exposing those headers from libdns
headers.

diff --git a/bin/named/main.c b/bin/named/main.c
index 9836de9d7fb6e86bffb9333d65634d496547d6d8..32cf070a7fafe608319d13af8dd6cd1a44d91115 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -18,6 +18,10 @@
 #include <string.h>
 #include <uv.h>
 
+#ifdef HAVE_DNSTAP
+#include <protobuf-c/protobuf-c.h>
+#endif
+
 #include <isc/app.h>
 #include <isc/backtrace.h>
 #include <isc/commandline.h>

diff --git a/bin/named/server.c b/bin/named/server.c
index fa488025f981f8065df7aef52f48a868072f32e3..d8e8d67ded0d1e7e2d78a3d6ee2ec3f6121852f9 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -20,6 +20,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#ifdef HAVE_DNSTAP
+#include <fstrm.h>
+#endif
+
 #include <isc/aes.h>
 #include <isc/app.h>
 #include <isc/base64.h>

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index f8e937d6d3568a381a7afbf69f6faa964a8896e2..b7b2350b579b2323ef12ca09ebebb581e07b66f0 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,6 +15,10 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#ifdef HAVE_DNSTAP
+#include <fstrm.h>
+#endif
+
 #include <isc/aes.h>
 #include <isc/base64.h>
 #include <isc/buffer.h>

diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
index 00f69b2ea86097dffe31659c892534ef53c66104..fdebb266bbe191e07f8b4ea2b2878b8fafd7ba24 100644 (file)
--- a/lib/dns/dnstap.c
+++ b/lib/dns/dnstap.c
@@ -47,12 +47,11 @@
 #error DNSTAP not configured.
 #endif /* HAVE_DNSTAP */
 
+#include <fstrm.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include <protobuf-c/protobuf-c.h>
-
 #include <isc/buffer.h>
 #include <isc/file.h>
 #include <isc/log.h>

diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h
index 9a13525bf3191368efc351bdb61c6f2db443eb92..14e042c3c61a3cac002875b605090685d655e829 100644 (file)
--- a/lib/dns/include/dns/dnstap.h
+++ b/lib/dns/include/dns/dnstap.h
@@ -26,13 +26,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#ifdef HAVE_DNSTAP
-#include <fstrm.h>
-
-#include <protobuf-c/protobuf-c.h>
-#else  /* ifdef HAVE_DNSTAP */
 struct fstrm_iothr_options;
-#endif /* HAVE_DNSTAP */
 
 #include <isc/log.h>
 #include <isc/refcount.h>

diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c
index 6fd153b6f31f0eca6418ae718240869d12f50dbc..b3858dd5062b3512009d635d90ec5c42db558459 100644 (file)
--- a/lib/dns/tests/dnstap_test.c
+++ b/lib/dns/tests/dnstap_test.c
@@ -37,6 +37,8 @@
 
 #ifdef HAVE_DNSTAP
 
+#include <fstrm.h>
+
 #include <protobuf-c/protobuf-c.h>
 
 #define TAPFILE "testdata/dnstap/dnstap.file"