update dlz_minimal.h

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

(cherry picked from commit d3fed6f400)

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 */
 

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;

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;

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 {

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;