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

Support compressed packets bigger than MAX_USER_RX_BUFFER.

Browse source 
(AG adapted style and removed logging stuff)
This commit is contained in:
David Galeano 2013-01-10 09:41:06 +08:00 • committed by Andy Green
parent 4c38f14527
commit 2605ffe277
2 changed files with 116 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

173
lib/extension-deflate-frame.c
View file

@ -15,8 +15,9 @@ int lws_extension_callback_deflate_frame(
void *user, void *in, size_t len) void *user, void *in, size_t len)
{ {
struct lws_ext_deflate_frame_conn *conn = struct lws_ext_deflate_frame_conn *conn =
(struct lws_ext_deflate_frame_conn *)user; (struct lws_ext_deflate_frame_conn *)user;
struct lws_tokens *eff_buf = (struct lws_tokens *)in; struct lws_tokens *eff_buf = (struct lws_tokens *)in;
size_t current_payload, remaining_payload, total_payload;
int n; int n;
switch (reason) { switch (reason) {
@ -32,61 +33,109 @@ int lws_extension_callback_deflate_frame(
conn->zs_in.opaque = conn->zs_out.opaque = Z_NULL; conn->zs_in.opaque = conn->zs_out.opaque = Z_NULL;
n = inflateInit2(&conn->zs_in, -LWS_ZLIB_WINDOW_BITS); n = inflateInit2(&conn->zs_in, -LWS_ZLIB_WINDOW_BITS);
if (n != Z_OK) { if (n != Z_OK) {
lws_log(LWS_LOG_WARNING, "deflateInit returned %d", n); fprintf(stderr, "deflateInit returned %d", n);
return 1; return 1;
} }
n = deflateInit2(&conn->zs_out, n = deflateInit2(&conn->zs_out,
DEFLATE_FRAME_COMPRESSION_LEVEL, Z_DEFLATED, DEFLATE_FRAME_COMPRESSION_LEVEL, Z_DEFLATED,
-LWS_ZLIB_WINDOW_BITS, LWS_ZLIB_MEMLEVEL, -LWS_ZLIB_WINDOW_BITS, LWS_ZLIB_MEMLEVEL,
Z_DEFAULT_STRATEGY); Z_DEFAULT_STRATEGY);
if (n != Z_OK) { if (n != Z_OK) {
lws_log(LWS_LOG_WARNING, "deflateInit returned %d", n); fprintf(stderr, "deflateInit returned %d", n);
return 1; return 1;
} }
conn->buf_pre_used = 0;
conn->buf_pre_length = 0;
conn->buf_in_length = MAX_USER_RX_BUFFER; conn->buf_in_length = MAX_USER_RX_BUFFER;
conn->buf_out_length = MAX_USER_RX_BUFFER; conn->buf_out_length = MAX_USER_RX_BUFFER;
conn->compressed_out = 0; conn->compressed_out = 0;
conn->buf_in = (unsigned char *)malloc(LWS_SEND_BUFFER_PRE_PADDING + conn->buf_pre = NULL;
conn->buf_in_length + conn->buf_in = (unsigned char *)
LWS_SEND_BUFFER_POST_PADDING); malloc(LWS_SEND_BUFFER_PRE_PADDING +
conn->buf_out = (unsigned char *)malloc(LWS_SEND_BUFFER_PRE_PADDING + conn->buf_in_length +
conn->buf_out_length + LWS_SEND_BUFFER_POST_PADDING);
LWS_SEND_BUFFER_POST_PADDING); conn->buf_out = (unsigned char *)
lws_log(LWS_LOG_DEBUG, "zlibs constructed"); malloc(LWS_SEND_BUFFER_PRE_PADDING +
conn->buf_out_length +
LWS_SEND_BUFFER_POST_PADDING);
fprintf(stderr, "zlibs constructed");
break; break;
case LWS_EXT_CALLBACK_DESTROY: case LWS_EXT_CALLBACK_DESTROY:
if (conn->buf_pre)
{
free(conn->buf_pre);
}
free(conn->buf_in); free(conn->buf_in);
free(conn->buf_out); free(conn->buf_out);
conn->buf_pre_used = 0;
conn->buf_pre_length = 0;
conn->buf_in_length = 0; conn->buf_in_length = 0;
conn->buf_out_length = 0; conn->buf_out_length = 0;
conn->compressed_out = 0; conn->compressed_out = 0;
(void)inflateEnd(&conn->zs_in); (void)inflateEnd(&conn->zs_in);
(void)deflateEnd(&conn->zs_out); (void)deflateEnd(&conn->zs_out);
lws_log(LWS_LOG_DEBUG, "zlibs destructed"); fprintf(stderr, "zlibs destructed");
break; break;
case LWS_EXT_CALLBACK_PAYLOAD_RX: case LWS_EXT_CALLBACK_PAYLOAD_RX:
if ((libwebsocket_get_reserved_bits(wsi) & 0x40) == 0) if (!(wsi->rsv & 0x40))
return 0; return 0;
/* /*
* inflate the incoming payload * inflate the incoming payload
*/ */
conn->zs_in.next_in = (unsigned char *)eff_buf->token; current_payload = eff_buf->token_len;
conn->zs_in.avail_in = eff_buf->token_len;
conn->zs_in.next_in[eff_buf->token_len + 0] = 0; remaining_payload = wsi->rx_packet_length;
conn->zs_in.next_in[eff_buf->token_len + 1] = 0; if (remaining_payload) {
conn->zs_in.next_in[eff_buf->token_len + 2] = 0xff; total_payload = conn->buf_pre_used +
conn->zs_in.next_in[eff_buf->token_len + 3] = 0xff; current_payload +
conn->zs_in.avail_in += 4; remaining_payload;
if (conn->buf_pre_length < total_payload) {
conn->buf_pre_length = total_payload;
if (conn->buf_pre)
free(conn->buf_pre);
conn->buf_pre =
(unsigned char *)malloc(total_payload + 4);
}
memcpy(conn->buf_pre + conn->buf_pre_used,
eff_buf->token, current_payload);
conn->buf_pre_used += current_payload;
eff_buf->token = NULL;
eff_buf->token_len = 0;
return 0;
}
if (conn->buf_pre_used) {
total_payload = conn->buf_pre_used +
current_payload;
memcpy(conn->buf_pre + conn->buf_pre_used,
eff_buf->token, current_payload);
conn->buf_pre_used = 0;
conn->zs_in.next_in = conn->buf_pre;
} else {
total_payload = current_payload;
conn->zs_in.next_in = (unsigned char *)eff_buf->token;
}
conn->zs_in.next_in[total_payload + 0] = 0;
conn->zs_in.next_in[total_payload + 1] = 0;
conn->zs_in.next_in[total_payload + 2] = 0xff;
conn->zs_in.next_in[total_payload + 3] = 0xff;
conn->zs_in.avail_in = total_payload + 4;
conn->zs_in.next_out = conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING; conn->zs_in.next_out = conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING;
conn->zs_in.avail_out = conn->buf_in_length; conn->zs_in.avail_out = conn->buf_in_length;
while (1) while (1) {
{
n = inflate(&conn->zs_in, Z_SYNC_FLUSH); n = inflate(&conn->zs_in, Z_SYNC_FLUSH);
switch (n) { switch (n) {
case Z_NEED_DICT: case Z_NEED_DICT:
@ -96,35 +145,38 @@ int lws_extension_callback_deflate_frame(
* screwed.. close the connection... we will get a * screwed.. close the connection... we will get a
* destroy callback to take care of closing nicely * destroy callback to take care of closing nicely
*/ */
lws_log(LWS_LOG_ERROR, "zlib error inflate %d: %s", n, conn->zs_in.msg); fprintf(stderr, "zlib error inflate %d: %s",
n, conn->zs_in.msg);
return -1; return -1;
} }
if (conn->zs_in.avail_in > 0) if (conn->zs_in.avail_in > 0) {
{ size_t len_so_far = (conn->zs_in.next_out -
size_t len_so_far = (conn->zs_in.next_out - (conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING)); (conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING));
unsigned char *new_buf; unsigned char *new_buf;
conn->buf_in_length *= 2; conn->buf_in_length *= 2;
new_buf = (unsigned char *)malloc(LWS_SEND_BUFFER_PRE_PADDING + new_buf = (unsigned char *)
conn->buf_in_length + malloc(LWS_SEND_BUFFER_PRE_PADDING +
LWS_SEND_BUFFER_POST_PADDING); conn->buf_in_length +
LWS_SEND_BUFFER_POST_PADDING);
memcpy(new_buf + LWS_SEND_BUFFER_PRE_PADDING, memcpy(new_buf + LWS_SEND_BUFFER_PRE_PADDING,
conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING, conn->buf_in +
LWS_SEND_BUFFER_PRE_PADDING,
len_so_far); len_so_far);
free(conn->buf_in); free(conn->buf_in);
conn->buf_in = new_buf; conn->buf_in = new_buf;
conn->zs_in.next_out = (new_buf + LWS_SEND_BUFFER_PRE_PADDING + len_so_far); conn->zs_in.next_out = (new_buf +
conn->zs_in.avail_out = (conn->buf_in_length - len_so_far); LWS_SEND_BUFFER_PRE_PADDING + len_so_far);
} conn->zs_in.avail_out =
else conn->buf_in_length - len_so_far;
{ } else
break; break;
}
} }
/* rewrite the buffer pointers and length */ /* rewrite the buffer pointers and length */
eff_buf->token = (char *)(conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING); eff_buf->token = (char *)(conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING);
eff_buf->token_len = (int)(conn->zs_in.next_out - (conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING)); eff_buf->token_len = (int)(conn->zs_in.next_out -
(conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING));
return 0; return 0;
@ -138,52 +190,54 @@ int lws_extension_callback_deflate_frame(
conn->zs_out.next_out = conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING; conn->zs_out.next_out = conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING;
conn->zs_out.avail_out = conn->buf_out_length; conn->zs_out.avail_out = conn->buf_out_length;
while (1) while (1) {
{
n = deflate(&conn->zs_out, Z_SYNC_FLUSH); n = deflate(&conn->zs_out, Z_SYNC_FLUSH);
if (n == Z_STREAM_ERROR) { if (n == Z_STREAM_ERROR) {
/* /*
* screwed.. close the connection... we will get a * screwed.. close the connection... we will get a
* destroy callback to take care of closing nicely * destroy callback to take care of closing nicely
*/ */
lws_log(LWS_LOG_ERROR, "zlib error deflate"); fprintf(stderr, "zlib error deflate");
return -1; return -1;
} }
if (conn->zs_out.avail_in > 0) if (!conn->zs_out.avail_out) {
{ size_t len_so_far = (conn->zs_out.next_out -
size_t len_so_far = (conn->zs_out.next_out - (conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING)); (conn->buf_out +
LWS_SEND_BUFFER_PRE_PADDING));
unsigned char *new_buf; unsigned char *new_buf;
conn->buf_out_length *= 2; conn->buf_out_length *= 2;
new_buf = (unsigned char *)malloc(LWS_SEND_BUFFER_PRE_PADDING + new_buf = (unsigned char *)
conn->buf_out_length + malloc(LWS_SEND_BUFFER_PRE_PADDING +
LWS_SEND_BUFFER_POST_PADDING); conn->buf_out_length +
LWS_SEND_BUFFER_POST_PADDING);
memcpy(new_buf + LWS_SEND_BUFFER_PRE_PADDING, memcpy(new_buf + LWS_SEND_BUFFER_PRE_PADDING,
conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING, conn->buf_out +
LWS_SEND_BUFFER_PRE_PADDING,
len_so_far); len_so_far);
free(conn->buf_out); free(conn->buf_out);
conn->buf_out = new_buf; conn->buf_out = new_buf;
conn->zs_out.next_out = (new_buf + LWS_SEND_BUFFER_PRE_PADDING + len_so_far); conn->zs_out.next_out = (new_buf +
conn->zs_out.avail_out = (conn->buf_out_length - len_so_far); LWS_SEND_BUFFER_PRE_PADDING + len_so_far);
} conn->zs_out.avail_out =
else (conn->buf_out_length - len_so_far);
{ } else
break; break;
}
} }
conn->compressed_out = 1; conn->compressed_out = 1;
/* rewrite the buffer pointers and length */ /* rewrite the buffer pointers and length */
eff_buf->token = (char *)(conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING); eff_buf->token = (char *)(conn->buf_out +
eff_buf->token_len = (int)(conn->zs_out.next_out - (conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING)) - 4; LWS_SEND_BUFFER_PRE_PADDING);
eff_buf->token_len = (int)(conn->zs_out.next_out -
(conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING)) - 4;
return 0; return 0;
case LWS_EXT_CALLBACK_PACKET_TX_PRESEND: case LWS_EXT_CALLBACK_PACKET_TX_PRESEND:
if (conn->compressed_out) if (conn->compressed_out) {
{
conn->compressed_out = 0; conn->compressed_out = 0;
*((unsigned char *)eff_buf->token) |= 0x40; *((unsigned char *)eff_buf->token) |= 0x40;
} }
@ -191,10 +245,8 @@ int lws_extension_callback_deflate_frame(
case LWS_EXT_CALLBACK_CHECK_OK_TO_PROPOSE_EXTENSION: case LWS_EXT_CALLBACK_CHECK_OK_TO_PROPOSE_EXTENSION:
/* Avoid x-webkit-deflate-frame extension on client */ /* Avoid x-webkit-deflate-frame extension on client */
if (strcmp((char *)in, "x-webkit-deflate-frame") == 0) if (!strcmp((char *)in, "x-webkit-deflate-frame"))
{
return 1; return 1;
}
break; break;
default: default:
@ -203,3 +255,4 @@ int lws_extension_callback_deflate_frame(
return 0; return 0;
} }

3
lib/extension-deflate-frame.h
View file

@ -6,9 +6,12 @@
struct lws_ext_deflate_frame_conn { struct lws_ext_deflate_frame_conn {
z_stream zs_in; z_stream zs_in;
z_stream zs_out; z_stream zs_out;
int buf_pre_used;
int buf_pre_length;
int buf_in_length; int buf_in_length;
int buf_out_length; int buf_out_length;
int compressed_out; int compressed_out;
unsigned char *buf_pre;
unsigned char *buf_in; unsigned char *buf_in;
unsigned char *buf_out; unsigned char *buf_out;
}; };