diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index 6f4d1ff3e7..362fd30987 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -403,7 +403,7 @@ struct isc_nmsocket { isc_nmsocket_t *children; int nchildren; isc_nmiface_t *iface; - isc_nmhandle_t *tcphandle; + isc_nmhandle_t *statichandle; isc_nmhandle_t *outerhandle; /*% Extra data allocated at the end of each isc_nmhandle_t */ diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index bb10557e9c..c4a6a3aa3c 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -739,7 +739,7 @@ nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree) { isc__nm_decstats(sock->mgr, sock->statsindex[STATID_ACTIVE]); } - sock->tcphandle = NULL; + sock->statichandle = NULL; if (sock->outerhandle != NULL) { isc_nmhandle_unref(sock->outerhandle); @@ -833,7 +833,7 @@ nmsocket_maybe_destroy(isc_nmsocket_t *sock) { } } - if (active_handles == 0 || sock->tcphandle != NULL) { + if (active_handles == 0 || sock->statichandle != NULL) { destroy = true; } @@ -1100,8 +1100,8 @@ isc__nmhandle_get(isc_nmsocket_t *sock, isc_sockaddr_t *peer, UNLOCK(&sock->lock); if (sock->type == isc_nm_tcpsocket) { - INSIST(sock->tcphandle == NULL); - sock->tcphandle = handle; + INSIST(sock->statichandle == NULL); + sock->statichandle = handle; } return (handle); diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c index 73b8b1fa0b..d5f0b30da6 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -604,7 +604,7 @@ readtimeout_cb(uv_timer_t *handle) { isc_quota_detach(&sock->quota); } if (sock->rcb.recv != NULL) { - sock->rcb.recv(sock->tcphandle, ISC_R_TIMEDOUT, NULL, + sock->rcb.recv(sock->statichandle, ISC_R_TIMEDOUT, NULL, sock->rcbarg); isc__nmsocket_clearcb(sock); } @@ -766,8 +766,8 @@ read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) { .length = nread }; if (sock->rcb.recv != NULL) { - sock->rcb.recv(sock->tcphandle, ISC_R_SUCCESS, ®ion, - sock->rcbarg); + sock->rcb.recv(sock->statichandle, ISC_R_SUCCESS, + ®ion, sock->rcbarg); } sock->read_timeout = (atomic_load(&sock->keepalive) @@ -792,7 +792,8 @@ read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) { */ if (sock->rcb.recv != NULL) { isc__nm_incstats(sock->mgr, sock->statsindex[STATID_RECVFAIL]); - sock->rcb.recv(sock->tcphandle, ISC_R_EOF, NULL, sock->rcbarg); + sock->rcb.recv(sock->statichandle, ISC_R_EOF, NULL, + sock->rcbarg); isc__nmsocket_clearcb(sock); } @@ -1125,10 +1126,10 @@ void isc__nm_tcp_shutdown(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); - if (sock->type == isc_nm_tcpsocket && sock->tcphandle != NULL && + if (sock->type == isc_nm_tcpsocket && sock->statichandle != NULL && sock->rcb.recv != NULL) { - sock->rcb.recv(sock->tcphandle, ISC_R_CANCELED, NULL, + sock->rcb.recv(sock->statichandle, ISC_R_CANCELED, NULL, sock->rcbarg); isc__nmsocket_clearcb(sock); } @@ -1138,10 +1139,10 @@ void isc__nm_tcp_cancelread(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); - if (sock->type == isc_nm_tcpsocket && sock->tcphandle != NULL && + if (sock->type == isc_nm_tcpsocket && sock->statichandle != NULL && sock->rcb.recv != NULL) { - sock->rcb.recv(sock->tcphandle, ISC_R_CANCELED, NULL, + sock->rcb.recv(sock->statichandle, ISC_R_CANCELED, NULL, sock->rcbarg); isc__nmsocket_clearcb(sock); }