romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 23:23:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

ws: corrected curlws_cont to reflect its documented purpose

Browse source 
Verified in test 2311

Closes #16512
This commit is contained in:
Ethan Wilkes 2025-02-27 16:21:28 -06:00 • committed by Daniel Stenberg
parent a66ede5309
commit fa3d1e7d43
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
6 changed files with 193 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/ws.c
View file

@ -168,6 +168,7 @@ static void ws_dec_reset(struct ws_decoder *dec)
dec->payload_len = 0;
dec->head_len = dec->head_total = 0;
dec->state = WS_DEC_INIT;
dec->fin_bit = TRUE;
}
static void ws_dec_init(struct ws_decoder *dec)
@ -187,6 +188,8 @@ static CURLcode ws_dec_read_head(struct ws_decoder *dec,
dec->head[0] = *inbuf;
Curl_bufq_skip(inraw, 1);
dec->fin_bit = (dec->head[0] & WSBIT_FIN) ? TRUE : FALSE;
if(!ws_frame_rsv_supported(dec->head[0])) {
failf(data, "WS: unknown reserved bit in frame header: %x",
dec->head[0] & WSBIT_RSV_MASK);
@ -370,11 +373,20 @@ static void update_meta(struct websocket *ws,
curl_off_t payload_len,
size_t cur_len)
{
curl_off_t bytesleft = (payload_len - payload_offset - cur_len);
ws->frame.age = frame_age;
ws->frame.flags = frame_flags;
ws->frame.offset = payload_offset;
ws->frame.len = cur_len;
ws->frame.bytesleft = (payload_len - payload_offset - cur_len);
ws->frame.bytesleft = bytesleft;
if(!ws->dec.fin_bit || bytesleft > 0) {
ws->frame.flags |= CURLWS_CONT;
}
else {
ws->frame.flags &= ~CURLWS_CONT;
}
}
/* WebSockets decoding client writer */

1
lib/ws.h
View file

@ -43,6 +43,7 @@ struct ws_decoder {
unsigned char head[10];
int head_len, head_total;
enum ws_dec_state state;
bool fin_bit;
};
/* a client-side WS frame encoder, generating frame headers and