diff options
author | Gabriel Pérez-Cerezo <gabriel@gpcf.eu> | 2019-11-28 12:30:21 +0100 |
---|---|---|
committer | Gabriel Pérez-Cerezo <gabriel@gpcf.eu> | 2019-11-28 12:30:21 +0100 |
commit | ddab98412f3fc47eedfa74f8a4edafd324e59707 (patch) | |
tree | 7087657e4b9d90e2e0559bfdc25cf2b3b52e51fe /src/network/connection.h | |
parent | 6dc7177a5de51f1329c1be04e7f07be64d5cc76c (diff) | |
download | minetest-lifo-fixes.tar.gz minetest-lifo-fixes.tar.bz2 minetest-lifo-fixes.zip |
Add static_save and prevent UDP connect exhaustionslifo-fixes
This merges two pull requests from 5.0
Diffstat (limited to 'src/network/connection.h')
-rw-r--r-- | src/network/connection.h | 5 |
1 files changed, 4 insertions, 1 deletions
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<ConnectionCommand> 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; |