ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Remove nvXports, vXports members from dispatch manager

Browse Source
This commit is contained in:
alessio
2024-09-20 14:54:02 +02:00
committed by Ondřej Surý
parent 4487757fbf
commit 08f71dfcfb
2 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/named/server.c
+4 -7
View File
@@ -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);
lib/dns/dispatch.c
-30
View File
@@ -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));