From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Wed, 31 Mar 2021 17:14:18 +0000 (+0200)
Subject: - Cleaner build and test for dynlibmod/dnsmessage.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fdrachs-dnsmessage;p=thirdparty%2Funbound.git

- Cleaner build and test for dynlibmod/dnsmessage.
---

diff --git a/Makefile.in b/Makefile.in
index 7f07dca51..6ff82736a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -430,8 +430,8 @@ dnstap.pb-c.lo dnstap.pb-c.o: dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h
 dtstream.lo dtstream.o: $(srcdir)/dnstap/dtstream.c config.h $(srcdir)/dnstap/dtstream.h
 dnstap_fstrm.lo dnstap_fstrm.o: $(srcdir)/dnstap/dnstap_fstrm.c config.h $(srcdir)/dnstap/dnstap_fstrm.h
 unbound-dnstap-socket.lo unbound-dnstap-socket.o: $(srcdir)/dnstap/unbound-dnstap-socket.c config.h $(srcdir)/dnstap/dtstream.h
-dynlibmod.lo dynlibdmod.o: $(srcdir)/dynlibmod/dynlibmod.c config.h $(srcdir)/dynlibmod/dynlibmod.h
-dnsmessage.lo dynlibdmod.o: $(srcdir)/dynlibmod/dnsmessage.c config.h $(srcdir)/dynlibmod/dnsmessage.h
+dynlibmod.lo dynlibmod.o: $(srcdir)/dynlibmod/dynlibmod.c config.h $(srcdir)/dynlibmod/dynlibmod.h
+dnsmessage.lo dnsmessage.o: $(srcdir)/dynlibmod/dnsmessage.c config.h $(srcdir)/dynlibmod/dnsmessage.h
 
 # dnscrypt
 dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h \
@@ -660,7 +660,7 @@ depend:
 			-e 's?$$(srcdir)/pythonmod/pythonmod.h?$$(PYTHONMOD_HEADER)?g' \
 			-e 's?$$(srcdir)/edns-subnet/subnetmod.h $$(srcdir)/edns-subnet/subnet-whitelist.h $$(srcdir)/edns-subnet/edns-subnet.h $$(srcdir)/edns-subnet/addrtree.h?$$(SUBNET_HEADER)?g' \
 			-e 's?$$(srcdir)/ipsecmod/ipsecmod.h $$(srcdir)/ipsecmod/ipsecmod-whitelist.h?$$(IPSECMOD_HEADER)?g' \
-			-e 's?$$(srcdir)/dynlibmod/dynlibmod.h?$$(DYNLIBMOD_HEADER)?g' \
+			-e 's?$$(srcdir)/dynlibmod/dynlibmod.h $$(srcdir)/dynlibmod/dnsmessage.h?$$(DYNLIBMOD_HEADER)?g' \
 			-e 's!\(.*\)\.o[ :]*!\1.lo \1.o: !g' \
 			> $(DEPEND_TMP)
 	cp $(DEPEND_TARGET) $(DEPEND_TMP2)
diff --git a/configure.ac b/configure.ac
index cba6ca018..34635c544 100644
--- a/configure.ac
+++ b/configure.ac
@@ -638,9 +638,9 @@ if test x_$withval != x_no; then
   AC_DEFINE(WITH_DYNLIBMODULE, 1, [Define if you want dynlib module.])
   WITH_DYNLIBMODULE=yes
   AC_SUBST(WITH_DYNLIBMODULE)
-  DYNLIBMOD_OBJ="dynlibmod.lo"
+  DYNLIBMOD_OBJ="dynlibmod.lo dnsmessage.lo"
   AC_SUBST(DYNLIBMOD_OBJ)
-  DYNLIBMOD_HEADER='$(srcdir)/dynlibmod/dynlibmod.h'
+  DYNLIBMOD_HEADER='$(srcdir)/dynlibmod/dynlibmod.h $(srcdir)/dynlibmod/dnsmessage.h'
   AC_SUBST(DYNLIBMOD_HEADER)
   if test $on_mingw = "no"; then
     # link with -ldl if not already there, for all executables because
