stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

eliminate dummy 76 challenge content in 04 plus

Browse source 
Signed-off-by: Andy Green <andy@warmcat.com>
This commit is contained in:
Andy Green 2011-02-14 09:14:24 +00:00
parent 4b6fbe125e
commit abbf461998
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/parsers.c
View file

@ -119,12 +119,21 @@ int libwebsocket_parse(struct libwebsocket *wsi, unsigned char c)
wsi->utf8_token[wsi->parser_state].token_len != 8) wsi->utf8_token[wsi->parser_state].token_len != 8)
break; break;
/* <= 03 has old handshake with version header */ /* <= 03 has old handshake with version header needs 8 bytes */
if (wsi->utf8_token[WSI_TOKEN_VERSION].token_len && if (wsi->utf8_token[WSI_TOKEN_VERSION].token_len &&
atoi(wsi->utf8_token[WSI_TOKEN_VERSION].token) < 4 && atoi(wsi->utf8_token[WSI_TOKEN_VERSION].token) < 4 &&
wsi->utf8_token[wsi->parser_state].token_len != 8) wsi->utf8_token[wsi->parser_state].token_len != 8)
break; break;
/* no payload challenge in 01 + */
if (wsi->utf8_token[WSI_TOKEN_VERSION].token_len &&
atoi(wsi->utf8_token[WSI_TOKEN_VERSION].token) > 0) {
wsi->utf8_token[wsi->parser_state].token_len = 0;
free(wsi->utf8_token[wsi->parser_state].token);
wsi->utf8_token[wsi->parser_state].token = NULL;
}
/* For any supported protocol we have enough payload */ /* For any supported protocol we have enough payload */
debug("Setting WSI_PARSING_COMPLETE\n"); debug("Setting WSI_PARSING_COMPLETE\n");
@ -185,6 +194,9 @@ int libwebsocket_parse(struct libwebsocket *wsi, unsigned char c)
atoi(wsi->utf8_token[WSI_TOKEN_VERSION].token) >= 4) { atoi(wsi->utf8_token[WSI_TOKEN_VERSION].token) >= 4) {
debug("04 header completed\n"); debug("04 header completed\n");
wsi->parser_state = WSI_PARSING_COMPLETE; wsi->parser_state = WSI_PARSING_COMPLETE;
wsi->utf8_token[WSI_TOKEN_CHALLENGE].token_len = 0;
free(wsi->utf8_token[WSI_TOKEN_CHALLENGE].token);
wsi->utf8_token[WSI_TOKEN_CHALLENGE].token = NULL;
} }
/* client parser? */ /* client parser? */