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

sspc: extend RXPRE_CONNSTATE to handle 8 or 32-bit states

Browse source 
Currently only the low 8 bits of an SS state are proxied in a total packet
length of 8 octets.  Keep that format and behaviour since all the defined
states fit in 8 bits, but also allow for 32-bit states using a packet length
of 11 octets with the same command.

This lets us proxy user states (from http mapping) which start at a user
base of 1000.
This commit is contained in:
Andy Green 2020-09-20 07:03:23 +01:00
parent 21546e511d
commit 80388bf72d
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/libwebsockets/lws-secure-streams.h
View file

@ -140,12 +140,12 @@
* - 4: metadata name
* - ...: metadata value (for rest of packet)
*
* - Proxied state
* - Proxied state (8 or 11 byte packet)
*
* - 0: LWSSS_SER_RXPRE_CONNSTATE
* - 1: 00, 05
* - 3: 1 byte state index
* - 7: 4-byte MSB-first ordinal
* - 1: 00, 05 if state < 256, else 00, 08
* - 3: 1 byte state index if state < 256, else 4-byte MSB-first state index
* - 4 or 7: 4-byte MSB-first ordinal
*
*
* Proxied tx may be read by the proxy but rejected due to lack of buffer space

27
lib/secure-streams/secure-streams-serialize.c
View file

@ -263,17 +263,26 @@ lws_ss_serialize_state(struct lws_dsh *dsh, lws_ss_constate_t state,
lws_ss_tx_ordinal_t ack)
{
uint8_t pre[8];
int n = 4;
lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name(state),
(unsigned int)ack);
pre[0] = LWSSS_SER_RXPRE_CONNSTATE;
pre[1] = 0;
pre[2] = 5;
pre[3] = (uint8_t)state;
lws_ser_wu32be(&pre[4], ack);
if (lws_dsh_alloc_tail(dsh, KIND_SS_TO_P, pre, 8, NULL, 0)) {
if (state > 255) {
pre[2] = 8;
lws_ser_wu32be(&pre[3], ack);
n = 7;
} else {
pre[2] = 5;
pre[3] = (uint8_t)state;
}
lws_ser_wu32be(&pre[n], ack);
if (lws_dsh_alloc_tail(dsh, KIND_SS_TO_P, pre, n + 4, NULL, 0)) {
lwsl_err("%s: unable to alloc in dsh 2\n", __func__);
return 1;
@ -481,10 +490,11 @@ lws_ss_deserialize_parse(struct lws_ss_serialization_parser *par,
*state != LPCSCLI_OPERATIONAL)
goto hangup;
if (par->rem < 4)
if (par->rem < 5 || par->rem > 8)
goto hangup;
par->ps = RPAR_STATEINDEX;
par->ctr = 0;
break;
case LWSSS_SER_RXPRE_METADATA:
@ -1180,8 +1190,9 @@ payload_ff:
break;
case RPAR_STATEINDEX:
par->ctr = *cp++;
par->ps = RPAR_ORD3;
par->ctr = (par->ctr << 8) | (*cp++);
if (--par->rem == 4)
par->ps = RPAR_ORD3;
break;
case RPAR_ORD3:
@ -1246,7 +1257,7 @@ payload_ff:
break;
}
if (par->ctr < 0 || par->ctr > 16)
if (par->ctr < 0)
goto hangup;
#if defined(_DEBUG)