diff --git a/dynlibmod/dnsmessage.c b/dynlibmod/dnsmessage.c
index a8b9e25fc..046ad4770 100644
--- a/dynlibmod/dnsmessage.c
+++ b/dynlibmod/dnsmessage.c
@@ -1,20 +1,15 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <malloc.h>
+#include "config.h"
+#include "util/module.h"
+#include "util/regional.h"
+#include "util/net_help.h"
+#include "sldns/parseutil.h"
+#include "dynlibmod/dynlibmod.h"
 
-#include <config.h>
-#include <util/module.h>
-#include <sldns/parseutil.h>
-#include <dynlibmod/dynlibmod.h>
+#include "sldns/sbuffer.h"
+#include "sldns/str2wire.h"
+#include "services/cache/dns.h"
 
-#include <sldns/sbuffer.h>
-#include <sldns/str2wire.h>
-#include <pythonmod/pythonmod_utils.h>
-#include <services/cache/dns.h>
-
-#include "dnsmessage.h"
+#include "dynlibmod/dnsmessage.h"
 
 struct dynlibmod_section_txt {
   char *txt;
@@ -36,7 +31,7 @@ struct dynlibmod_dnsmessage *dynlibmod_dnsmessage_new(char *rr_name, sldns_rr_ty
     struct dynlibmod_dnsmessage *dns_message = malloc(sizeof(struct dynlibmod_dnsmessage));
 
     if (!dns_message) {
-        log_err("%s:%d malloc failure allocating dns_message", __FUNCTION__, __LINE__);
+        log_err("dynlibmod_dnsmessage_new: malloc failure allocating dns_message");
         goto error;
     }
 
@@ -46,7 +41,7 @@ struct dynlibmod_dnsmessage *dynlibmod_dnsmessage_new(char *rr_name, sldns_rr_ty
         dns_message->rr_name = strdup(rr_name);
 
         if (!dns_message->rr_name) {
-            log_err("%s:%d malloc failure allocating rr_name", __FUNCTION__, __LINE__);
+            log_err("dynlibmod_dnsmessage_new: malloc failure allocating rr_name");
             goto error;
         }
     }
@@ -82,7 +77,7 @@ void dynlibmod_dnsmessage_free(struct dynlibmod_dnsmessage *dnsmessage) {
     free(dnsmessage);
 }
 
-void dynlibmod_msg_append(struct dynlibmod_dnsmessage *msg, enum enum_section section, const char *format, ...) {
+void dynlibmod_msg_append(struct dynlibmod_dnsmessage *msg, sldns_pkt_section section, const char *format, ...) {
     va_list args;
 
     va_start(args, format);
@@ -90,11 +85,11 @@ void dynlibmod_msg_append(struct dynlibmod_dnsmessage *msg, enum enum_section se
     va_end( args );
 }
 
-void dynlibmod_vmsg_append(struct dynlibmod_dnsmessage *msg, enum enum_section section, const char *format, va_list args) {
+void dynlibmod_vmsg_append(struct dynlibmod_dnsmessage *msg, sldns_pkt_section section, const char *format, va_list args) {
     struct dynlibmod_section_txt *txt = malloc(sizeof(struct dynlibmod_section_txt));
 
     if (!txt) {
-        log_err("%s:%d malloc failure allocating section txt structure", __FUNCTION__, __LINE__);
+        log_err("dynlibmod_vmsg_append: malloc failure allocating section txt structure");
         goto error;
     }
 
@@ -109,7 +104,7 @@ void dynlibmod_vmsg_append(struct dynlibmod_dnsmessage *msg, enum enum_section s
 
     if (!txt->txt) {
         va_end(cpy_args);
-        log_err("%s:%d malloc failure allocating section txt member", __FUNCTION__, __LINE__);
+        log_err("dynlibmod_vmsg_append: malloc failure allocating section txt member");
         goto error;
     }
 
@@ -163,30 +158,79 @@ static int _dynlibmod_pushRRList(sldns_buffer* qb, struct dynlibmod_section_txt
     return 1;
 }
 
+static int
+create_response(struct module_qstate* qstate, sldns_buffer* pkt)
+{
+	struct msg_parse* prs;
+	struct edns_data edns;
+
+	/* parse message */
+	prs = (struct msg_parse*) regional_alloc(qstate->env->scratch,
+		sizeof(struct msg_parse));
+	if(!prs) {
+		log_err("create_response: out of memory on incoming message");
+		return 0;
+	}
+
+	memset(prs, 0, sizeof(*prs));
+	memset(&edns, 0, sizeof(edns));
+
+	sldns_buffer_set_position(pkt, 0);
+	if(parse_packet(pkt, prs, qstate->env->scratch) != LDNS_RCODE_NOERROR) {
+		verbose(VERB_ALGO, "create_response: parse error on reply packet");
+		return 0;
+	}
+	/* edns is not examined, but removed from message to help cache */
+	if(parse_extract_edns(prs, &edns, qstate->env->scratch) !=
+		LDNS_RCODE_NOERROR)
+		return 0;
+
+	/* remove CD-bit, we asked for in case we handle validation ourself */
+	prs->flags &= ~BIT_CD;
+
+	/* allocate response dns_msg in region */
+	qstate->return_msg = (struct dns_msg*) regional_alloc(qstate->region,
+		sizeof(struct dns_msg));
+	if(!qstate->return_msg)
+		return 0;
+
+	memset(qstate->return_msg, 0, sizeof(*qstate->return_msg));
+	if(!parse_create_msg(pkt, prs, NULL, &qstate->return_msg->qinfo,
+		&qstate->return_msg->rep, qstate->region)) {
+		log_err("create_response: malloc failure: allocating incoming dns_msg");
+		return 0;
+	}
+
+	/* If the AA flag was set, make sure to reach the client. */
+	qstate->return_msg->rep->authoritative =
+		(uint8_t)(qstate->return_msg->rep->flags&BIT_AA?1:0);
+
+	if(verbosity >= VERB_ALGO)
+		log_dns_msg("create_response: packet:", &qstate->return_msg->qinfo,
+			qstate->return_msg->rep);
+
+	return 1;
+}
+
 /**
- * A low level function for preparing a DNS answer by parsing a dynlibmod_dnsmessage.
+ * A low level function for preparing a DNS answer by parsing a
+ * dynlibmod_dnsmessage.
  */
-int dynlibmod_set_return_msg(struct module_qstate* qstate, struct dynlibmod_dnsmessage *msg) {
+int
+dynlibmod_set_return_msg(struct module_qstate* qstate, struct dynlibmod_dnsmessage *msg) {
      sldns_buffer *qb = 0;
      int res = 1;
      size_t l;
 
-     if ((qb = sldns_buffer_new(LDNS_RR_BUF_SIZE)) == 0) return 0;
+     if ((qb = sldns_buffer_new(LDNS_RR_BUF_SIZE)) == NULL) return 0;
 
      /* write header */
      sldns_buffer_write_u16(qb, 0); /* ID */
-     sldns_buffer_write_u16(qb, 0); /* flags */
+     sldns_buffer_write_u16(qb, msg->flags); /* flags */
      sldns_buffer_write_u16(qb, 1); /* qdcount */
      sldns_buffer_write_u16(qb, 0); /* ancount */
      sldns_buffer_write_u16(qb, 0); /* nscount */
      sldns_buffer_write_u16(qb, 0); /* arcount */
-     if ((msg->flags&PKT_QR)) LDNS_QR_SET(sldns_buffer_begin(qb));
-     if ((msg->flags&PKT_AA)) LDNS_AA_SET(sldns_buffer_begin(qb));
-     if ((msg->flags&PKT_TC)) LDNS_TC_SET(sldns_buffer_begin(qb));
-     if ((msg->flags&PKT_RD)) LDNS_RD_SET(sldns_buffer_begin(qb));
-     if ((msg->flags&PKT_CD)) LDNS_CD_SET(sldns_buffer_begin(qb));
-     if ((msg->flags&PKT_RA)) LDNS_RA_SET(sldns_buffer_begin(qb));
-     if ((msg->flags&PKT_AD)) LDNS_AD_SET(sldns_buffer_begin(qb));
 
      /* write the query */
      l = sldns_buffer_remaining(qb);
@@ -201,18 +245,17 @@ int dynlibmod_set_return_msg(struct module_qstate* qstate, struct dynlibmod_dnsm
      sldns_buffer_write_u16(qb, msg->rr_class);
 
      /* write RR sections */
-     if(res && msg->sections[SECTION_QUESTION] && !_dynlibmod_pushRRList(qb, msg->sections[SECTION_QUESTION], msg->default_ttl, 1, LDNS_QDCOUNT_OFF))
+     if(res && msg->sections[LDNS_SECTION_QUESTION] && !_dynlibmod_pushRRList(qb, msg->sections[LDNS_SECTION_QUESTION], msg->default_ttl, 1, LDNS_QDCOUNT_OFF))
              res = 0;
-     if(res && msg->sections[SECTION_ANSWER] && !_dynlibmod_pushRRList(qb, msg->sections[SECTION_ANSWER], msg->default_ttl, 0, LDNS_ANCOUNT_OFF))
+     if(res && msg->sections[LDNS_SECTION_ANSWER] && !_dynlibmod_pushRRList(qb, msg->sections[LDNS_SECTION_ANSWER], msg->default_ttl, 0, LDNS_ANCOUNT_OFF))
              res = 0;
-     if(res && msg->sections[SECTION_AUTHORITY] && !_dynlibmod_pushRRList(qb, msg->sections[SECTION_AUTHORITY], msg->default_ttl, 0, LDNS_NSCOUNT_OFF))
+     if(res && msg->sections[LDNS_SECTION_AUTHORITY] && !_dynlibmod_pushRRList(qb, msg->sections[LDNS_SECTION_AUTHORITY], msg->default_ttl, 0, LDNS_NSCOUNT_OFF))
              res = 0;
-     if(res && msg->sections[SECTION_ADDITIONAL] && !_dynlibmod_pushRRList(qb, msg->sections[SECTION_ADDITIONAL], msg->default_ttl, 0, LDNS_ARCOUNT_OFF))
+     if(res && msg->sections[LDNS_SECTION_ADDITIONAL] && !_dynlibmod_pushRRList(qb, msg->sections[LDNS_SECTION_ADDITIONAL], msg->default_ttl, 0, LDNS_ARCOUNT_OFF))
              res = 0;
 
-     if (res) res = createResponse(qstate, qb);
+     if (res) res = create_response(qstate, qb);
 
      if (qb) sldns_buffer_free(qb);
      return res;
 }
-
diff --git a/dynlibmod/dnsmessage.h b/dynlibmod/dnsmessage.h
index 725c5e88e..90d25cc50 100644
--- a/dynlibmod/dnsmessage.h
+++ b/dynlibmod/dnsmessage.h
@@ -2,23 +2,8 @@
  * @file Implements the dnsmessage api in C for unbound plugins using the dynlib module
  */
 
-#ifndef DNSMESSAGE_H
-#define DNSMESSAGE_H
-
-#define PKT_QR 1      /* QueRy - query flag */
-#define PKT_AA 2      /* Authoritative Answer - server flag */
-#define PKT_TC 4      /* TrunCated - server flag */
-#define PKT_RD 8      /* Recursion Desired - query flag */
-#define PKT_CD 16     /* Checking Disabled - query flag */
-#define PKT_RA 32     /* Recursion Available - server flag */
-#define PKT_AD 64     /* Authenticated Data - server flag */
-
-enum enum_section {
-  SECTION_QUESTION = 0,
-  SECTION_ANSWER = 1,
-  SECTION_AUTHORITY = 2,
-  SECTION_ADDITIONAL = 3
-};
+#ifndef DYNLIBMOD_DNSMESSAGE_H
+#define DYNLIBMOD_DNSMESSAGE_H
 
 /**
  * Structure encapsulates a new DNS Message.
@@ -43,16 +28,16 @@ void dynlibmod_dnsmessage_free(struct dynlibmod_dnsmessage *dnsmessage);
 /**
  * Print an record to one of the 4 DNS sections.  Uses printf conventions.   See example code for usage.
  */
-void dynlibmod_msg_append(struct dynlibmod_dnsmessage *msg, enum enum_section section, const char *format, ...);
+void dynlibmod_msg_append(struct dynlibmod_dnsmessage *msg, sldns_pkt_section section, const char *format, ...);
 
 /**
  * An alternative to dynlibmod_msg_append for use in creating wrapper functions
  */
-void dynlibmod_vmsg_append(struct dynlibmod_dnsmessage *msg, enum enum_section section, const char *format, va_list args);
+void dynlibmod_vmsg_append(struct dynlibmod_dnsmessage *msg, sldns_pkt_section section, const char *format, va_list args);
 
 /**
  * Finalize the DNS message and store it in the qstate for return to unbound
  */
 int dynlibmod_set_return_msg(struct module_qstate* qstate, struct dynlibmod_dnsmessage *msg);
 
-#endif /* DNSMESSAGE_H */
+#endif /* DYNLIBMOD_DNSMESSAGE_H */
diff --git a/dynlibmod/examples/resgen.c b/dynlibmod/examples/resgen.c
index 92a3f306a..068dae25f 100644
--- a/dynlibmod/examples/resgen.c
+++ b/dynlibmod/examples/resgen.c
@@ -3,23 +3,25 @@
  *
  * This is an example to show how dynamic libraries can be made to work with
  * unbound. To build a .so file simply run:
- *   gcc -I../.. -shared -Wall -Werror -fpic  -o helloworld.so helloworld.c
+ *   gcc -I../.. -shared -Wall -Werror -fpic  -o resgen.so resgen.c
  * And to build for windows, first make unbound with the --with-dynlibmod
  * switch, then use this command:
  *   x86_64-w64-mingw32-gcc -m64 -I../.. -shared -Wall -Werror -fpic
- *      -o helloworld.dll helloworld.c -L../.. -l:libunbound.dll.a
+ *      -o resgen.dll resgen.c -L../.. -l:libunbound.dll.a
  * to cross-compile a 64-bit Windows DLL.  The libunbound.dll.a is produced
  * by the compile step that makes unbound.exe and allows the dynlib dll to
  * access definitions in unbound.exe.
  */
 
-#include "../../config.h"
-#include "../../util/module.h"
-#include "../../sldns/parseutil.h"
-#include "../dynlibmod.h"
-#include "../../sldns/wire2str.h"
-#include "../../services/cache/dns.h"
-#include "../dnsmessage.h"
+#include "config.h"
+#include "dynlibmod/dynlibmod.h"
+#include "dynlibmod/dnsmessage.h"
+#include "util/module.h"
+#include "util/net_help.h"
+#include "sldns/parseutil.h"
+#include "sldns/pkthdr.h"
+#include "sldns/wire2str.h"
+#include "services/cache/dns.h"
 
 
 /* Declare the EXPORT macro that expands to exporting the symbol for DLLs when
@@ -83,8 +85,8 @@ EXPORT void operate(struct module_qstate* qstate, enum module_ev event,
         case module_event_new:
         case module_event_pass:
             if (endswith(qname, ".resgentest.", NULL)) {
-                msg = dynlibmod_dnsmessage_new(qname, (sldns_rr_type) qstate->qinfo.qtype, LDNS_RR_CLASS_IN, PKT_QR | PKT_RA | PKT_AA, 0);
-                dynlibmod_msg_append(msg, SECTION_ANSWER, "%s 10 IN A 127.1.2.3", qname);
+                msg = dynlibmod_dnsmessage_new(qname, (sldns_rr_type) qstate->qinfo.qtype, LDNS_RR_CLASS_IN, BIT_QR | BIT_RA | BIT_AA, 0);
+                dynlibmod_msg_append(msg, LDNS_SECTION_ANSWER, "%s 10 IN A 127.1.2.3", qname);
                 if (!dynlibmod_set_return_msg(qstate, msg)) {
                     log_info("Failed to set return message");
                     qstate->ext_state[id] = module_error;
@@ -133,4 +135,3 @@ EXPORT size_t get_mem(struct module_env* env, int id) {
     log_info("dynlib: hello world from get_mem");
     return 0;
 }
-
diff --git a/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.conf b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.conf
new file mode 100644
index 000000000..58de7f370
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.conf
@@ -0,0 +1,32 @@
+server:
+	verbosity: 2
+	num-threads: 3
+	outgoing-range: 16
+	interface: 127.0.0.1
+	port: @PORT@
+	use-syslog: no
+	directory: ""
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	local-zone: "example.net." redirect
+	local-data: "example.net. IN A 10.20.30.41"
+	module-config: "validator dynlib iterator"
+
+dynlib:
+	dynlib-file: "@DLL_FILE@"
+
+remote-control:
+	control-enable: yes
+	control-interface: 127.0.0.1
+	# control-interface: ::1
+	control-port: @CONTROL_PORT@
+	server-key-file: "unbound_server.key"
+	server-cert-file: "unbound_server.pem"
+	control-key-file: "unbound_control.key"
+	control-cert-file: "unbound_control.pem"
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
diff --git a/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.dsc b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.dsc
new file mode 100644
index 000000000..567511c76
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.dsc
@@ -0,0 +1,16 @@
+BaseName: dynlibmod_resgen
+Version: 1.0
+Description: test dynlibmod module with the resgen example
+CreationDate: Fri Mar 19 15:00:00 CET 2021
+Maintainer:
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: dynlibmod_resgen.pre
+Post: dynlibmod_resgen.post
+Test: dynlibmod_resgen.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.post b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.post
new file mode 100644
index 000000000..caa0da4f5
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.post
@@ -0,0 +1,15 @@
+# #-- dynlibmod.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+PRE="../.."
+if grep "define WITH_DYNLIBMODULE 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+kill_pid $FWD_PID
+kill $UNBOUND_PID
+kill $UNBOUND_PID >/dev/null 2>&1
+cat unbound.log
+exit 0
diff --git a/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.pre b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.pre
new file mode 100644
index 000000000..54e6d51ca
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.pre
@@ -0,0 +1,35 @@
+# #-- dynlibmod_resgen.pre--#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+. ../common.sh
+
+PRE="../.."
+if grep "define WITH_DYNLIBMODULE 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
+get_random_port 3
+UNBOUND_PORT=$RND_PORT
+FWD_PORT=$(($RND_PORT + 1))
+CONTROL_PORT=$(($RND_PORT + 2))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+echo "CONTROL_PORT=$CONTROL_PORT" >> .tpkg.var.test
+
+# start forwarder
+get_ldns_testns
+$LDNS_TESTNS -p $FWD_PORT dynlibmod_resgen.testns >fwd.log 2>&1 &
+FWD_PID=$!
+echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
+
+# make config file
+if grep "define USE_WINSOCK 1" $PRE/config.h; then
+	DLL_FILE="resgen.dll"
+else
+	DLL_FILE="resgen.so"
+fi
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' -e 's/@DLL_FILE\@/'$DLL_FILE'/' < dynlibmod_resgen.conf > ub.conf
+
+cat .tpkg.var.test
+wait_ldns_testns_up fwd.log
diff --git a/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.test b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.test
new file mode 100644
index 000000000..96fa6e91c
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.test
@@ -0,0 +1,78 @@
+# #-- dynlibmod.test --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+. ../common.sh
+PRE="../.."
+if grep "define WITH_DYNLIBMODULE 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
+# compile the dynamic library module
+if grep "define USE_WINSOCK 1" $PRE/config.h; then
+	echo "compile dynamic library dll for mingw"
+	echo "x86_64-w64-mingw32-gcc -m64 -I$PRE -shared -Wall -fpic -o resgen.dll $PRE/dynlibmod/examples/resgen.c -L../.. -l:libunbound.a"
+	x86_64-w64-mingw32-gcc -m64 -I$PRE -shared -Wall -fpic -o resgen.dll $PRE/dynlibmod/examples/resgen.c -L../.. -l:libunbound.a
+	if test $? != 0; then
+		echo "compile failure"
+		exit 1;
+	fi
+else
+	echo "compile dynamic library"
+	echo "gcc -I$PRE -shared -Wall -fpic -o resgen.so $PRE/dynlibmod/examples/resgen.c"
+	gcc -I$PRE -shared -Wall -fpic -o resgen.so $PRE/dynlibmod/examples/resgen.c
+	if test $? != 0; then
+		echo "compile failure"
+		exit 1;
+	fi
+fi
+
+# start unbound in the background
+LD_LIBRARY_PATH="." $PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+wait_unbound_up unbound.log
+
+# test if the server is up.
+echo "> dig www.example.com."
+dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile
+echo "> check answer"
+if grep "10.20.30.40" outfile; then
+	echo "OK"
+else
+	echo "> cat logfiles"
+	cat fwd.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+
+# test if the module works
+echo "> dig www.resgentest."
+dig @127.0.0.1 -p $UNBOUND_PORT www.resgentest. | tee outfile
+echo "> check answer"
+if grep "127.1.2.3" outfile; then
+	echo "OK"
+else
+	echo "> cat logfiles"
+	cat fwd.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+echo "> check answer (flags)"
+if grep "flags: qr aa rd ra" outfile; then
+	echo "OK"
+else
+	echo "> cat logfiles"
+	cat fwd.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+
+echo "> cat logfiles"
+cat fwd.log
+cat unbound.log
+echo "> OK"
+exit 0
diff --git a/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.testns b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.testns
new file mode 100644
index 000000000..0c911ca5b
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/dynlibmod_resgen.testns
@@ -0,0 +1,22 @@
+; nameserver test file
+$ORIGIN example.com.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www	IN	A
+SECTION ANSWER
+www	IN	A	10.20.30.40
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA SERVFAIL
+ADJUST copy_id
+SECTION QUESTION
+www.example.net.	IN	A
+ENTRY_END
+
diff --git a/testdata/dynlibmod_resgen.tdir/unbound_control.key b/testdata/dynlibmod_resgen.tdir/unbound_control.key
new file mode 100644
index 000000000..753a4ef61
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/unbound_control.key
@@ -0,0 +1,39 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/dynlibmod_resgen.tdir/unbound_control.pem b/testdata/dynlibmod_resgen.tdir/unbound_control.pem
new file mode 100644
index 000000000..a1edf7017
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/unbound_control.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDszCCAhsCFGD5193whHQ2bVdzbaQfdf1gc4SkMA0GCSqGSIb3DQEBCwUAMBIx
+EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjMwWhcNNDAwMzI1MTMzMjMw
+WjAaMRgwFgYDVQQDDA91bmJvdW5kLWNvbnRyb2wwggGiMA0GCSqGSIb3DQEBAQUA
+A4IBjwAwggGKAoIBgQCy0Sn4/KHxcau1nvsDgWFiO9t4Hd0xrtDasZbGhvOUD2mv
+OEDVoKEC9S0I4C4z6sHo1M0HxhZ9kltAdrDIw2mYLvtyDq9ctgIZRAdnICqJ03Tj
+1EkXlPuPg3xWeK/XsuJF2vRLqzDLg9G8Scg89XjcRAdmoLmNW8ewqSEh+YEX8OPl
+NdHKl5rBZX+bmN5Tr/gdFgx/K0Fl07WY9e5YuHSWBtDhIJuCs5RUPeueIyTXJkht
+A6a+UMdip6SMNv+85bYrFRAsbThpkwnWZZ91vAbQIpCRKMhIQNnWXvq+EzqZMzR/
+Bdsi/IVn3I88KV7WYXlpKXFLZyYa4ZVJFBrDxcX197dr0AIklOvfcd1KnJpmQpEB
+TMtwqosKXfbd1oq/c3DABPTdOPiJAzjXoBIyiLJ8Vr/YZZMpBWN127wKtqvu0Zp/
+nGuWKDgMGasG91gDeePLvb9EPvWEvCaVGgIZTt1G4Ov07ooBJSbVGL3U41n+p2My
++i/XmXa+PgZX4pdHTR0CAwEAATANBgkqhkiG9w0BAQsFAAOCAYEAd++Wen6l8Ifj
+4h3p/y16PhSsWJWuJ4wdNYy3/GM84S26wGjzlEEwiW76HpH6VJzPOiBAeWnFKE83
+hFyetEIxgJeIPbcs9ZP/Uoh8GZH9tRISBSN9Hgk2Slr9llo4t1H0g/XTgA5HqMQU
+9YydlBh43G7Vw3FVwh09OM6poNOGQKNc/tq2/QdKeUMtyBbLWpRmjH5XcCT35fbn
+ZiVOUldqSHD4kKrFO4nJYXZyipRbcXybsLiX9GP0GLemc3IgIvOXyJ2RPp06o/SJ
+pzlMlkcAfLJaSuEW57xRakhuNK7m051TKKzJzIEX+NFYOVdafFHS8VwGrYsdrFvD
+72tMfu+Fu55y3awdWWGc6YlaGogZiuMnJkvQphwgn+5qE/7CGEckoKEsH601rqIZ
+muaIc85+nEcHJeijd/ZlBN9zeltjFoMuqTUENgmv8+tUAdVm/UMY9Vjme6b43ydP
+uv6DS02+k9z8toxXworLiPr94BGaiGV1NxgwZKLZigYJt/Fi2Qte
+-----END CERTIFICATE-----
diff --git a/testdata/dynlibmod_resgen.tdir/unbound_server.key b/testdata/dynlibmod_resgen.tdir/unbound_server.key
new file mode 100644
index 000000000..370a7bbb2
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/unbound_server.key
@@ -0,0 +1,39 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/dynlibmod_resgen.tdir/unbound_server.pem b/testdata/dynlibmod_resgen.tdir/unbound_server.pem
new file mode 100644
index 000000000..986807310
--- /dev/null
+++ b/testdata/dynlibmod_resgen.tdir/unbound_server.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCAhMCFBHWXeQ6ZIa9QcQbXLFfC6tj+KA+MA0GCSqGSIb3DQEBCwUAMBIx
+EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjI5WhcNNDAwMzI1MTMzMjI5
+WjASMRAwDgYDVQQDDAd1bmJvdW5kMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+igKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI0x41iG32
+a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+NqqGRS7XVQ2
+4vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Zuh9MDgot
+aBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8KWaBe1ca4
+TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5FzUReSXZ
+uTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xPq6O9UPj4
++nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XLA5UoZgRz
+XgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP7kFZSngx
+dy1+A/bNAgMBAAEwDQYJKoZIhvcNAQELBQADggGBABunf93MKaCUHiZgnoOTinsW
+84/EgInrgtKzAyH+BhnKkJOhhR0kkIAx5d9BpDlaSiRTACFon9moWCgDIIsK/Ar7
+JE0Kln9cV//wiiNoFU0O4mnzyGUIMvlaEX6QHMJJQYvL05+w/3AAcf5XmMJtR5ca
+fJ8FqvGC34b2WxX9lTQoyT52sRt+1KnQikiMEnEyAdKktMG+MwKsFDdOwDXyZhZg
+XZhRrfX3/NVJolqB6EahjWIGXDeKuSSKZVtCyib6LskyeMzN5lcRfvubKDdlqFVF
+qlD7rHBsKhQUWK/IO64mGf7y/de+CgHtED5vDvr/p2uj/9sABATfbrOQR3W/Of25
+sLBj4OEfrJ7lX8hQgFaxkMI3x6VFT3W8dTCp7xnQgb6bgROWB5fNEZ9jk/gjSRmD
+yIU+r0UbKe5kBk/CmZVFXL2TyJ92V5NYEQh8V4DGy19qZ6u/XKYyNJL4ocs35GGe
+CA8SBuyrmdhx38h1RHErR2Skzadi1S7MwGf1y431fQ==
+-----END CERTIFICATE-----