jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Output count for multi-packet decodes.

This commit is contained in:
Joel Martin 2010-06-07 14:36:26 -05:00
parent 9a09b636e7
commit 97df09b9f1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/websocket.c
View File

@ -195,8 +195,8 @@ int encode(u_char const *src, size_t srclength, char *target, size_t targsize) {
} }
int decode(char *src, size_t srclength, u_char *target, size_t targsize) { int decode(char *src, size_t srclength, u_char *target, size_t targsize) {
char *start, *end; char *start, *end, cntstr[4];
int i, len, retlen = 0; int i, len, framecount = 0, retlen = 0;
unsigned char chr; unsigned char chr;
if ((src[0] != '\x00') || (src[srclength-1] != '\xff')) { if ((src[0] != '\x00') || (src[srclength-1] != '\xff')) {
fprintf(stderr, "WebSocket framing error\n"); fprintf(stderr, "WebSocket framing error\n");
@ -206,9 +206,6 @@ int decode(char *src, size_t srclength, u_char *target, size_t targsize) {
do { do {
/* We may have more than one frame */ /* We may have more than one frame */
end = memchr(start, '\xff', srclength); end = memchr(start, '\xff', srclength);
if (end < (src+srclength-1)) {
printf("More than one frame to decode: %p < %p\n", end, src+srclength-1);
}
*end = '\x00'; *end = '\x00';
if (client_settings.do_b64encode) { if (client_settings.do_b64encode) {
len = __b64_pton(start, target+retlen, targsize-retlen); len = __b64_pton(start, target+retlen, targsize-retlen);
@ -238,7 +235,12 @@ int decode(char *src, size_t srclength, u_char *target, size_t targsize) {
} }
} }
start = end + 2; // Skip '\xff' end and '\x00' start start = end + 2; // Skip '\xff' end and '\x00' start
framecount++;
} while (end < (src+srclength-1)); } while (end < (src+srclength-1));
if (framecount > 1) {
snprintf(cntstr, 3, "%d", framecount);
traffic(cntstr);
}
return retlen; return retlen;
} }