diff --git a/channels/chan_sip.c b/channels/chan_sip.c index df20b83901e04c95e6cd078b8fa61f0de81cfa89..5a71388d5bb5d5b8e523617c9a9703af48d0ae8f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3109,6 +3109,12 @@ static void *_sip_tcp_helper_thread(struct ast_tcptls_session_instance *tcptls_s goto cleanup; } + /* + * We cannot let the stream exclusively wait for data to arrive. + * We have to wake up the task to send outgoing messages. + */ + ast_tcptls_stream_set_exclusive_input(tcptls_session->stream_cookie, 0); + ast_tcptls_stream_set_timeout_sequence(tcptls_session->stream_cookie, ast_tvnow(), tcptls_session->client ? -1 : (authtimeout * 1000)); diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h index 17b532cdabe0a383f73abe8e0c3ede3c6e13c441..3356a92ccd1c4d3855d606481aaa14ad8cf1a370 100644 --- a/include/asterisk/tcptls.h +++ b/include/asterisk/tcptls.h @@ -189,7 +189,21 @@ void ast_tcptls_stream_set_timeout_inactivity(struct ast_tcptls_stream *stream, */ void ast_tcptls_stream_set_timeout_sequence(struct ast_tcptls_stream *stream, struct timeval start, int timeout); -/*! \brief +/*! + * \brief Set the TCP/TLS stream I/O if it can exclusively depend upon the set timeouts. + * + * \param stream TCP/TLS stream control data. + * \param exclusive_input TRUE if stream can exclusively wait for fd input. + * Otherwise, the stream will not wait for fd input. It will wait while + * trying to send data. + * + * \note The stream timeouts still need to be set. + * + * \return Nothing + */ +void ast_tcptls_stream_set_exclusive_input(struct ast_tcptls_stream *stream, int exclusive_input); + +/*! \brief * describes a server instance */ struct ast_tcptls_session_instance { diff --git a/main/http.c b/main/http.c index ffc03fceab28e0f791bced29a3a3caf349ddd932..a123dd28c5178091f867053f9a077fdd8987757a 100644 --- a/main/http.c +++ b/main/http.c @@ -877,6 +877,9 @@ static void *httpd_helper_thread(void *data) flags |= O_NONBLOCK; fcntl(ser->fd, F_SETFL, flags); + /* We can let the stream wait for data to arrive. */ + ast_tcptls_stream_set_exclusive_input(ser->stream_cookie, 1); + ast_tcptls_stream_set_timeout_inactivity(ser->stream_cookie, session_inactivity); if (!fgets(buf, sizeof(buf), ser->f) || feof(ser->f)) { diff --git a/main/manager.c b/main/manager.c index fe67d5c5cf4d531de1a1cac931bf4d77db818475..51a3b4292a0b6d4fa8d6eb5f48686b3500ac9c66 100644 --- a/main/manager.c +++ b/main/manager.c @@ -5562,6 +5562,12 @@ static void *session_do(void *data) } ao2_unlock(session); + /* + * We cannot let the stream exclusively wait for data to arrive. + * We have to wake up the task to send async events. + */ + ast_tcptls_stream_set_exclusive_input(ser->stream_cookie, 0); + ast_tcptls_stream_set_timeout_sequence(ser->stream_cookie, ast_tvnow(), authtimeout * 1000); diff --git a/main/tcptls.c b/main/tcptls.c index 83c21cf8dab8dcf72b44bec2d99831cb9708118b..65101f4c9c80fcd5f1923c8588294a2cdb87b990 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -77,6 +77,8 @@ struct ast_tcptls_stream { * feature to work correctly. */ int timeout; + /*! TRUE if stream can exclusively wait for fd input. */ + int exclusive_input; }; void ast_tcptls_stream_set_timeout_disable(struct ast_tcptls_stream *stream) @@ -102,6 +104,13 @@ void ast_tcptls_stream_set_timeout_sequence(struct ast_tcptls_stream *stream, st stream->timeout = timeout; } +void ast_tcptls_stream_set_exclusive_input(struct ast_tcptls_stream *stream, int exclusive_input) +{ + ast_assert(stream != NULL); + + stream->exclusive_input = exclusive_input; +} + /*! * \internal * \brief fopencookie()/funopen() stream read function. @@ -151,6 +160,11 @@ static HOOK_T tcptls_stream_read(void *cookie, char *buf, LEN_T size) ast_debug(1, "TLS clean shutdown alert reading data\n"); return 0; case SSL_ERROR_WANT_READ: + if (!stream->exclusive_input) { + /* We cannot wait for data now. */ + errno = EAGAIN; + return -1; + } while ((ms = ast_remaining_ms(start, stream->timeout))) { res = ast_wait_for_input(stream->fd, ms); if (0 < res) { @@ -202,7 +216,8 @@ static HOOK_T tcptls_stream_read(void *cookie, char *buf, LEN_T size) for (;;) { res = read(stream->fd, buf, size); - if (0 <= res) { + if (0 <= res || !stream->exclusive_input) { + /* Got data or we cannot wait for it. */ return res; } if (errno != EINTR && errno != EAGAIN) {