diff options
| author | Fabio Alessandrelli | 2017-01-18 19:04:37 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli | 2017-03-22 21:03:26 +0100 |
| commit | 9f41c0a356c016a86418a44c35ad1fb3f5978fd2 (patch) | |
| tree | 82a7367f75676ce1507587f5066d8d414fd9412e /drivers/unix/stream_peer_tcp_posix.cpp | |
| parent | 86de0bd081669c40578b408e2f38fea76b0416ce (diff) | |
| download | godot-9f41c0a356c016a86418a44c35ad1fb3f5978fd2.tar.gz godot-9f41c0a356c016a86418a44c35ad1fb3f5978fd2.tar.zst godot-9f41c0a356c016a86418a44c35ad1fb3f5978fd2.zip | |
Avoid deadlock when writing/reading data on a connecting TCP socket
TCP status polling is always performed as non blocking.
Trying to put a packet on a connecting socket will fail immediately.
(cherry picked from commit fa0cb7da0e096e01476eabef37c225404c7f6f26)
Diffstat (limited to 'drivers/unix/stream_peer_tcp_posix.cpp')
| -rw-r--r-- | drivers/unix/stream_peer_tcp_posix.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/unix/stream_peer_tcp_posix.cpp b/drivers/unix/stream_peer_tcp_posix.cpp index 9f551a8f4..4063eb3a3 100644 --- a/drivers/unix/stream_peer_tcp_posix.cpp +++ b/drivers/unix/stream_peer_tcp_posix.cpp @@ -88,15 +88,10 @@ Error StreamPeerTCPPosix::_block(int p_sockfd, bool p_read, bool p_write) const return ret < 0 ? FAILED : OK; }; -Error StreamPeerTCPPosix::_poll_connection(bool p_block) const { +Error StreamPeerTCPPosix::_poll_connection() const { ERR_FAIL_COND_V(status != STATUS_CONNECTING || sockfd == -1, FAILED); - if (p_block) { - - _block(sockfd, false, true); - }; - struct sockaddr_storage their_addr; size_t addr_size = _set_sockaddr(&their_addr, peer_host, peer_port, sock_type); @@ -191,7 +186,7 @@ Error StreamPeerTCPPosix::write(const uint8_t *p_data, int p_bytes, int &r_sent, if (status != STATUS_CONNECTED) { - if (_poll_connection(p_block) != OK) { + if (_poll_connection() != OK) { return FAILED; }; @@ -251,7 +246,7 @@ Error StreamPeerTCPPosix::read(uint8_t *p_buffer, int p_bytes, int &r_received, if (status == STATUS_CONNECTING) { - if (_poll_connection(p_block) != OK) { + if (_poll_connection() != OK) { return FAILED; }; @@ -330,7 +325,7 @@ bool StreamPeerTCPPosix::is_connected() const { StreamPeerTCP::Status StreamPeerTCPPosix::get_status() const { if (status == STATUS_CONNECTING) { - _poll_connection(false); + _poll_connection(); }; return status; |