MEDIUM: stream-int/conn-stream: Move blocking flags from SI to CS
Remaining flags and associated functions are move in the conn-stream
scope. These flags are added on the endpoint and not the conn-stream
itself. This way it will be possible to get them from the mux or the
applet. The functions to get or set these flags are renamed accordingly with
the "cs_" prefix and updated to manipualte a conn-stream instead of a
stream-interface.
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index bdd73e2..23d1ca1 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -7212,7 +7212,7 @@
chunk_appendf(&trash, "# id (file)\n");
if (ci_putchk(cs_ic(cs), &trash) == -1) {
- si_rx_room_blk(cs->si);
+ cs_rx_room_blk(cs);
return 0;
}
@@ -7272,7 +7272,7 @@
* this stream's users so that it can remove us upon termination.
*/
HA_RWLOCK_RDUNLOCK(TLSKEYS_REF_LOCK, &ref->lock);
- si_rx_room_blk(cs->si);
+ cs_rx_room_blk(cs);
return 0;
}
appctx->ctx.cli.i1++;
@@ -7284,7 +7284,7 @@
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
*/
- si_rx_room_blk(cs->si);
+ cs_rx_room_blk(cs);
return 0;
}
@@ -7528,7 +7528,7 @@
node = ebmb_next(node);
if (ci_putchk(cs_ic(cs), trash) == -1) {
- si_rx_room_blk(cs->si);
+ cs_rx_room_blk(cs);
goto yield;
}
}
@@ -7672,7 +7672,7 @@
}
if (ci_putchk(cs_ic(cs), trash) == -1) {
- si_rx_room_blk(cs->si);
+ cs_rx_room_blk(cs);
goto yield;
}
appctx->ctx.cli.p0 = NULL;