casraf/redot-engine
1
0
Fork 0
mirror of https://github.com/chenasraf/redot-engine.git synced 2026-05-18 01:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #709 from Spartan322/redot-4.3/websocket-rework

Browse Source 
[4.3] Fix websocket dropping messages for WSLPeer
This commit is contained in:
George L. Albany
2024-10-15 03:59:10 +00:00
committed by GitHub
parent 242cb1cc89 3c1f52574a
commit d1479a1733
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/websocket/packet_buffer.h
View File

@@ -106,6 +106,10 @@ public:
return _queued;
}
int space_left() const {
return _payload.space_left();
}
void clear() {
_payload.resize(0);
_packets.resize(0);

18
modules/websocket/wsl_peer.cpp
View File

@@ -565,10 +565,15 @@ Error WSLPeer::connect_to_url(const String &p_url, Ref<TLSOptions> p_options) {
ssize_t WSLPeer::_wsl_recv_callback(wslay_event_context_ptr ctx, uint8_t *data, size_t len, int flags, void *user_data) {
WSLPeer *peer = (WSLPeer *)user_data;
Ref<StreamPeer> conn = peer->connection;
if (conn.is_null()) {
wslay_event_set_error(ctx, WSLAY_ERR_CALLBACK_FAILURE);
return -1;
}
uint64_t space_left = peer->in_buffer.space_left();
if (space_left < peer->length_needed) {
return WSLAY_ERR_NOMEM;
}
int read = 0;
Error err = conn->get_partial_data(data, len, read);
if (err != OK) {
@@ -583,6 +588,17 @@ ssize_t WSLPeer::_wsl_recv_callback(wslay_event_context_ptr ctx, uint8_t *data,
return read;
}
void WSLPeer::_wsl_on_frame_start_callback(wslay_event_context_ptr ctx, const wslay_event_on_frame_recv_start_arg *arg, void *user_data) {
WSLPeer *peer = (WSLPeer *)user_data;
Ref<StreamPeer> conn = peer->connection;
if (arg->opcode == WSLAY_TEXT_FRAME || arg->opcode == WSLAY_BINARY_FRAME) {
uint64_t space_left = peer->in_buffer.space_left();
if (space_left < arg->payload_length) {
peer->length_needed = arg->payload_length;
}
}
}
ssize_t WSLPeer::_wsl_send_callback(wslay_event_context_ptr ctx, const uint8_t *data, size_t len, int flags, void *user_data) {
WSLPeer *peer = (WSLPeer *)user_data;
Ref<StreamPeer> conn = peer->connection;
@@ -644,7 +660,7 @@ wslay_event_callbacks WSLPeer::_wsl_callbacks = {
_wsl_recv_callback,
_wsl_send_callback,
_wsl_genmask_callback,
nullptr, /* on_frame_recv_start_callback */
_wsl_on_frame_start_callback, /* on_frame_recv_start_callback */
nullptr, /* on_frame_recv_callback */
nullptr, /* on_frame_recv_end_callback */
_wsl_msg_recv_callback

3
modules/websocket/wsl_peer.h
View File

@@ -55,6 +55,7 @@ private:
// Callbacks.
static ssize_t _wsl_recv_callback(wslay_event_context_ptr ctx, uint8_t *data, size_t len, int flags, void *user_data);
static void _wsl_on_frame_start_callback(wslay_event_context_ptr ctx, const struct wslay_event_on_frame_recv_start_arg *arg, void *user_data);
static ssize_t _wsl_send_callback(wslay_event_context_ptr ctx, const uint8_t *data, size_t len, int flags, void *user_data);
static int _wsl_genmask_callback(wslay_event_context_ptr ctx, uint8_t *buf, size_t len, void *user_data);
static void _wsl_msg_recv_callback(wslay_event_context_ptr ctx, const struct wslay_event_on_msg_recv_arg *arg, void *user_data);
@@ -122,6 +123,8 @@ private:
void _clear();
public:
uint64_t length_needed = 0;
static void initialize();
static void deinitialize();