mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-09-02 07:35:26 +00:00
Only print 'no IPv6 interfaces found' and 'no IPv4 interfaces found'
addresses on startup, not each time interfaces are scanned.
This commit is contained in:
@@ -108,7 +108,7 @@ void
|
|||||||
ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr);
|
ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr);
|
||||||
|
|
||||||
void
|
void
|
||||||
ns_interfacemgr_scan(ns_interfacemgr_t *mgr);
|
ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose);
|
||||||
/*
|
/*
|
||||||
* Scan the operatings system's list of network interfaces
|
* Scan the operatings system's list of network interfaces
|
||||||
* and create listeners when new interfaces are discovered.
|
* and create listeners when new interfaces are discovered.
|
||||||
|
@@ -658,7 +658,7 @@ do_ipv6(ns_interfacemgr_t *mgr) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ns_interfacemgr_scan(ns_interfacemgr_t *mgr) {
|
ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose) {
|
||||||
|
|
||||||
REQUIRE(NS_INTERFACEMGR_VALID(mgr));
|
REQUIRE(NS_INTERFACEMGR_VALID(mgr));
|
||||||
|
|
||||||
@@ -667,12 +667,14 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr) {
|
|||||||
if (isc_net_probeipv6() == ISC_R_SUCCESS) {
|
if (isc_net_probeipv6() == ISC_R_SUCCESS) {
|
||||||
do_ipv6(mgr);
|
do_ipv6(mgr);
|
||||||
} else
|
} else
|
||||||
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO,
|
isc_log_write(IFMGR_COMMON_LOGARGS,
|
||||||
|
verbose ? ISC_LOG_INFO : ISC_LOG_DEBUG(1),
|
||||||
"no IPv6 interfaces found");
|
"no IPv6 interfaces found");
|
||||||
if (isc_net_probeipv4() == ISC_R_SUCCESS)
|
if (isc_net_probeipv4() == ISC_R_SUCCESS)
|
||||||
do_ipv4(mgr);
|
do_ipv4(mgr);
|
||||||
else
|
else
|
||||||
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO,
|
isc_log_write(IFMGR_COMMON_LOGARGS,
|
||||||
|
verbose ? ISC_LOG_INFO : ISC_LOG_DEBUG(1),
|
||||||
"no IPv4 interfaces found");
|
"no IPv4 interfaces found");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -1063,8 +1063,8 @@ options_callback(dns_c_ctx_t *cctx, void *uap) {
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
scan_interfaces(ns_server_t *server) {
|
scan_interfaces(ns_server_t *server, isc_boolean_t verbose) {
|
||||||
ns_interfacemgr_scan(server->interfacemgr);
|
ns_interfacemgr_scan(server->interfacemgr, verbose);
|
||||||
dns_aclenv_copy(&server->aclenv,
|
dns_aclenv_copy(&server->aclenv,
|
||||||
ns_interfacemgr_getaclenv(server->interfacemgr));
|
ns_interfacemgr_getaclenv(server->interfacemgr));
|
||||||
}
|
}
|
||||||
@@ -1079,7 +1079,7 @@ interface_timer_tick(isc_task_t *task, isc_event_t *event) {
|
|||||||
UNUSED(task);
|
UNUSED(task);
|
||||||
isc_event_free(&event);
|
isc_event_free(&event);
|
||||||
RWLOCK(&server->conflock, isc_rwlocktype_write);
|
RWLOCK(&server->conflock, isc_rwlocktype_write);
|
||||||
scan_interfaces(server);
|
scan_interfaces(server, ISC_FALSE);
|
||||||
RWUNLOCK(&server->conflock, isc_rwlocktype_write);
|
RWUNLOCK(&server->conflock, isc_rwlocktype_write);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1214,7 +1214,7 @@ load_configuration(const char *filename, ns_server_t *server,
|
|||||||
* to configure the query source, since the dispatcher we use might
|
* to configure the query source, since the dispatcher we use might
|
||||||
* be shared with an interface.
|
* be shared with an interface.
|
||||||
*/
|
*/
|
||||||
scan_interfaces(server);
|
scan_interfaces(server, ISC_TRUE);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Arrange for further interface scanning to occur periodically
|
* Arrange for further interface scanning to occur periodically
|
||||||
|
Reference in New Issue
Block a user