From 08f71dfcfb0bc9c0807067d825734a596273c60e Mon Sep 17 00:00:00 2001
From: alessio <alessio@isc.org>
Date: Tue, 17 Sep 2024 15:27:11 +0200
Subject: [PATCH] Remove nvXports, vXports members from dispatch manager

---
 bin/named/server.c | 11 ++++-------
 lib/dns/dispatch.c | 30 ------------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/bin/named/server.c b/bin/named/server.c
index 82cd9ba53e..b459a5e825 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8409,7 +8409,7 @@ load_configuration(const char *filename, named_server_t *server,
 	} else {
 		result = named_config_getport(config, "port", &listen_port);
 		if (result != ISC_R_SUCCESS) {
-			goto cleanup_v6portset;
+			goto cleanup_bindkeys_parser;
 		}
 	}
 
@@ -8475,7 +8475,7 @@ load_configuration(const char *filename, named_server_t *server,
 						       AF_INET, &listenon);
 		}
 		if (result != ISC_R_SUCCESS) {
-			goto cleanup_v6portset;
+			goto cleanup_bindkeys_parser;
 		}
 
 		if (listenon != NULL) {
@@ -8509,7 +8509,7 @@ load_configuration(const char *filename, named_server_t *server,
 						       AF_INET6, &listenon);
 		}
 		if (result != ISC_R_SUCCESS) {
-			goto cleanup_v6portset;
+			goto cleanup_bindkeys_parser;
 		}
 		if (listenon != NULL) {
 			ns_interfacemgr_setlistenon6(server->interfacemgr,
@@ -8539,7 +8539,7 @@ load_configuration(const char *filename, named_server_t *server,
 				      "unable to listen on any configured "
 				      "interfaces");
 			result = ISC_R_FAILURE;
-			goto cleanup_v6portset;
+			goto cleanup_bindkeys_parser;
 		}
 	}
 
@@ -9343,10 +9343,7 @@ cleanup_keystorelist:
 		dns_keystore_detach(&keystore);
 	}
 
-cleanup_v6portset:
-cleanup_v4portset:
 cleanup_bindkeys_parser:
-
 	if (bindkeys_parser != NULL) {
 		if (bindkeys != NULL) {
 			cfg_obj_destroy(bindkeys_parser, &bindkeys);
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 99d18d09e9..183d7a8b1f 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -61,11 +61,6 @@ struct dns_dispatchmgr {
 	struct cds_lfht **tcps;
 
 	struct cds_lfht *qids;
-
-	in_port_t *v4ports;    /*%< available ports for IPv4 */
-	unsigned int nv4ports; /*%< # of available ports for IPv4 */
-	in_port_t *v6ports;    /*%< available ports for IPv4 */
-	unsigned int nv6ports; /*%< # of available ports for IPv4 */
 };
 
 typedef enum {
@@ -905,14 +900,6 @@ dns_dispatchmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr, isc_nm_t *nm,
 			NULL);
 	}
 
-	// create_default_portset(mgr->mctx, AF_INET, &v4portset);
-	// create_default_portset(mgr->mctx, AF_INET6, &v6portset);
-	//
-	// setavailports(mgr, v4portset, v6portset);
-	//
-	// isc_portset_destroy(mgr->mctx, &v4portset);
-	// isc_portset_destroy(mgr->mctx, &v6portset);
-
 	mgr->qids = cds_lfht_new(QIDS_INIT_SIZE, QIDS_MIN_SIZE, 0,
 				 CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING,
 				 NULL);
@@ -944,14 +931,6 @@ dns_dispatchmgr_getblackhole(dns_dispatchmgr_t *mgr) {
 	return (mgr->blackhole);
 }
 
-isc_result_t
-dns_dispatchmgr_setavailports(dns_dispatchmgr_t *mgr, isc_portset_t *v4portset,
-			      isc_portset_t *v6portset) {
-	REQUIRE(VALID_DISPATCHMGR(mgr));
-	// return (setavailports(mgr, v4portset, v6portset));
-	return ISC_R_SUCCESS;
-}
-
 static void
 dispatchmgr_destroy(dns_dispatchmgr_t *mgr) {
 	REQUIRE(VALID_DISPATCHMGR(mgr));
@@ -975,15 +954,6 @@ dispatchmgr_destroy(dns_dispatchmgr_t *mgr) {
 		isc_stats_detach(&mgr->stats);
 	}
 
-	if (mgr->v4ports != NULL) {
-		isc_mem_cput(mgr->mctx, mgr->v4ports, mgr->nv4ports,
-			     sizeof(in_port_t));
-	}
-	if (mgr->v6ports != NULL) {
-		isc_mem_cput(mgr->mctx, mgr->v6ports, mgr->nv6ports,
-			     sizeof(in_port_t));
-	}
-
 	isc_nm_detach(&mgr->nm);
 
 	isc_mem_putanddetach(&mgr->mctx, mgr, sizeof(dns_dispatchmgr_t));