summaryrefslogtreecommitdiff
path: root/test-server
diff options
context:
space:
mode:
authorAndy Green <andy@warmcat.com>2011-05-23 10:00:03 +0100
committerAndy Green <andy@warmcat.com>2011-05-23 10:00:03 +0100
commita41314f3bf6c6f827c7af95dc17431be5b5fa711 (patch)
treecdf9f882099a6d8e5e58cc99e2c4893233c9f59e /test-server
parent8214a0447e6ffbd4dae0dd66a8d1699d21b8948b (diff)
introduce x google mux very draft indeed
This is initial x-google-mux support. It's disabled by default since it's very pre-alpha. 1) To enable it, reconfigure with --enable-x-google-mux 2) It conflicts with deflate-stream, use the -u switch on the test client to disable deflate-stream 3) It deviates from the google standard by sending full headers in the addchannel subcommand rather than just changed ones from original connect 4) Quota is not implemented yet 5) Close of subchannel is not really implemented yet 6) Google opcode 0xf is changed to 0x7 to account for v7 protocol changes to opcode layout However despite those caveats, in fact it can run the test client reliably over one socket (both dumb-increment and lws-mirror-protocol), you can open a browser on the same test server too and see the circles, etc. Signed-off-by: Andy Green <andy@warmcat.com>
Diffstat (limited to 'test-server')
-rw-r--r--test-server/test-server.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/test-server/test-server.c b/test-server/test-server.c
index 2cb063c..c1cfab8 100644
--- a/test-server/test-server.c
+++ b/test-server/test-server.c
@@ -124,7 +124,7 @@ static void
dump_handshake_info(struct lws_tokens *lwst)
{
int n;
- static const char *token_names[] = {
+ static const char *token_names[WSI_TOKEN_COUNT] = {
/*[WSI_TOKEN_GET_URI] =*/ "GET URI",
/*[WSI_TOKEN_HOST] =*/ "Host",
/*[WSI_TOKEN_CONNECTION] =*/ "Connection",
@@ -148,6 +148,7 @@ dump_handshake_info(struct lws_tokens *lwst)
/*[WSI_TOKEN_ACCEPT] =*/ "Accept",
/*[WSI_TOKEN_NONCE] =*/ "Nonce",
/*[WSI_TOKEN_HTTP] =*/ "Http",
+ /*[WSI_TOKEN_MUXURL] =*/ "MuxURL",
};
for (n = 0; n < WSI_TOKEN_COUNT; n++) {
@@ -187,6 +188,7 @@ callback_dumb_increment(struct libwebsocket_context * context,
switch (reason) {
case LWS_CALLBACK_ESTABLISHED:
+ fprintf(stderr, "callback_dumb_increment: LWS_CALLBACK_ESTABLISHED\n");
pss->number = 0;
break;
@@ -266,6 +268,7 @@ callback_lws_mirror(struct libwebsocket_context * context,
switch (reason) {
case LWS_CALLBACK_ESTABLISHED:
+ fprintf(stderr, "callback_lws_mirror: LWS_CALLBACK_ESTABLISHED\n");
pss->ringbuffer_tail = ringbuffer_head;
pss->wsi = wsi;
break;