joshua
/
websockify
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add UTF-8 wire encoding support to C wsproxy.

This commit is contained in:
Joel Martin 2010-06-07 13:47:44 -05:00
parent 7210e79e04
commit 9a09b636e7
2 changed files with 64 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
utils/websocket.c
View File

@ -156,7 +156,8 @@ int ws_socket_free(ws_ctx_t *ctx) {
int encode(u_char const *src, size_t srclength, char *target, size_t targsize) {
int sz = 0, len = 0;
int i, sz = 0, len = 0;
unsigned char chr;
target[sz++] = '\x00';
if (client_settings.do_seq_num) {
sz += sprintf(target+sz, "%d:", client_settings.seq_num);
@ -164,20 +165,39 @@ int encode(u_char const *src, size_t srclength, char *target, size_t targsize) {
}
if (client_settings.do_b64encode) {
len = __b64_ntop(src, srclength, target+sz, targsize-sz);
if (len < 0) {
return len;
}
sz += len;
} else {
fatal("UTF-8 not yet implemented");
for (i=0; i < srclength; i++) {
chr = src[i];
if (chr < 128) {
if (chr == 0x00) {
target[sz++] = '\xc4';
target[sz++] = '\x80';
} else {
target[sz++] = chr;
}
} else {
if (chr < 192) {
target[sz++] = '\xc2';
target[sz++] = chr;
} else {
target[sz++] = '\xc3';
target[sz++] = chr - 64;
}
}
}
}
if (len < 0) {
return len;
}
sz += len;
target[sz++] = '\xff';
return sz;
}
int decode(char *src, size_t srclength, u_char *target, size_t targsize) {
char *start, *end;
int len, retlen = 0;
int i, len, retlen = 0;
unsigned char chr;
if ((src[0] != '\x00') || (src[srclength-1] != '\xff')) {
fprintf(stderr, "WebSocket framing error\n");
return -1;
@ -185,20 +205,38 @@ int decode(char *src, size_t srclength, u_char *target, size_t targsize) {
start = src+1; // Skip '\x00' start
do {
/* We may have more than one frame */
end = strchr(start, '\xff');
end = memchr(start, '\xff', srclength);
if (end < (src+srclength-1)) {
printf("More than one frame to decode\n");
printf("More than one frame to decode: %p < %p\n", end, src+srclength-1);
}
*end = '\x00';
if (client_settings.do_b64encode) {
len = __b64_pton(start, target+retlen, targsize-retlen);
if (len < 0) {
return len;
}
retlen += len;
} else {
fatal("UTF-8 not yet implemented");
for (i=0; i < end-start; i++) {
chr = start[i];
if (chr < 128) {
target[retlen++] = chr;
} else {
i++;
switch (chr) {
case (unsigned char) '\xc2':
target[retlen++] = start[i];
break;
case (unsigned char) '\xc3':
target[retlen++] = start[i] + 64;
break;
case (unsigned char) '\xc4':
target[retlen++] = 0;
break;
}
}
}
}
if (len < 0) {
return len;
}
retlen += len;
start = end + 2; // Skip '\xff' end and '\x00' start
} while (end < (src+srclength-1));
return retlen;
@ -336,9 +374,8 @@ void start_server(int listen_port,
* 20 for WS '\x00' / '\xff', seq_num and good measure */
dbufsize = (bufsize * 3)/4 - 20;
} else {
fatal("UTF-8 not yet implemented");
/* UTF-8 encoding is up to 2X larger */
dbufsize = (bufsize/2) - 15;
dbufsize = (bufsize/2) - 20;
}
handler(ws_ctx);

15
utils/wsproxy.c
View File

@ -141,8 +141,8 @@ void do_proxy(ws_ctx_t *ws_ctx, int target) {
cend = encode(cbuf_tmp, bytes, cbuf, bufsize);
/*
printf("encoded: ");
for (i=0; i< bytes; i++) {
printf("%d,", *(cbuf+i));
for (i=0; i< cend; i++) {
printf("%u,", (unsigned char) *(cbuf+i));
}
printf("\n");
*/
@ -164,11 +164,18 @@ void do_proxy(ws_ctx_t *ws_ctx, int target) {
write(recordfd, tbuf_tmp + 1, bytes - 2);
write(recordfd, "',\n", 3);
}
/*
printf("before decode: ");
for (i=0; i< bytes; i++) {
printf("%u,", (unsigned char) *(tbuf_tmp+i));
}
printf("\n");
*/
len = decode(tbuf_tmp, bytes, tbuf, bufsize-1);
/*
printf("decoded: ");
for (i=0; i< bytes; i++) {
printf("%d,", *(tbuf+i));
for (i=0; i< len; i++) {
printf("%u,", (unsigned char) *(tbuf+i));
}
printf("\n");
*/