1 files changed, 31 insertions, 27 deletions

diff --git a/modules/websocket/packet_buffer.h b/modules/websocket/packet_buffer.h
index 7b4a164576..cd81dc43cd 100644
--- a/modules/websocket/packet_buffer.h
+++ b/modules/websocket/packet_buffer.h
@@ -41,32 +41,29 @@ private:
 		T info;
 	} _Packet;
 
-	RingBuffer<_Packet> _packets;
+	Vector<_Packet> _packets;
+	int _queued = 0;
+	int _write_pos = 0;
+	int _read_pos = 0;
 	RingBuffer<uint8_t> _payload;
 
 public:
 	Error write_packet(const uint8_t *p_payload, uint32_t p_size, const T *p_info) {
-#ifdef TOOLS_ENABLED
-		// Verbose buffer warnings
-		if (p_payload && _payload.space_left() < (int32_t)p_size) {
-			ERR_PRINT("Buffer payload full! Dropping data.");
-			ERR_FAIL_V(ERR_OUT_OF_MEMORY);
-		}
-		if (p_info && _packets.space_left() < 1) {
-			ERR_PRINT("Too many packets in queue! Dropping data.");
-			ERR_FAIL_V(ERR_OUT_OF_MEMORY);
-		}
-#else
-		ERR_FAIL_COND_V(p_payload && (uint32_t)_payload.space_left() < p_size, ERR_OUT_OF_MEMORY);
-		ERR_FAIL_COND_V(p_info && _packets.space_left() < 1, ERR_OUT_OF_MEMORY);
-#endif
+		ERR_FAIL_COND_V_MSG(p_payload && (uint32_t)_payload.space_left() < p_size, ERR_OUT_OF_MEMORY, "Buffer payload full! Dropping data.");
+		ERR_FAIL_COND_V_MSG(p_info && _queued >= _packets.size(), ERR_OUT_OF_MEMORY, "Too many packets in queue! Dropping data.");
 
 		// If p_info is nullptr, only the payload is written
 		if (p_info) {
+			ERR_FAIL_COND_V(_write_pos > _packets.size(), ERR_OUT_OF_MEMORY);
 			_Packet p;
 			p.size = p_size;
-			memcpy(&p.info, p_info, sizeof(T));
-			_packets.write(p);
+			p.info = *p_info;
+			_packets.write[_write_pos] = p;
+			_queued += 1;
+			_write_pos++;
+			if (_write_pos >= _packets.size()) {
+				_write_pos = 0;
+			}
 		}
 
 		// If p_payload is nullptr, only the packet information is written.
@@ -78,9 +75,14 @@ public:
 	}
 
 	Error read_packet(uint8_t *r_payload, int p_bytes, T *r_info, int &r_read) {
-		ERR_FAIL_COND_V(_packets.data_left() < 1, ERR_UNAVAILABLE);
-		_Packet p;
-		_packets.read(&p, 1);
+		ERR_FAIL_COND_V(_queued < 1, ERR_UNAVAILABLE);
+		_Packet p = _packets[_read_pos];
+		_read_pos += 1;
+		if (_read_pos >= _packets.size()) {
+			_read_pos = 0;
+		}
+		_queued -= 1;
+
 		ERR_FAIL_COND_V(_payload.data_left() < (int)p.size, ERR_BUG);
 		ERR_FAIL_COND_V(p_bytes < (int)p.size, ERR_OUT_OF_MEMORY);
 
@@ -90,22 +92,24 @@ public:
 		return OK;
 	}
 
-	void discard_payload(int p_size) {
-		_packets.decrease_write(p_size);
-	}
-
-	void resize(int p_pkt_shift, int p_buf_shift) {
-		_packets.resize(p_pkt_shift);
+	void resize(int p_buf_shift, int p_max_packets) {
 		_payload.resize(p_buf_shift);
+		_packets.resize(p_max_packets);
+		_read_pos = 0;
+		_write_pos = 0;
+		_queued = 0;
 	}
 
 	int packets_left() const {
-		return _packets.data_left();
+		return _queued;
 	}
 
 	void clear() {
 		_payload.resize(0);
 		_packets.resize(0);
+		_read_pos = 0;
+		_write_pos = 0;
+		_queued = 0;
 	}
 
 	PacketBuffer() {