ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 21:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-10150: [freeswitch-core] Reduce writes to closed ssl sockets #resolve

Browse Source
This commit is contained in:
Anthony Minessale
2017-03-17 13:47:35 -05:00
parent 4a56cc6401
commit cd5182c27c
4 changed files with 117 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/endpoints/mod_verto/ws.c
+19 -15
View File
@@ -272,7 +272,7 @@ int ws_handshake(wsh_t *wsh)
}
}
if (bytes > wsh->buflen -1) {
if (bytes < 0 || bytes > wsh->buflen -1) {
goto err;
}
@@ -331,11 +331,13 @@ int ws_handshake(wsh_t *wsh)
if (!wsh->stay_open) {
snprintf(respond, sizeof(respond), "HTTP/1.1 400 Bad Request\r\n"
"Sec-WebSocket-Version: 13\r\n\r\n");
respond[511] = 0;
if (bytes > 0) {
snprintf(respond, sizeof(respond), "HTTP/1.1 400 Bad Request\r\n"
"Sec-WebSocket-Version: 13\r\n\r\n");
respond[511] = 0;
ws_raw_write(wsh, respond, strlen(respond));
ws_raw_write(wsh, respond, strlen(respond));
}
ws_close(wsh, WS_NONE);
}
@@ -769,20 +771,22 @@ ssize_t ws_read_frame(wsh_t *wsh, ws_opcode_t *oc, uint8_t **data)
}
if (!wsh->handshake) {
return ws_close(wsh, WS_PROTO_ERR);
return ws_close(wsh, WS_NONE);
}
if ((wsh->datalen = ws_raw_read(wsh, wsh->buffer, 9, wsh->block)) < 0) {
if (wsh->datalen == -2) {
return -2;
}
return ws_close(wsh, WS_PROTO_ERR);
return ws_close(wsh, WS_NONE);
}
if (wsh->datalen < need) {
if ((wsh->datalen += ws_raw_read(wsh, wsh->buffer + wsh->datalen, 9 - wsh->datalen, WS_BLOCK)) < need) {
ssize_t bytes = ws_raw_read(wsh, wsh->buffer + wsh->datalen, 9 - wsh->datalen, WS_BLOCK);
if (bytes < 0 || (wsh->datalen += bytes) < need) {
/* too small - protocol err */
return ws_close(wsh, WS_PROTO_ERR);
return ws_close(wsh, WS_NONE);
}
}
@@ -818,7 +822,7 @@ ssize_t ws_read_frame(wsh_t *wsh, ws_opcode_t *oc, uint8_t **data)
if (need > wsh->datalen) {
/* too small - protocol err */
*oc = WSOC_CLOSE;
return ws_close(wsh, WS_PROTO_ERR);
return ws_close(wsh, WS_NONE);
}
}
@@ -838,9 +842,9 @@ ssize_t ws_read_frame(wsh_t *wsh, ws_opcode_t *oc, uint8_t **data)
more = ws_raw_read(wsh, wsh->buffer + wsh->datalen, need - wsh->datalen, WS_BLOCK);
if (more < need - wsh->datalen) {
if (more < 0 || more < need - wsh->datalen) {
*oc = WSOC_CLOSE;
return ws_close(wsh, WS_PROTO_ERR);
return ws_close(wsh, WS_NONE);
} else {
wsh->datalen += more;
}
@@ -859,7 +863,7 @@ ssize_t ws_read_frame(wsh_t *wsh, ws_opcode_t *oc, uint8_t **data)
if (need > wsh->datalen) {
/* too small - protocol err */
*oc = WSOC_CLOSE;
return ws_close(wsh, WS_PROTO_ERR);
return ws_close(wsh, WS_NONE);
}
u16 = (uint16_t *) wsh->payload;
@@ -877,7 +881,7 @@ ssize_t ws_read_frame(wsh_t *wsh, ws_opcode_t *oc, uint8_t **data)
if (need < 0) {
/* invalid read - protocol err .. */
*oc = WSOC_CLOSE;
return ws_close(wsh, WS_PROTO_ERR);
return ws_close(wsh, WS_NONE);
}
blen = wsh->body - wsh->bbuffer;
@@ -908,7 +912,7 @@ ssize_t ws_read_frame(wsh_t *wsh, ws_opcode_t *oc, uint8_t **data)
if (r < 1) {
/* invalid read - protocol err .. */
*oc = WSOC_CLOSE;
return ws_close(wsh, WS_PROTO_ERR);
return ws_close(wsh, WS_NONE);
}
wsh->datalen += r;