From: Evan Hunt <each@isc.org>
Date: Wed, 6 Nov 2019 00:28:43 +0000 (-0800)
Subject: use netmgr in libisc unit tests
X-Git-Tag: v9.15.6~21^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48d003edf7ce45804ef75e002cca17538abfdac1;p=thirdparty%2Fbind9.git

use netmgr in libisc unit tests
---

diff --git a/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c
index ed5801b56ea..050e4809c22 100644
--- a/lib/isc/tests/isctest.c
+++ b/lib/isc/tests/isctest.c
@@ -33,6 +33,7 @@ isc_log_t *lctx = NULL;
 isc_taskmgr_t *taskmgr = NULL;
 isc_timermgr_t *timermgr = NULL;
 isc_socketmgr_t *socketmgr = NULL;
+isc_nm_t *netmgr = NULL;
 isc_task_t *maintask = NULL;
 int ncpus;
 
@@ -55,6 +56,9 @@ static isc_logcategory_t categories[] = {
 
 static void
 cleanup_managers(void) {
+	if (netmgr != NULL) {
+		isc_nm_detach(&netmgr);
+	}
 	if (maintask != NULL) {
 		isc_task_shutdown(maintask);
 		isc_task_destroy(&maintask);
@@ -90,6 +94,7 @@ create_managers(unsigned int workers) {
 
 	CHECK(isc_timermgr_create(mctx, &timermgr));
 	CHECK(isc_socketmgr_create(mctx, &socketmgr));
+	netmgr = isc_nm_start(mctx, 3);
 	return (ISC_R_SUCCESS);
 
  cleanup:
diff --git a/lib/isc/tests/isctest.h b/lib/isc/tests/isctest.h
index 481e7038a84..c89996721a5 100644
--- a/lib/isc/tests/isctest.h
+++ b/lib/isc/tests/isctest.h
@@ -17,6 +17,7 @@
 #include <isc/buffer.h>
 #include <isc/hash.h>
 #include <isc/log.h>
+#include <isc/netmgr.h>
 #include <isc/mem.h>
 #include <isc/print.h>
 #include <isc/result.h>
@@ -37,6 +38,7 @@ extern isc_log_t *lctx;
 extern isc_taskmgr_t *taskmgr;
 extern isc_timermgr_t *timermgr;
 extern isc_socketmgr_t *socketmgr;
+extern isc_nm_t *netmgr;
 extern int ncpus;
 
 isc_result_t