upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-27 20:25:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

TLS Stream: backport connect callback handling behaviour from main

Browse source 
This commit contains the backport of the behaviour for handling TLS
connect callbacks when wrapping up.

The current behaviour have not caused any problems to us, yet, but we
are changing it to remain on the safer side.
This commit is contained in:
Artem Boldariev 2023-03-30 18:37:21 +03:00
parent c3cbd09027
commit d1d4f6e362
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/isc/netmgr/tlsstream.c
View file

@ -344,10 +344,15 @@ tls_try_handshake(isc_nmsocket_t *sock, isc_result_t *presult) {
INSIST(sock->statichandle == NULL);
isc__nmsocket_log_tls_session_reuse(sock, sock->tlsstream.tls);
tlshandle = isc__nmhandle_get(sock, &sock->peer, &sock->iface);
if (isc__nm_closing(sock)) {
result = ISC_R_SHUTTINGDOWN;
}
if (sock->tlsstream.server) {
if (isc__nmsocket_closing(sock->listener)) {
result = ISC_R_CANCELED;
} else {
} else if (result == ISC_R_SUCCESS) {
result = sock->listener->accept_cb(
tlshandle, result,
sock->listener->accept_cbarg);
@ -466,7 +471,6 @@ tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data,
INSIST(SSL_is_init_finished(
sock->tlsstream.tls) ==
1);
INSIST(!atomic_load(&sock->client));
finish = true;
}
}