mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

TLS: try to close sockets whenever there are no pending operations

Browse Source 
This commit ensures that the underlying TCP socket of a TLS connection
gets closed earlier whenever there are no pending operations on it.

In the loop-manager branch, in some circumstances the connection
could have remained opened for far too long for no reason. This
commit ensures that will not happen.
This commit is contained in:
Artem Boldariev
2022-06-24 15:20:13 +03:00
parent 237ce05b89
commit 88524e26ec
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/isc/netmgr/tlsstream.c
View File

@@ -353,6 +353,23 @@ tls_try_handshake(isc_nmsocket_t *sock) {
return (rv); return (rv);
} }
static bool
tls_try_to_close_unused_socket(isc_nmsocket_t *sock) {
if (sock->tlsstream.state > TLS_HANDSHAKE &&
sock->statichandle == NULL && sock->tlsstream.nsending == 0)
{
/*
* It seems that no action on the socket has been
* scheduled on some point after the handshake, let's
* close the connection.
*/
isc__nmsocket_prep_destroy(sock);
return (true);
}
return (false);
}
static void static void
tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data, tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data,
isc__nm_uvreq_t *send_data, bool finish) { isc__nm_uvreq_t *send_data, bool finish) {
@@ -493,6 +510,7 @@ tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data,
switch (tls_status) { switch (tls_status) {
case SSL_ERROR_NONE: case SSL_ERROR_NONE:
case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_ZERO_RETURN:
(void)tls_try_to_close_unused_socket(sock);
return; return;
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
if (sock->tlsstream.nsending == 0) { if (sock->tlsstream.nsending == 0) {
@@ -504,6 +522,10 @@ tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data,
} }
return; return;
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
if (tls_try_to_close_unused_socket(sock)) {
return;
}
if (sock->tlsstream.reading) { if (sock->tlsstream.reading) {
INSIST(VALID_NMHANDLE(sock->outerhandle)); INSIST(VALID_NMHANDLE(sock->outerhandle));
isc_nm_resumeread(sock->outerhandle); isc_nm_resumeread(sock->outerhandle);