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

h2: ping pong: separate payloads

Browse source 
https://github.com/warmcat/libwebsockets/pull/2413
This commit is contained in:
oaleshina 2021-09-13 17:57:08 +03:00 • committed by Andy Green
parent 733f0c10f0
commit 17199959aa
4 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/roles/h2/ops-h2.c
View file

@ -1177,7 +1177,7 @@ rops_perform_user_POLLOUT_h2(struct lws *wsi)
* then logically close ourself
*/
if ((lwsi_role_ws(w) && w->ws->ping_pending_flag) ||
if ((lwsi_role_ws(w) && w->ws->pong_pending_flag) ||
(lwsi_state(w) == LRS_RETURNED_CLOSE &&
w->ws->payload_is_close)) {
@ -1185,13 +1185,13 @@ rops_perform_user_POLLOUT_h2(struct lws *wsi)
write_type = LWS_WRITE_CLOSE |
LWS_WRITE_H2_STREAM_END;
n = lws_write(w, &w->ws->ping_payload_buf[LWS_PRE],
w->ws->ping_payload_len, (enum lws_write_protocol)write_type);
n = lws_write(w, &w->ws->pong_payload_buf[LWS_PRE],
w->ws->pong_payload_len, (enum lws_write_protocol)write_type);
if (n < 0)
return -1;
/* well he is sent, mark him done */
w->ws->ping_pending_flag = 0;
w->ws->pong_pending_flag = 0;
if (w->ws->payload_is_close) {
/* oh... a close frame... then we are done */
lwsl_debug("Ack'd peer's close packet\n");

10
lib/roles/ws/client-parser-ws.c
View file

@ -445,9 +445,9 @@ spill:
if (wsi->ws->close_in_ping_buffer_len)
goto ping_drop;
if (wsi->ws->ping_pending_flag) {
if (wsi->ws->pong_pending_flag) {
/*
* there is already a pending ping payload
* there is already a pending pong payload
* we should just log and drop
*/
lwsl_parser("DROP PING since one pending\n");
@ -461,12 +461,12 @@ spill:
}
/* stash the pong payload */
memcpy(wsi->ws->ping_payload_buf + LWS_PRE,
memcpy(wsi->ws->pong_payload_buf + LWS_PRE,
&wsi->ws->rx_ubuf[LWS_PRE],
wsi->ws->rx_ubuf_head);
wsi->ws->ping_payload_len = (uint8_t)wsi->ws->rx_ubuf_head;
wsi->ws->ping_pending_flag = 1;
wsi->ws->pong_payload_len = (uint8_t)wsi->ws->rx_ubuf_head;
wsi->ws->pong_pending_flag = 1;
/* get it sent as soon as possible */
lws_callback_on_writable(wsi);

26
lib/roles/ws/ops-ws.c
View file

@ -512,9 +512,9 @@ spill:
lwsl_info("received %d byte ping, sending pong\n",
(int)wsi->ws->rx_ubuf_head);
if (wsi->ws->ping_pending_flag) {
if (wsi->ws->pong_pending_flag) {
/*
* there is already a pending ping payload
* there is already a pending pong payload
* we should just log and drop
*/
lwsl_parser("DROP PING since one pending\n");
@ -528,12 +528,12 @@ process_as_ping:
}
/* stash the pong payload */
memcpy(wsi->ws->ping_payload_buf + LWS_PRE,
memcpy(wsi->ws->pong_payload_buf + LWS_PRE,
&wsi->ws->rx_ubuf[LWS_PRE],
wsi->ws->rx_ubuf_head);
wsi->ws->ping_payload_len = (uint8_t)wsi->ws->rx_ubuf_head;
wsi->ws->ping_pending_flag = 1;
wsi->ws->pong_payload_len = (uint8_t)wsi->ws->rx_ubuf_head;
wsi->ws->pong_pending_flag = 1;
/* get it sent as soon as possible */
lws_callback_on_writable(wsi);
@ -1294,7 +1294,7 @@ int rops_handle_POLLOUT_ws(struct lws *wsi)
/* else, the send failed and we should just hang up */
if ((lwsi_role_ws(wsi) && wsi->ws->ping_pending_flag) ||
if ((lwsi_role_ws(wsi) && wsi->ws->pong_pending_flag) ||
(lwsi_state(wsi) == LRS_RETURNED_CLOSE &&
wsi->ws->payload_is_close)) {
@ -1303,20 +1303,20 @@ int rops_handle_POLLOUT_ws(struct lws *wsi)
else {
if (wsi->wsistate_pre_close) {
/* we started close flow, forget pong */
wsi->ws->ping_pending_flag = 0;
wsi->ws->pong_pending_flag = 0;
return LWS_HP_RET_BAIL_OK;
}
lwsl_info("issuing pong %d on %s\n",
wsi->ws->ping_payload_len, lws_wsi_tag(wsi));
wsi->ws->pong_payload_len, lws_wsi_tag(wsi));
}
n = lws_write(wsi, &wsi->ws->ping_payload_buf[LWS_PRE],
wsi->ws->ping_payload_len, (enum lws_write_protocol)write_type);
n = lws_write(wsi, &wsi->ws->pong_payload_buf[LWS_PRE],
wsi->ws->pong_payload_len, (enum lws_write_protocol)write_type);
if (n < 0)
return LWS_HP_RET_BAIL_DIE;
/* well he is sent, mark him done */
wsi->ws->ping_pending_flag = 0;
wsi->ws->pong_pending_flag = 0;
if (wsi->ws->payload_is_close) {
// assert(0);
/* oh... a close frame was it... then we are done */
@ -1565,8 +1565,8 @@ rops_close_role_ws(struct lws_context_per_thread *pt, struct lws *wsi)
#endif
lws_free_set_NULL(wsi->ws->rx_ubuf);
wsi->ws->ping_payload_len = 0;
wsi->ws->ping_pending_flag = 0;
wsi->ws->pong_payload_len = 0;
wsi->ws->pong_pending_flag = 0;
/* deallocate any active extension contexts */

9
lib/roles/ws/private-lib-roles-ws.h
View file

@ -87,6 +87,8 @@ struct lws_pt_role_ws {
};
#endif
#define PAYLOAD_BUF_SIZE 128 - 3 + LWS_PRE
struct _lws_websocket_related {
unsigned char *rx_ubuf;
#if !defined(LWS_WITHOUT_EXTENSIONS)
@ -103,7 +105,8 @@ struct _lws_websocket_related {
#endif
/* Also used for close content... control opcode == < 128 */
uint8_t ping_payload_buf[128 - 3 + LWS_PRE];
uint8_t ping_payload_buf[PAYLOAD_BUF_SIZE];
uint8_t pong_payload_buf[PAYLOAD_BUF_SIZE];
unsigned int final:1;
unsigned int frame_is_binary:1;
@ -112,7 +115,7 @@ struct _lws_websocket_related {
unsigned int inside_frame:1; /* next write will be more of frame */
unsigned int clean_buffer:1; /* buffer not rewritten by extension */
unsigned int payload_is_close:1; /* process as PONG, but it is close */
unsigned int ping_pending_flag:1;
unsigned int pong_pending_flag:1;
unsigned int continuation_possible:1;
unsigned int owed_a_fin:1;
unsigned int check_utf8:1;
@ -134,7 +137,7 @@ struct _lws_websocket_related {
uint32_t rx_ubuf_head;
uint32_t rx_ubuf_alloc;
uint8_t ping_payload_len;
uint8_t pong_payload_len;
uint8_t mask_idx;
uint8_t opcode;
uint8_t rsv;