MINOR: connection: remove CO_FL_SSL_WAIT_HS from CO_FL_HANDSHAKE
Most places continue to check CO_FL_HANDSHAKE while in fact they should
check CO_FL_HANDSHAKE_NOSSL, which contains all handshakes but the one
dedicated to SSL renegotiation. In fact the SSL layer should be the
only one checking CO_FL_SSL_WAIT_HS, so as to avoid processing data
when a renegotiation is in progress, but other ones randomly include it
without knowing. And ideally it should even be an internal flag that's
not exposed in the connection.
This patch takes CO_FL_SSL_WAIT_HS out of CO_FL_HANDSHAKE, uses this flag
consistently all over the code, and gets rid of CO_FL_HANDSHAKE_NOSSL.
In order to limit the confusion that has accumulated over time, the
CO_FL_SSL_WAIT_HS flag which indicates an ongoing SSL handshake,
possibly used by a renegotiation was moved after the other ones.
diff --git a/src/xprt_handshake.c b/src/xprt_handshake.c
index 8cd63a1..89446af 100644
--- a/src/xprt_handshake.c
+++ b/src/xprt_handshake.c
@@ -82,7 +82,7 @@
* connection error
* */
if ((conn->flags & CO_FL_ERROR) ||
- !(conn->flags & CO_FL_HANDSHAKE_NOSSL)) {
+ !(conn->flags & CO_FL_HANDSHAKE)) {
int ret = 0;
int woke = 0;
int was_conn_ctx = 0;
@@ -185,7 +185,7 @@
* to fallback to the original XPRT to re-initiate the
* connection.
*/
- conn->flags &= ~CO_FL_HANDSHAKE_NOSSL;
+ conn->flags &= ~CO_FL_HANDSHAKE;
if (conn->xprt == xprt_get(XPRT_HANDSHAKE))
conn->xprt = xprt_get(XPRT_RAW);
tasklet_free(ctx->wait_event.tasklet);