asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix WebSocket crash due to non PDO init.

Browse source 
Move RingBuffer (and few related vars) to LWSPeer.
This commit is contained in:
Fabio Alessandrelli 2018-08-06 03:40:26 +02:00
parent b5a20d21f2
commit 6a57f29573
4 changed files with 47 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/websocket/lws_client.cpp
View file

@ -127,11 +127,6 @@ int LWSClient::_handle_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
case LWS_CALLBACK_CLIENT_ESTABLISHED: case LWS_CALLBACK_CLIENT_ESTABLISHED:
peer->set_wsi(wsi); peer->set_wsi(wsi);
peer_data->peer_id = 0; peer_data->peer_id = 0;
peer_data->in_size = 0;
peer_data->in_count = 0;
peer_data->out_count = 0;
peer_data->rbw.resize(16);
peer_data->rbr.resize(16);
peer_data->force_close = false; peer_data->force_close = false;
_on_connect(lws_get_protocol(wsi)->name); _on_connect(lws_get_protocol(wsi)->name);
break; break;
@ -142,10 +137,6 @@ int LWSClient::_handle_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
return -1; // we should close the connection (would probably happen anyway) return -1; // we should close the connection (would probably happen anyway)
case LWS_CALLBACK_CLIENT_CLOSED: case LWS_CALLBACK_CLIENT_CLOSED:
peer_data->in_count = 0;
peer_data->out_count = 0;
peer_data->rbw.resize(0);
peer_data->rbr.resize(0);
peer->close(); peer->close();
destroy_context(); destroy_context();
_on_disconnect(); _on_disconnect();

71
modules/websocket/lws_peer.cpp
View file

