godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34515 from Faless/ws/closing_ws

Browse Source 
WSLPeer now prevents receiving data after close.
This commit is contained in:
Rémi Verschelde 2019-12-22 12:32:52 +01:00 committed by GitHub
commit e4ecfe90f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/websocket/wsl_peer.cpp
View File

@ -142,7 +142,7 @@ int wsl_genmask_callback(wslay_event_context_ptr ctx, uint8_t *buf, size_t len,
void wsl_msg_recv_callback(wslay_event_context_ptr ctx, const struct wslay_event_on_msg_recv_arg *arg, void *user_data) { void wsl_msg_recv_callback(wslay_event_context_ptr ctx, const struct wslay_event_on_msg_recv_arg *arg, void *user_data) {
struct WSLPeer::PeerData *peer_data = (struct WSLPeer::PeerData *)user_data; struct WSLPeer::PeerData *peer_data = (struct WSLPeer::PeerData *)user_data;
if (!peer_data->valid) { if (!peer_data->valid || peer_data->closing) {
return; return;
} }
WSLPeer *peer = (WSLPeer *)peer_data->peer; WSLPeer *peer = (WSLPeer *)peer_data->peer;
@ -293,6 +293,7 @@ void WSLPeer::close(int p_code, String p_reason) {
CharString cs = p_reason.utf8(); CharString cs = p_reason.utf8();
wslay_event_queue_close(_data->ctx, p_code, (uint8_t *)cs.ptr(), cs.size()); wslay_event_queue_close(_data->ctx, p_code, (uint8_t *)cs.ptr(), cs.size());
wslay_event_send(_data->ctx); wslay_event_send(_data->ctx);
_data->closing = true;
} }
_in_buffer.clear(); _in_buffer.clear();

2
modules/websocket/wsl_peer.h
View File

@ -53,6 +53,7 @@ public:
bool destroy; bool destroy;
bool valid; bool valid;
bool is_server; bool is_server;
bool closing;
void *obj; void *obj;
void *peer; void *peer;
Ref<StreamPeer> conn; Ref<StreamPeer> conn;
@ -68,6 +69,7 @@ public:
id = 1; id = 1;
ctx = NULL; ctx = NULL;
obj = NULL; obj = NULL;
closing = false;
peer = NULL; peer = NULL;
} }
}; };