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

Use server socket to log TCP accept failures

Browse Source 
The accept_connection() could detach from the child socket on a failure,
so we need to keep and use the server socket for logging the accept
failures.
This commit is contained in:
Ondřej Surý
2023-04-18 14:35:34 +02:00
parent 0f25d62a40
commit 58663574b9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/isc/netmgr/tcp.c
View File

@@ -795,19 +795,21 @@ free:
*/
static void
tcpaccept_cb(void *arg) {
isc_nmsocket_t *sock = arg;
isc_nmsocket_t *csock = arg;
isc_nmsocket_t *ssock = csock->server;
REQUIRE(VALID_NMSOCK(sock));
REQUIRE(sock->tid == isc_tid());
REQUIRE(VALID_NMSOCK(csock));
REQUIRE(csock->tid == isc_tid());
isc_result_t result = accept_connection(sock);
isc__nm_accept_connection_log(sock, result, can_log_tcp_quota());
isc__nmsocket_detach(&sock);
isc_result_t result = accept_connection(csock);
isc__nm_accept_connection_log(ssock, result, can_log_tcp_quota());
isc__nmsocket_detach(&csock);
}
static void
quota_accept_cb(void *arg) {
isc_nmsocket_t *csock = arg;
isc_nmsocket_t *ssock = csock->server;
REQUIRE(VALID_NMSOCK(csock));
@@ -817,7 +819,7 @@ quota_accept_cb(void *arg) {
*/
if (csock->tid == isc_tid()) {
isc_result_t result = accept_connection(csock);
isc__nm_accept_connection_log(csock, result,
isc__nm_accept_connection_log(ssock, result,
can_log_tcp_quota());
} else {
isc__nmsocket_attach(csock, &(isc_nmsocket_t *){ NULL });