From: Willy Tarreau <w@1wt.eu>
Date: Thu, 6 Dec 2018 14:24:01 +0000 (+0100)
Subject: MINOR: stream-int: add a new blocking condition on the remote connection
X-Git-Tag: v1.9-dev10~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3b62d374a7839c0ebc0b50064b93dabfba9f6db;p=thirdparty%2Fhaproxy.git

MINOR: stream-int: add a new blocking condition on the remote connection

There are some situations where we need to wait for the other side to
be connected. None of the current blocking flags support this. It used
to work more or less by accident using the old flags. Let's add a new
flag to mention we're blocking on this, it's removed by si_chk_rcv()
when a connection is established. It should be enough for now.
---

diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index da37f73d31..e790c71700 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -266,6 +266,18 @@ static inline void si_rx_chan_blk(struct stream_interface *si)
 	si->flags |=  SI_FL_RXBLK_CHAN;
 }
 
+/* Tell a stream interface the other side is connected */
+static inline void si_rx_conn_rdy(struct stream_interface *si)
+{
+	si->flags &= ~SI_FL_RXBLK_CONN;
+}
+
+/* Tell a stream interface it must wait for the other side to connect */
+static inline void si_rx_conn_blk(struct stream_interface *si)
+{
+	si->flags |=  SI_FL_RXBLK_CONN;
+}
+
 /* The stream interface just got the input buffer it was waiting for */
 static inline void si_rx_buff_rdy(struct stream_interface *si)
 {
@@ -418,6 +430,9 @@ static inline void si_shutw(struct stream_interface *si)
  */
 static inline void si_chk_rcv(struct stream_interface *si)
 {
+	if (si->flags & SI_FL_RXBLK_CONN && (si_opposite(si)->state >= SI_ST_EST))
+		si_rx_conn_rdy(si);
+
 	if (si_rx_blocked(si) || !si_rx_endp_ready(si))
 		return;
 
diff --git a/include/types/stream_interface.h b/include/types/stream_interface.h
index d9eeacbf09..c7334bf9fc 100644
--- a/include/types/stream_interface.h
+++ b/include/types/stream_interface.h
@@ -80,8 +80,9 @@ enum {
 	SI_FL_RXBLK_BUFF = 0x00020000,  /* stream-int waits for a buffer allocation to complete */
 	SI_FL_RXBLK_ROOM = 0x00040000,  /* stream-int waits for more buffer room to store incoming data */
 	SI_FL_RXBLK_SHUT = 0x00080000,  /* input is now closed, nothing new will ever come */
-	SI_FL_RXBLK_ANY  = 0x000F0000,  /* any of the RXBLK flags above */
-	SI_FL_RX_WAIT_EP = 0x00100000,  /* stream-int waits for more data from the end point */
+	SI_FL_RXBLK_CONN = 0x00100000,  /* other side is not connected */
+	SI_FL_RXBLK_ANY  = 0x001F0000,  /* any of the RXBLK flags above */
+	SI_FL_RX_WAIT_EP = 0x00200000,  /* stream-int waits for more data from the end point */
 };
 
 /* A stream interface has 3 parts :