Commit e8cd3d3c authored by Ondřej Surý's avatar Ondřej Surý
Browse files

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

Call isc__nm_tlsdns_failed_read on tls_error to cleanup the socket

See merge request !4824
parents 085c2e32 e4e0e9e3
Pipeline #66839 passed with stages
in 1 minute and 18 seconds
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment