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

Merge branch 'ondrej/call-failed_read-from-tls_error' into 'main'

Browse Source 
Call isc__nm_tlsdns_failed_read on tls_error to cleanup the socket

See merge request isc-projects/bind9!4824
This commit is contained in:
Ondřej Surý
2021-03-19 14:57:53 +00:00
parent 085c2e3249 e4e0e9e3c1
commit e8cd3d3cf7
1 changed files with 3 additions and 2 deletions
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);
}