mirror of
https://github.com/isc-projects/bind9.git
synced 2026-02-27 03:51:16 -05:00
3b10814569
When shutting down TCP sockets, the read callback calling logic was flawed, it would call either one less callback or one extra. Fix the logic in the way: 1. When isc_nm_read() has been called but isc_nm_read_stop() hasn't on the handle, the read callback will be called with ISC_R_CANCELED to cancel active reading from the socket/handle. 2. When isc_nm_read() has been called and isc_nm_read_stop() has been called on the on the handle, the read callback will be called with ISC_R_SHUTTINGDOWN to signal that the dormant (not-reading) socket is being shut down. 3. The .reading and .recv_read flags are little bit tricky. The .reading flag indicates if the outer layer is reading the data (that would be uv_tcp_t for TCP and isc_nmsocket_t (TCP) for TLSStream), the .recv_read flag indicates whether somebody is interested in the data read from the socket. Usually, you would expect that the .reading should be false when .recv_read is false, but it gets even more tricky with TLSStream as the TLS protocol might need to read from the socket even when sending data. Fix the usage of the .recv_read and .reading flags in the TLSStream to their true meaning - which mostly consist of using .recv_read everywhere and then wrapping isc_nm_read() and isc_nm_read_stop() with the .reading flag. 4. The TLS failed read helper has been modified to resemble the TCP code as much as possible, clearing and re-setting the .recv_read flag in the TCP timeout code has been fixed and .recv_read is now cleared when isc_nm_read_stop() has been called on the streaming socket. 5. The use of Network Manager in the named_controlconf, isccc_ccmsg, and isc_httpd units have been greatly simplified due to the improved design. 6. More unit tests for TCP and TLS testing the shutdown conditions have been added. Co-authored-by: Ondřej Surý <ondrej@isc.org> Co-authored-by: Artem Boldariev <artem@isc.org>
99 lines
2.2 KiB
C
99 lines
2.2 KiB
C
/*
|
|
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
*
|
|
* SPDX-License-Identifier: MPL-2.0
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
|
*
|
|
* See the COPYRIGHT file distributed with this work for additional
|
|
* information regarding copyright ownership.
|
|
*/
|
|
|
|
/*! \file */
|
|
|
|
#include <isc/atomic.h>
|
|
#include <isc/netmgr.h>
|
|
#include <isc/util.h>
|
|
|
|
#include <dns/view.h>
|
|
|
|
#include <ns/client.h>
|
|
|
|
#if ISC_NETMGR_TRACE
|
|
#define FLARG \
|
|
, const char *func ISC_ATTR_UNUSED, const char *file ISC_ATTR_UNUSED, \
|
|
unsigned int line ISC_ATTR_UNUSED
|
|
#else
|
|
#define FLARG
|
|
#endif
|
|
|
|
/*
|
|
* We don't want to use netmgr-based client accounting, we need to emulate it.
|
|
*/
|
|
atomic_uint_fast32_t client_refs[32];
|
|
atomic_uintptr_t client_addrs[32];
|
|
|
|
#if ISC_NETMGR_TRACE
|
|
void
|
|
isc_nmhandle__attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp FLARG) {
|
|
#else
|
|
void
|
|
isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
|
|
#endif
|
|
ns_client_t *client = (ns_client_t *)source;
|
|
int i;
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
if (atomic_load(&client_addrs[i]) == (uintptr_t)client) {
|
|
break;
|
|
}
|
|
}
|
|
INSIST(i < 32);
|
|
INSIST(atomic_load(&client_refs[i]) > 0);
|
|
|
|
atomic_fetch_add(&client_refs[i], 1);
|
|
#if 0
|
|
fprintf(stderr, "%s:%s:%s:%d -> %ld\n", __func__, func, file, line,
|
|
client_refs[i]);
|
|
#endif
|
|
|
|
*targetp = source;
|
|
return;
|
|
}
|
|
|
|
#if ISC_NETMGR_TRACE
|
|
void
|
|
isc_nmhandle__detach(isc_nmhandle_t **handlep FLARG) {
|
|
#else
|
|
void
|
|
isc_nmhandle_detach(isc_nmhandle_t **handlep) {
|
|
#endif
|
|
isc_nmhandle_t *handle = *handlep;
|
|
ns_client_t *client = (ns_client_t *)handle;
|
|
int i;
|
|
|
|
*handlep = NULL;
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
if (atomic_load(&client_addrs[i]) == (uintptr_t)client) {
|
|
break;
|
|
}
|
|
}
|
|
INSIST(i < 32);
|
|
|
|
if (atomic_fetch_sub(&client_refs[i], 1) == 1) {
|
|
dns_view_detach(&client->view);
|
|
client->state = 4;
|
|
ns__client_reset_cb(client);
|
|
ns__client_put_cb(client);
|
|
atomic_store(&client_addrs[i], (uintptr_t)NULL);
|
|
}
|
|
#if 0
|
|
fprintf(stderr, "%s:%s:%s:%d -> %ld\n", __func__, func, file, line,
|
|
client_refs[i]);
|
|
#endif
|
|
|
|
return;
|
|
}
|