upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 18:32:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Call isc__nm_tlsdns_failed_read on tls_error to cleanup the socket

Browse source 
In tls_error(), we now call isc__nm_tlsdns_failed_read() instead of just
stopping timer and reading from the socket.  This allows us to properly
cleanup any pending operation on the socket.
This commit is contained in:
Ondřej Surý 2021-03-19 15:08:14 +01:00
parent 085c2e3249
commit e4e0e9e3c1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/isc/netmgr/tlsdns.c
View file

@ -1045,8 +1045,7 @@ tls_error(isc_nmsocket_t *sock, isc_result_t result) {
switch (sock->tls.state) {
case TLS_STATE_HANDSHAKE:
case TLS_STATE_IO:
isc__nmsocket_timer_stop(sock);
isc__nm_stop_reading(sock);
isc__nm_tlsdns_failed_read_cb(sock, result);
break;
case TLS_STATE_ERROR:
return;
@ -1769,6 +1768,8 @@ tlsdns_close_direct(isc_nmsocket_t *sock) {
REQUIRE(sock->tid == isc_nm_tid());
REQUIRE(atomic_load(&sock->closing));
REQUIRE(sock->tls.pending_req == NULL);
if (sock->quota != NULL) {
isc_quota_detach(&sock->quota);
}