RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-01 23:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: h2: move headers and data frame decoding to their respective parsers

Browse Source 
Now we entirely process the input frame before transfering it above, so
that h2_rcv_buf() doesn't have to "speak" h2 anymore.
This commit is contained in:
Willy Tarreau 2018-02-26 15:59:07 +01:00
parent 454b57b347
commit a56a6def91
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/mux_h2.c
View File

@ -220,6 +220,8 @@ static const struct h2s *h2_idle_stream = &(const struct h2s){
static struct task *h2_timeout_task(struct task *t, void *context, unsigned short state); static struct task *h2_timeout_task(struct task *t, void *context, unsigned short state);
static struct task *h2_send(struct task *t, void *ctx, unsigned short state); static struct task *h2_send(struct task *t, void *ctx, unsigned short state);
static inline struct h2s *h2c_st_by_id(struct h2c *h2c, int id); static inline struct h2s *h2c_st_by_id(struct h2c *h2c, int id);
static int h2_frt_decode_headers(struct h2s *h2s);
static int h2_frt_transfer_data(struct h2s *h2s);
/*****************************************************/ /*****************************************************/
/* functions below are for dynamic buffer management */ /* functions below are for dynamic buffer management */
@ -1612,6 +1614,9 @@ static int h2c_frt_handle_headers(struct h2c *h2c, struct h2s *h2s)
h2s->flags |= H2_SF_ES_RCVD; h2s->flags |= H2_SF_ES_RCVD;
} }
if (!h2_frt_decode_headers(h2s))
return 0;
/* call the upper layers to process the frame, then let the upper layer /* call the upper layers to process the frame, then let the upper layer
* notify the stream about any change. * notify the stream about any change.
*/ */
@ -1683,6 +1688,9 @@ static int h2c_frt_handle_data(struct h2c *h2c, struct h2s *h2s)
goto strm_err; goto strm_err;
} }
if (!h2_frt_transfer_data(h2s))
return 0;
/* call the upper layers to process the frame, then let the upper layer /* call the upper layers to process the frame, then let the upper layer
* notify the stream about any change. * notify the stream about any change.
*/ */
@ -2959,28 +2967,8 @@ static int h2_frt_transfer_data(struct h2s *h2s)
static size_t h2_rcv_buf(struct conn_stream *cs, struct buffer *buf, size_t count, int flags) static size_t h2_rcv_buf(struct conn_stream *cs, struct buffer *buf, size_t count, int flags)
{ {
struct h2s *h2s = cs->ctx; struct h2s *h2s = cs->ctx;
struct h2c *h2c = h2s->h2c;
struct buffer *csbuf = &cs->rxbuf; struct buffer *csbuf = &cs->rxbuf;
size_t ret = 0; size_t ret;
if (h2c->st0 != H2_CS_FRAME_P)
return 0; // no pre-parsed frame yet
if (h2c->dsi != h2s->id)
return 0; // not for us
if (!b_size(&h2c->dbuf))
return 0; // empty buffer
switch (h2c->dft) {
case H2_FT_HEADERS:
ret = h2_frt_decode_headers(h2s);
break;
case H2_FT_DATA:
ret = h2_frt_transfer_data(h2s);
break;
}
/* transfer possibly pending data to the upper layer */ /* transfer possibly pending data to the upper layer */
ret = b_xfer(buf, csbuf, count); ret = b_xfer(buf, csbuf, count);