RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-29 22:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: h2: clarify the fact that the send functions are unsigned

Browse Source 
There's no more error return combined with the send output, though
the comments were misleading. Let's fix this as well as the functions'
prototypes. h2_snd_buf()'s return value wasn't changed yet since it
has to match the ->snd_buf prototype.
This commit is contained in:
Willy Tarreau 2018-06-14 13:21:28 +02:00
parent 7314be8e2c
commit 1dc41e75d8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mux_h2.c
View File

@ -2939,11 +2939,11 @@ static int h2_rcv_buf(struct conn_stream *cs, struct buffer *buf, int count)
} }
/* Try to send a HEADERS frame matching HTTP/1 response present in buffer <buf> /* Try to send a HEADERS frame matching HTTP/1 response present in buffer <buf>
* for the H2 stream <h2s>. Returns 0 if not possible yet, <0 on error (one of * for the H2 stream <h2s>. Returns the number of bytes sent. The caller must
* the H2_ERR* or h2_status codes), >0 on success in which case it corresponds * check the stream's status to detect any error which might have happened
* to the number of buffer bytes consumed. * subsequently to a successful send.
*/ */
static int h2s_frt_make_resp_headers(struct h2s *h2s, struct buffer *buf) static size_t h2s_frt_make_resp_headers(struct h2s *h2s, struct buffer *buf)
{ {
struct http_hdr list[MAX_HTTP_HDR]; struct http_hdr list[MAX_HTTP_HDR];
struct h2c *h2c = h2s->h2c; struct h2c *h2c = h2s->h2c;
@ -3112,17 +3112,17 @@ static int h2s_frt_make_resp_headers(struct h2s *h2s, struct buffer *buf)
} }
/* Try to send a DATA frame matching HTTP/1 response present in the response /* Try to send a DATA frame matching HTTP/1 response present in the response
* buffer <buf>, for stream <h2s>. Returns 0 if not possible yet, <0 on error * buffer <buf>, for stream <h2s>. Returns the number of bytes sent. The caller
* (one of the H2_ERR* or h2_status codes), >0 on success in which case it * must check the stream's status to detect any error which might have happened
* corresponds to the number of buffer bytes consumed. * subsequently to a successful send.
*/ */
static int h2s_frt_make_resp_data(struct h2s *h2s, struct buffer *buf) static size_t h2s_frt_make_resp_data(struct h2s *h2s, struct buffer *buf)
{ {
struct h2c *h2c = h2s->h2c; struct h2c *h2c = h2s->h2c;
struct h1m *h1m = &h2s->res; struct h1m *h1m = &h2s->res;
struct chunk outbuf; struct chunk outbuf;
int ret = 0; int ret = 0;
int total = 0; size_t total = 0;
int es_now = 0; int es_now = 0;
int size = 0; int size = 0;
char *blk1, *blk2; char *blk1, *blk2;
@ -3357,7 +3357,7 @@ static int h2s_frt_make_resp_data(struct h2s *h2s, struct buffer *buf)
} }
end: end:
trace("[%d] sent simple H2 DATA response (sid=%d) = %d bytes out (%d in, st=%s, ep=%u, es=%s, h2cws=%d h2sws=%d) buf->o=%u", h2c->st0, h2s->id, size+9, total, h1_msg_state_str(h1m->state), h1m->err_pos, h1_msg_state_str(h1m->err_state), h2c->mws, h2s->mws, (unsigned int)buf->o); trace("[%d] sent simple H2 DATA response (sid=%d) = %d bytes out (%u in, st=%s, ep=%u, es=%s, h2cws=%d h2sws=%d) buf->o=%u", h2c->st0, h2s->id, size+9, (unsigned int)total, h1_msg_state_str(h1m->state), h1m->err_pos, h1_msg_state_str(h1m->err_state), h2c->mws, h2s->mws, (unsigned int)buf->o);
return total; return total;
} }
@ -3365,7 +3365,7 @@ static int h2s_frt_make_resp_data(struct h2s *h2s, struct buffer *buf)
static int h2_snd_buf(struct conn_stream *cs, struct buffer *buf, int flags) static int h2_snd_buf(struct conn_stream *cs, struct buffer *buf, int flags)
{ {
struct h2s *h2s = cs->ctx; struct h2s *h2s = cs->ctx;
int total = 0; size_t total = 0;
if (!(h2s->flags & H2_SF_OUTGOING_DATA) && buf->o) if (!(h2s->flags & H2_SF_OUTGOING_DATA) && buf->o)
h2s->flags |= H2_SF_OUTGOING_DATA; h2s->flags |= H2_SF_OUTGOING_DATA;