mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Handle TCP sockets in isc__nmsocket_reset()

Browse Source 
The isc__nmsocket_reset() was missing a case for raw TCP sockets (used
by RNDC and DoH) which would case a assertion failure when write timeout
would be triggered.

TCP sockets are now also properly handled in isc__nmsocket_reset().
This commit is contained in:
Ondřej Surý
2022-02-28 10:25:06 +01:00
committed by Evan Hunt
parent e2636b1de0
commit b220fb32bd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/isc/netmgr/netmgr.c
View File

@@ -2851,8 +2851,13 @@ isc__nmsocket_reset(isc_nmsocket_t *sock) {
REQUIRE(VALID_NMSOCK(sock)); REQUIRE(VALID_NMSOCK(sock));
switch (sock->type) { switch (sock->type) {
case isc_nm_tcpsocket:
case isc_nm_tcpdnssocket: case isc_nm_tcpdnssocket:
case isc_nm_tlsdnssocket: case isc_nm_tlsdnssocket:
/*
* This can be called from the TCP write timeout, or
* from the TCPDNS or TLSDNS branches of isc_nm_bad_request().
*/
REQUIRE(sock->parent == NULL); REQUIRE(sock->parent == NULL);
break; break;
default: default: