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

more robust subprotocol selection handling with test

Browse source
This commit is contained in:
Rene Jager 2014-12-06 16:22:28 +01:00
parent abc3a7859e
commit 191098c95f
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/client.c
View file

@ -589,11 +589,22 @@ lws_client_interpret_server_handshake(struct libwebsocket_context *context,
wsi->protocol = &context->protocols[n];
break;
} else {
char* sp = strstr(context->protocols[n].name, p);
if (sp && (sp[len] == ',' || sp[len] == '\0')) {
wsi->protocol = &context->protocols[n];
break;
int found = 0;
const char* nameptr = context->protocols[n].name;
char* sp = strstr(nameptr, p);
while (sp && !found) {
if ((sp[len] == ',' || sp[len] == '\0')
&& (sp == nameptr
|| (sp > nameptr
&& (sp[-1] == ',' || sp[-1] == ' ')))) {
wsi->protocol = &context->protocols[n];
found = 1;
break;
}
sp = strstr(sp + 1, p);
}
if (found)
break;
}
n++;
}

4
test-server/test-client.c
View file

@ -221,13 +221,13 @@ callback_lws_mirror(struct libwebsocket_context *context,
static struct libwebsocket_protocols protocols[] = {
{
"dumb-increment-protocol,fake-nonexistant-protocol",
"dumb-increment-protocol-nonexistant,dumb-increment-protocol,fake-nonexistant-protocol",
callback_dumb_increment,
0,
20,
},
{
"fake-nonexistant-protocol,lws-mirror-protocol",
"lws-mirror-protocol-nonexistant,fake-nonexistant-protocol,lws-mirror-protocol",
callback_lws_mirror,
0,
128,