Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

x google mux change to new compact channel index scheme

Browse source 
Signed-off-by: Andy Green <andy@warmcat.com>
This commit is contained in:
Andy Green 2011-05-24 23:08:05 +01:00
parent 69b6808358
commit a59bb9016c
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lib/extension-x-google-mux.c
View file

@ -32,19 +32,33 @@ static int lws_addheader_mux_opcode(unsigned char *pb, int len)
return pb - start;
}
static int lws_mux_subcommand_header(int cmd, int channel, unsigned char *pb, int len)
static int
lws_mux_subcommand_header(int cmd, int channel, unsigned char *pb, int len)
{
unsigned char *start = pb;
*pb++ = ((channel >> 8) << 3) | cmd;
*pb++ = channel;
if (channel < 31)
*pb++ = (channel << 3) | cmd;
else {
*pb++ = (31 << 3) | cmd;
*pb++ = channel >> 8;
*pb++ = channel;
}
if (len <= 253)
*pb++ = len;
else {
*pb++ = 254;
*pb++ = len >> 8;
*pb++ = len;
if (len <= 65535) {
*pb++ = 254;
*pb++ = len >> 8;
*pb++ = len;
} else {
*pb++ = 255;
*pb++ = len >> 24;
*pb++ = len >> 16;
*pb++ = len >> 8;
*pb++ = len;
}
}
return pb - start;
@ -134,15 +148,25 @@ lws_extension_x_google_mux_parser(struct libwebsocket_context *context,
case LWS_EXT_XGM_STATE__MUX_BLOCK_1:
muxdebug("LWS_EXT_XGM_STATE__MUX_BLOCK_1: opc=%d\n", c & 7);
conn->block_subopcode = c & 7;
conn->block_subchannel = (c << 5) & ~0xff;
conn->state = LWS_EXT_XGM_STATE__MUX_BLOCK_2;
conn->block_subchannel = (c >> 3) & ~0x1f;
if (conn->block_subchannel != 31)
goto interpret;
else
conn->state = LWS_EXT_XGM_STATE__MUX_BLOCK_2;
break;
case LWS_EXT_XGM_STATE__MUX_BLOCK_2:
conn->block_subchannel = c << 8;
conn->state = LWS_EXT_XGM_STATE__MUX_BLOCK_3;
break;
case LWS_EXT_XGM_STATE__MUX_BLOCK_3:
conn->block_subchannel |= c;
muxdebug("LWS_EXT_XGM_STATE__MUX_BLOCK_2: subchannel=%d\n", conn->block_subchannel);
ongoing_subchannel = ongoing_subchannel;
interpret:
ongoing_subchannel = conn->block_subchannel;
/*
* convert the subchannel index to a child wsi

1
lib/extension-x-google-mux.h
View file

@ -26,6 +26,7 @@ void muxdebug(const char *format, ...)
enum lws_ext_x_google_mux__parser_states {
LWS_EXT_XGM_STATE__MUX_BLOCK_1,
LWS_EXT_XGM_STATE__MUX_BLOCK_2,
LWS_EXT_XGM_STATE__MUX_BLOCK_3,
LWS_EXT_XGM_STATE__ADDCHANNEL_LEN,
LWS_EXT_XGM_STATE__ADDCHANNEL_LEN16_1,
LWS_EXT_XGM_STATE__ADDCHANNEL_LEN16_2,