From ddab98412f3fc47eedfa74f8a4edafd324e59707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20P=C3=A9rez-Cerezo?= Date: Thu, 28 Nov 2019 12:30:21 +0100 Subject: Add static_save and prevent UDP connect exhaustions This merges two pull requests from 5.0 --- src/network/connection.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/network/connection.h') diff --git a/src/network/connection.h b/src/network/connection.h index 8b7ed9773..a202fa2f5 100644 --- a/src/network/connection.h +++ b/src/network/connection.h @@ -1016,6 +1016,7 @@ public: bool Connected(); void Disconnect(); void Receive(NetworkPacket* pkt); + bool TryReceive(NetworkPacket* pkt); void Send(u16 peer_id, u8 channelnum, NetworkPacket* pkt, bool reliable); u16 GetPeerID() { return m_peer_id; } Address GetPeerAddress(u16 peer_id); @@ -1050,6 +1051,8 @@ protected: UDPSocket m_udpSocket; MutexedQueue m_command_queue; + bool Receive(NetworkPacket *pkt, u32 timeout); + void putEvent(ConnectionEvent &e); void TriggerSend() @@ -1074,7 +1077,7 @@ private: // Backwards compatibility PeerHandler *m_bc_peerhandler; int m_bc_receive_timeout; - + bool m_shutting_down; u16 m_next_remote_peer_id; -- cgit v1.2.3