mirror of
https://github.com/isc-projects/bind9.git
synced 2026-02-22 09:20:51 -05: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:
parent
60a7475dd8
commit
b00a764bc8
3 changed files with 10 additions and 8 deletions
|
|
@ -108,7 +108,7 @@ void
|
|||
ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr);
|
||||
|
||||
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
|
||||
* and create listeners when new interfaces are discovered.
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ do_ipv6(ns_interfacemgr_t *mgr) {
|
|||
}
|
||||
|
||||
void
|
||||
ns_interfacemgr_scan(ns_interfacemgr_t *mgr) {
|
||||
ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose) {
|
||||
|
||||
REQUIRE(NS_INTERFACEMGR_VALID(mgr));
|
||||
|
||||
|
|
@ -667,12 +667,14 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr) {
|
|||
if (isc_net_probeipv6() == ISC_R_SUCCESS) {
|
||||
do_ipv6(mgr);
|
||||
} 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");
|
||||
if (isc_net_probeipv4() == ISC_R_SUCCESS)
|
||||
do_ipv4(mgr);
|
||||
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");
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1063,8 +1063,8 @@ options_callback(dns_c_ctx_t *cctx, void *uap) {
|
|||
|
||||
|
||||
static void
|
||||
scan_interfaces(ns_server_t *server) {
|
||||
ns_interfacemgr_scan(server->interfacemgr);
|
||||
scan_interfaces(ns_server_t *server, isc_boolean_t verbose) {
|
||||
ns_interfacemgr_scan(server->interfacemgr, verbose);
|
||||
dns_aclenv_copy(&server->aclenv,
|
||||
ns_interfacemgr_getaclenv(server->interfacemgr));
|
||||
}
|
||||
|
|
@ -1079,7 +1079,7 @@ interface_timer_tick(isc_task_t *task, isc_event_t *event) {
|
|||
UNUSED(task);
|
||||
isc_event_free(&event);
|
||||
RWLOCK(&server->conflock, isc_rwlocktype_write);
|
||||
scan_interfaces(server);
|
||||
scan_interfaces(server, ISC_FALSE);
|
||||
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
|
||||
* be shared with an interface.
|
||||
*/
|
||||
scan_interfaces(server);
|
||||
scan_interfaces(server, ISC_TRUE);
|
||||
|
||||
/*
|
||||
* Arrange for further interface scanning to occur periodically
|
||||
|
|
|
|||
Loading…
Reference in a new issue