update dlz_minimal.h

the addition of support for ECS client information in DLZ
modules omitted some necessary changes to build modules
in contrib.

diff --git a/contrib/dlz/modules/include/dlz_minimal.h b/contrib/dlz/modules/include/dlz_minimal.h
index 0225e7ad31df1ce6fa860ff47d30b5c6782a6416..24ef250059ff7e77976d579211ac8f5d3807f338 100644 (file)
--- a/contrib/dlz/modules/include/dlz_minimal.h
+++ b/contrib/dlz/modules/include/dlz_minimal.h
@@ -28,8 +28,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <dns/ecs.h>
-
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <netinet/in.h>
@@ -37,7 +35,8 @@
 #include <sys/types.h>
 #include <sys/un.h>
 
-typedef uint32_t dns_ttl_t;
+typedef unsigned int isc_result_t;
+typedef uint32_t     dns_ttl_t;
 
 /*
  * Define DLZ_DLOPEN_VERSION to different values to use older versions
@@ -89,6 +88,8 @@ typedef uint32_t dns_ttl_t;
 /* opaque structures */
 typedef void *dns_sdlzlookup_t;
 typedef void *dns_sdlzallnodes_t;
+typedef void *dns_view_t;
+typedef void *dns_dlzdb_t;
 
 #if DLZ_DLOPEN_VERSION > 1
 /*
@@ -106,6 +107,22 @@ typedef struct isc_sockaddr {
        void         *link;
 } isc_sockaddr_t;
 
+typedef struct isc_netaddr {
+       unsigned int family;
+       union {
+               struct in_addr  in;
+               struct in6_addr in6;
+               char            un[sizeof(((struct sockaddr_un *)0)->sun_path)];
+       } type;
+       uint32_t zone;
+} isc_netaddr_t;
+
+typedef struct dns_ecs {
+       isc_netaddr_t addr;
+       uint8_t       source;
+       uint8_t       scope;
+} dns_ecs_t;
+
 #define DNS_CLIENTINFO_VERSION 3
 typedef struct dns_clientinfo {
        uint16_t  version;
@@ -126,7 +143,6 @@ typedef struct dns_clientinfomethods {
        uint16_t                  version;
        uint16_t                  age;
        dns_clientinfo_sourceip_t sourceip;
-       dns_clientinfo_version_t  dbversion;
 } dns_clientinfomethods_t;
 #endif /* DLZ_DLOPEN_VERSION > 1 */
 

diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h
index 11965038384397e9d6c099805ed5aeffa48586d6..d55739d5fb3c2ad39a692c84c8459c85bab37bf4 100644 (file)
--- a/lib/dns/include/dns/clientinfo.h
+++ b/lib/dns/include/dns/clientinfo.h
@@ -51,6 +51,10 @@ ISC_LANG_BEGINDECLS
 *****/
 
 #define DNS_CLIENTINFO_VERSION 3
+/*
+ * Any updates to this structure should also be applied in
+ * contrib/modules/dlz/dlz_minmal.h.
+ */
 typedef struct dns_clientinfo {
        uint16_t  version;
        void     *data;
@@ -64,6 +68,10 @@ typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client,
 #define DNS_CLIENTINFOMETHODS_VERSION 2
 #define DNS_CLIENTINFOMETHODS_AGE     1
 
+/*
+ * Any updates to this structure should also be applied in
+ * contrib/modules/dlz/dlz_minmal.h.
+ */
 typedef struct dns_clientinfomethods {
        uint16_t                  version;
        uint16_t                  age;

diff --git a/lib/dns/include/dns/ecs.h b/lib/dns/include/dns/ecs.h
index d4cfe65233b5865942625b28793495cf98ae3814..f9d5e888b98cee5c62dc3c024dd81af884da2861 100644 (file)
--- a/lib/dns/include/dns/ecs.h
+++ b/lib/dns/include/dns/ecs.h
@@ -33,6 +33,10 @@
 #define ECS_MAX_V6_SCOPE 56
 #endif
 
+/*
+ * Any updates to this structure should also be applied in
+ * contrib/modules/dlz/dlz_minmal.h.
+ */
 struct dns_ecs {
        isc_netaddr_t addr;
        uint8_t       source;

diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index f578169ae10c975f104115330cb96f99d52d3d70..112051f9f9a9ea468e833ec86a094819d6dcf4eb 100644 (file)
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -27,6 +27,10 @@
 
 ISC_LANG_BEGINDECLS
 
+/*
+ * Any updates to this structure should also be applied in
+ * contrib/modules/dlz/dlz_minmal.h.
+ */
 struct isc_netaddr {
        unsigned int family;
        union {

diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 92511024ecabf335b77cacbd215e0224f95ebb63..9f3986b01ff62f6aa24f079a46f70f4990ac2b9b 100644 (file)
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -23,6 +23,10 @@
 
 #include <sys/un.h>
 
+/*
+ * Any updates to this structure should also be applied in
+ * contrib/modules/dlz/dlz_minmal.h.
+ */
 struct isc_sockaddr {
        union {
                struct sockaddr         sa;