MINOR: mux-h2: Add a function to propagate termination flags from h2s to SE

The function h2s_propagate_term_flags() was added to check the H2S state and
evaluate when EOI/EOS/ERR_PENDING/ERROR flags must be set on the SE. It is
not the only place where those flags are set. But it centralizes the synchro
between the H2 stream and the SC.

For now, this function is only used at the end of h2_rcv_buf(). But it will
be used to fix a bug.

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 587b98f9e6e84d3a1ba86c3186f706eedca55da5..2ca4d28a9a2f286d6703622f6cb001dac44f4b27 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1447,6 +1447,26 @@ static inline void h2s_close(struct h2s *h2s)
        h2s->st = H2_SS_CLOSED;
 }
 
+/* Check h2c and h2s flags to evaluate if EOI/EOS/ERR_PENDING/ERROR flags must
+ * be set on the SE.
+ */
+static inline void h2s_propagate_term_flags(struct h2c *h2c, struct h2s *h2s)
+{
+       if (h2s->flags & H2_SF_ES_RCVD) {
+               se_fl_set(h2s->sd, SE_FL_EOI);
+               /* Add EOS flag for tunnel */
+               if (h2s->flags & H2_SF_BODY_TUNNEL)
+                       se_fl_set(h2s->sd, SE_FL_EOS);
+       }
+       if (h2c_read0_pending(h2c) || h2s->st == H2_SS_CLOSED) {
+               se_fl_set(h2s->sd, SE_FL_EOS);
+               if (!se_fl_test(h2s->sd, SE_FL_EOI))
+                       se_fl_set(h2s->sd, SE_FL_ERROR);
+       }
+       if (se_fl_test(h2s->sd, SE_FL_ERR_PENDING))
+               se_fl_set(h2s->sd, SE_FL_ERROR);
+}
+
 /* detaches an H2 stream from its H2C and releases it to the H2S pool. */
 /* h2s_destroy should only ever be called by the thread that owns the stream,
  * that means that a tasklet should be used if we want to destroy the h2s
@@ -6468,19 +6488,7 @@ static size_t h2_rcv_buf(struct stconn *sc, struct buffer *buf, size_t count, in
                }
 
                se_fl_clr(h2s->sd, SE_FL_RCV_MORE | SE_FL_WANT_ROOM);
-               if (h2s->flags & H2_SF_ES_RCVD) {
-                       se_fl_set(h2s->sd, SE_FL_EOI);
-                       /* Add EOS flag for tunnel */
-                       if (h2s->flags & H2_SF_BODY_TUNNEL)
-                               se_fl_set(h2s->sd, SE_FL_EOS);
-               }
-               if (h2c_read0_pending(h2c) || h2s->st == H2_SS_CLOSED) {
-                       se_fl_set(h2s->sd, SE_FL_EOS);
-                       if (!se_fl_test(h2s->sd, SE_FL_EOI))
-                               se_fl_set(h2s->sd, SE_FL_ERROR);
-               }
-               if (se_fl_test(h2s->sd, SE_FL_ERR_PENDING))
-                       se_fl_set(h2s->sd, SE_FL_ERROR);
+               h2s_propagate_term_flags(h2c, h2s);
                if (b_size(&h2s->rxbuf)) {
                        b_free(&h2s->rxbuf);
                        offer_buffers(NULL, 1);