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

ws: extensions: allow h2 headers

Browse source 
https://github.com/warmcat/libwebsockets/issues/3151
This commit is contained in:
Andy Green 2024-09-25 17:04:54 +01:00
parent da61d4df06
commit c60bff0991
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/roles/ws/server-ws.c
View file

@ -32,11 +32,11 @@ lws_extension_server_handshake(struct lws *wsi, char **p, int budget)
{
struct lws_context *context = wsi->a.context;
struct lws_context_per_thread *pt = &context->pt[(int)wsi->tsi];
char ext_name[64], *args, *end = (*p) + budget - 1;
char ext_name[64], ev[64], *args, *end = (*p) + budget - 1;
const struct lws_ext_options *opts, *po;
const struct lws_extension *ext;
struct lws_ext_option_arg oa;
int n, m, more = 1;
int n, m, more = 1, ep = 0;
int ext_count = 0;
char ignore;
char *c;
@ -123,7 +123,7 @@ lws_extension_server_handshake(struct lws *wsi, char **p, int budget)
/*
* oh, we do support this one he asked for... but let's
* confirm he only gave it once
* go on to confirm he only gave it once
*/
for (m = 0; m < wsi->ws->count_act_ext; m++)
if (wsi->ws->active_extensions[m] == ext) {
@ -173,11 +173,9 @@ lws_extension_server_handshake(struct lws *wsi, char **p, int budget)
}
if (ext_count > 1)
*(*p)++ = ',';
else
LWS_CPYAPP(*p,
"\x0d\x0aSec-WebSocket-Extensions: ");
*p += lws_snprintf(*p, lws_ptr_diff_size_t(end, *p), "%s", ext_name);
ev[ep++] = ',';
ep += lws_snprintf(ev + ep, (size_t)((int)sizeof(ev) - 1 - ep), "%s", ext_name);
/*
* The client may send a bunch of different option
@ -216,10 +214,10 @@ lws_extension_server_handshake(struct lws *wsi, char **p, int budget)
LWS_EXT_CB_OPTION_SET,
wsi->ws->act_ext_user[
wsi->ws->count_act_ext],
&oa, lws_ptr_diff_size_t(end, *p))) {
&oa, (size_t)((int)sizeof(ev) - 1 - ep))) {
*p += lws_snprintf(*p,
lws_ptr_diff_size_t(end, *p),
ep += lws_snprintf(ev + ep,
(size_t)((int)sizeof(ev) - 1 - ep),
"; %s", po->name);
lwsl_debug("adding option %s\n",
po->name);
@ -247,6 +245,17 @@ lws_extension_server_handshake(struct lws *wsi, char **p, int budget)
args = NULL;
}
if (ep) {
int mm = lws_add_http_header_by_name(wsi,
(const unsigned char *)"sec-websocket-extensions",
(unsigned char *)ev, ep, (unsigned char **)p, (unsigned char *)end);
if (mm < 0) {
lwsl_wsi_err(wsi, "Failed to add s-w-e");
return 1;
}
}
return 0;
}
#endif