@ -41,6 +41,10 @@
#include "drivers/unix/socket_helpers.h" #include "drivers/unix/socket_helpers.h"
void LWSPeer::set_wsi(struct lws *p_wsi) { void LWSPeer::set_wsi(struct lws *p_wsi) {
ERR_FAIL_COND(wsi != NULL);
rbw.resize(16);
rbr.resize(16);
wsi = p_wsi; wsi = p_wsi;
}; };
@ -57,24 +61,24 @@ Error LWSPeer::read_wsi(void *in, size_t len) {
ERR_FAIL_COND_V(!is_connected_to_host(), FAILED); ERR_FAIL_COND_V(!is_connected_to_host(), FAILED);
PeerData *peer_data = (PeerData *)(lws_wsi_user(wsi)); PeerData *peer_data = (PeerData *)(lws_wsi_user(wsi));
uint32_t size = peer_data->in_size; uint32_t size = in_size;
uint8_t is_string = lws_frame_is_binary(wsi) ? 0 : 1; uint8_t is_string = lws_frame_is_binary(wsi) ? 0 : 1;
if (peer_data->rbr.space_left() < len + 5) { if (rbr.space_left() < len + 5) {
ERR_EXPLAIN("Buffer full! Dropping data"); ERR_EXPLAIN("Buffer full! Dropping data");
ERR_FAIL_V(FAILED); ERR_FAIL_V(FAILED);
} }
copymem(&(peer_data->input_buffer[size]), in, len); copymem(&(input_buffer[size]), in, len);
size += len; size += len;
peer_data->in_size = size; in_size = size;
if (lws_is_final_fragment(wsi)) { if (lws_is_final_fragment(wsi)) {
peer_data->rbr.write((uint8_t *)&size, 4); rbr.write((uint8_t *)&size, 4);
peer_data->rbr.write((uint8_t *)&is_string, 1); rbr.write((uint8_t *)&is_string, 1);
peer_data->rbr.write(peer_data->input_buffer, size); rbr.write(input_buffer, size);
peer_data->in_count++; in_count++;
peer_data->in_size = 0; in_size = 0;
} }
return OK; return OK;
@ -86,26 +90,26 @@ Error LWSPeer::write_wsi() {
PeerData *peer_data = (PeerData *)(lws_wsi_user(wsi)); PeerData *peer_data = (PeerData *)(lws_wsi_user(wsi));
PoolVector<uint8_t> tmp; PoolVector<uint8_t> tmp;
int left = peer_data->rbw.data_left(); int left = rbw.data_left();
uint32_t to_write = 0; uint32_t to_write = 0;
if (left == 0 || peer_data->out_count == 0) if (left == 0 || out_count == 0)
return OK; return OK;
peer_data->rbw.read((uint8_t *)&to_write, 4); rbw.read((uint8_t *)&to_write, 4);
peer_data->out_count--; out_count--;
if (left < to_write) { if (left < to_write) {
peer_data->rbw.advance_read(left); rbw.advance_read(left);
return FAILED; return FAILED;
} }
tmp.resize(LWS_PRE + to_write); tmp.resize(LWS_PRE + to_write);
peer_data->rbw.read(&(tmp.write()[LWS_PRE]), to_write); rbw.read(&(tmp.write()[LWS_PRE]), to_write);
lws_write(wsi, &(tmp.write()[LWS_PRE]), to_write, (enum lws_write_protocol)write_mode); lws_write(wsi, &(tmp.write()[LWS_PRE]), to_write, (enum lws_write_protocol)write_mode);
tmp.resize(0); tmp.resize(0);
if (peer_data->out_count > 0) if (out_count > 0)
lws_callback_on_writable(wsi); // we want to write more! lws_callback_on_writable(wsi); // we want to write more!
return OK; return OK;
@ -116,9 +120,9 @@ Error LWSPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
ERR_FAIL_COND_V(!is_connected_to_host(), FAILED); ERR_FAIL_COND_V(!is_connected_to_host(), FAILED);
PeerData *peer_data = (PeerData *)lws_wsi_user(wsi); PeerData *peer_data = (PeerData *)lws_wsi_user(wsi);
peer_data->rbw.write((uint8_t *)&p_buffer_size, 4); rbw.write((uint8_t *)&p_buffer_size, 4);
peer_data->rbw.write(p_buffer, MIN(p_buffer_size, peer_data->rbw.space_left())); rbw.write(p_buffer, MIN(p_buffer_size, rbw.space_left()));
peer_data->out_count++; out_count++;
lws_callback_on_writable(wsi); // notify that we want to write lws_callback_on_writable(wsi); // notify that we want to write
return OK; return OK;
@ -130,7 +134,7 @@ Error LWSPeer::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
PeerData *peer_data = (PeerData *)lws_wsi_user(wsi); PeerData *peer_data = (PeerData *)lws_wsi_user(wsi);
if (peer_data->in_count == 0) if (in_count == 0)
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
uint32_t to_read = 0; uint32_t to_read = 0;
@ -138,17 +142,17 @@ Error LWSPeer::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
uint8_t is_string = 0; uint8_t is_string = 0;
r_buffer_size = 0; r_buffer_size = 0;
peer_data->rbr.read((uint8_t *)&to_read, 4); rbr.read((uint8_t *)&to_read, 4);
peer_data->in_count--; in_count--;
left = peer_data->rbr.data_left(); left = rbr.data_left();
if (left < to_read + 1) { if (left < to_read + 1) {
peer_data->rbr.advance_read(left); rbr.advance_read(left);
return FAILED; return FAILED;
} }
peer_data->rbr.read(&is_string, 1); rbr.read(&is_string, 1);
peer_data->rbr.read(packet_buffer, to_read); rbr.read(packet_buffer, to_read);
*r_buffer = packet_buffer; *r_buffer = packet_buffer;
r_buffer_size = to_read; r_buffer_size = to_read;
_was_string = is_string; _was_string = is_string;
@ -161,7 +165,7 @@ int LWSPeer::get_available_packet_count() const {
if (!is_connected_to_host()) if (!is_connected_to_host())
return 0; return 0;
return ((PeerData *)lws_wsi_user(wsi))->in_count; return in_count;
}; };
bool LWSPeer::was_string_packet() const { bool LWSPeer::was_string_packet() const {
@ -176,12 +180,17 @@ bool LWSPeer::is_connected_to_host() const {
void LWSPeer::close() { void LWSPeer::close() {
if (wsi != NULL) { if (wsi != NULL) {
struct lws *tmp = wsi;
PeerData *data = ((PeerData *)lws_wsi_user(wsi)); PeerData *data = ((PeerData *)lws_wsi_user(wsi));
data->force_close = true; data->force_close = true;
wsi = NULL; lws_callback_on_writable(wsi); // notify that we want to disconnect
lws_callback_on_writable(tmp); // notify that we want to disconnect
} }
wsi = NULL;
rbw.resize(0);
rbr.resize(0);
in_count = 0;
in_size = 0;
out_count = 0;
_was_string = false;
}; };
IP_Address LWSPeer::get_connected_host() const { IP_Address LWSPeer::get_connected_host() const {
@ -228,8 +237,8 @@ uint16_t LWSPeer::get_connected_port() const {
LWSPeer::LWSPeer() { LWSPeer::LWSPeer() {
wsi = NULL; wsi = NULL;
_was_string = false;
write_mode = WRITE_MODE_BINARY; write_mode = WRITE_MODE_BINARY;
close();
}; };
LWSPeer::~LWSPeer() { LWSPeer::~LWSPeer() {

5
modules/websocket/lws_peer.h
View file

@ -57,13 +57,14 @@ public:
struct PeerData { struct PeerData {
uint32_t peer_id; uint32_t peer_id;
bool force_close; bool force_close;
};
RingBuffer<uint8_t> rbw; RingBuffer<uint8_t> rbw;
RingBuffer<uint8_t> rbr; RingBuffer<uint8_t> rbr;
mutable uint8_t input_buffer[PACKET_BUFFER_SIZE]; uint8_t input_buffer[PACKET_BUFFER_SIZE];
uint32_t in_size; uint32_t in_size;
int in_count; int in_count;
int out_count; int out_count;
};
virtual int get_available_packet_count() const; virtual int get_available_packet_count() const;
virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size); virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);

9
modules/websocket/lws_server.cpp
View file

@ -92,11 +92,6 @@ int LWSServer::_handle_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
_peer_map[id] = peer; _peer_map[id] = peer;
peer_data->peer_id = id; peer_data->peer_id = id;
peer_data->in_size = 0;
peer_data->in_count = 0;
peer_data->out_count = 0;
peer_data->rbw.resize(16);
peer_data->rbr.resize(16);
peer_data->force_close = false; peer_data->force_close = false;
_on_connect(id, lws_get_protocol(wsi)->name); _on_connect(id, lws_get_protocol(wsi)->name);
@ -111,10 +106,6 @@ int LWSServer::_handle_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
_peer_map[id]->close(); _peer_map[id]->close();
_peer_map.erase(id); _peer_map.erase(id);
} }
peer_data->in_count = 0;
peer_data->out_count = 0;
peer_data->rbr.resize(0);
peer_data->rbw.resize(0);
_on_disconnect(id); _on_disconnect(id);
return 0; // we can end here return 0; // we can end here
} }