diff options
author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-08-31 03:22:41 +0200 |
---|---|---|
committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-09-12 12:50:53 +0200 |
commit | 7de28be76479796691730dcdc8c121543c5c9681 (patch) | |
tree | 1555f9d41b5ab9c136fe4e7d257783e2b2fd63af | |
parent | d3108985e07d442aa90260b0830b3b46f9f4dcad (diff) |
ENet wrapper properly detect disconnect on poll
Now PacketPeerUDP.get_available_packet_count() return -1 if the socket
is in error state.
-rw-r--r-- | drivers/unix/packet_peer_udp_posix.cpp | 2 | ||||
-rw-r--r-- | drivers/windows/packet_peer_udp_winsock.cpp | 2 | ||||
-rw-r--r-- | thirdparty/enet/godot.cpp | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/unix/packet_peer_udp_posix.cpp b/drivers/unix/packet_peer_udp_posix.cpp index 1cb530420e..1c5456917b 100644 --- a/drivers/unix/packet_peer_udp_posix.cpp +++ b/drivers/unix/packet_peer_udp_posix.cpp @@ -61,7 +61,7 @@ int PacketPeerUDPPosix::get_available_packet_count() const { Error err = const_cast<PacketPeerUDPPosix *>(this)->_poll(false); if (err != OK) - return 0; + return -1; return queue_count; } diff --git a/drivers/windows/packet_peer_udp_winsock.cpp b/drivers/windows/packet_peer_udp_winsock.cpp index f7c3637e7e..62a23bdf3f 100644 --- a/drivers/windows/packet_peer_udp_winsock.cpp +++ b/drivers/windows/packet_peer_udp_winsock.cpp @@ -42,7 +42,7 @@ int PacketPeerUDPWinsock::get_available_packet_count() const { Error err = const_cast<PacketPeerUDPWinsock *>(this)->_poll(false); if (err != OK) - return 0; + return -1; return queue_count; } diff --git a/thirdparty/enet/godot.cpp b/thirdparty/enet/godot.cpp index 7813b70286..177848f96b 100644 --- a/thirdparty/enet/godot.cpp +++ b/thirdparty/enet/godot.cpp @@ -168,8 +168,9 @@ int enet_socket_receive(ENetSocket socket, ENetAddress *address, ENetBuffer *buf PacketPeerUDP *sock = (PacketPeerUDP *)socket; - if (sock->get_available_packet_count() == 0) { - return 0; + int pc = sock->get_available_packet_count(); + if (pc < 1) { + return pc; } const uint8_t *buffer; |