kenji/aw410k_rgb
1
Fork 0
Code Releases 2 Activity

Fix WebSocket extended length

Browse Source
This commit is contained in:
kenji
2025-09-06 11:30:48 -04:00
parent 1414d915a4
commit cc57b02d8c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
websocket.c
+4 -3
View File
@@ -354,12 +354,14 @@ static err_t ws_read(struct altcp_pcb *pcb, struct ws_state *wss, struct pbuf *p
uint8_t masked = data[1] & 0x80; uint8_t masked = data[1] & 0x80;
uint16_t msg_len = data[1] & 0x7F; uint16_t msg_len = data[1] & 0x7F;
uint8_t *msg; uint8_t *msg;
uint8_t *mask;
switch (msg_len) { switch (msg_len) {
case 126: // next two bytes are length case 126: // next two bytes are length
memcpy(&msg_len, &data[2], 2); msg_len = ( (uint16_t)data[2] << 8) | data[3];
if (len >= 8) { if (len >= 8) {
msg = &data[8]; msg = &data[8];
mask = &data[4];
} }
break; break;
case 127: // next four bytes are length case 127: // next four bytes are length
@@ -369,6 +371,7 @@ static err_t ws_read(struct altcp_pcb *pcb, struct ws_state *wss, struct pbuf *p
default: default:
if (len >= 6) { if (len >= 6) {
msg = &data[6]; msg = &data[6];
mask = &data[2];
} }
break; break;
} }
@@ -382,8 +385,6 @@ static err_t ws_read(struct altcp_pcb *pcb, struct ws_state *wss, struct pbuf *p
if (msg && ws_receive_cb != NULL) { if (msg && ws_receive_cb != NULL) {
// unmask the data if mask bit is received // unmask the data if mask bit is received
if (masked) { if (masked) {
uint8_t *mask = &data[2];
for (int i=0; i<msg_len; i++) { for (int i=0; i<msg_len; i++) {
msg[i] ^= mask[i % 4]; msg[i] ^= mask[i % 4];
} }
websocket.h
+1 -1
View File
@@ -7,7 +7,7 @@
#define WS_MAX_RETRIES 10 #define WS_MAX_RETRIES 10
#define WS_POLL_INTERVAL 60 // WS_POLL_INTERVAL/2 seconds #define WS_POLL_INTERVAL 60 // WS_POLL_INTERVAL/2 seconds
#define WS_MAX_CONN 4 #define WS_MAX_CONN 4
#define WS_BUFFER_SIZE 512 #define WS_BUFFER_SIZE 1024
#define OP_CONT 0x00 #define OP_CONT 0x00
#define OP_TEXT 0x01 #define OP_TEXT 0x01