diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-16 16:00:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 16:00:23 +0100 |
| commit | ed96a3da8d75c46c3a3b0672fc26bb85511bf023 (patch) | |
| tree | b01f226ce1771a44d67f4d86a10fcce5ea9f13c9 /platform/windows | |
| parent | 0c80bc2579e6d3cc904f71dacde760f1081a9cb1 (diff) | |
| parent | c356ec5e8bf1ecaa5acedc204d613c4d1c2db3db (diff) | |
Merge pull request #7553 from Faless/tcp-win-fix
Fix bug in windows TCP poll function
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/stream_peer_winsock.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/platform/windows/stream_peer_winsock.cpp b/platform/windows/stream_peer_winsock.cpp index b388d4b89f..9d3e3623da 100644 --- a/platform/windows/stream_peer_winsock.cpp +++ b/platform/windows/stream_peer_winsock.cpp @@ -98,7 +98,7 @@ Error StreamPeerWinsock::_poll_connection(bool p_block) const { return OK; }; - if (errno == WSAEINPROGRESS || errno == WSAEALREADY) { + if (err == WSAEINPROGRESS || err == WSAEALREADY) { return OK; } @@ -136,13 +136,11 @@ Error StreamPeerWinsock::write(const uint8_t* p_data,int p_bytes, int &r_sent, b int data_to_send = p_bytes; const uint8_t *offset = p_data; if (sockfd == -1) return FAILED; - errno = 0; int total_sent = 0; while (data_to_send) { int sent_amount = send(sockfd, (const char*)offset, data_to_send, 0); - //printf("Sent TCP data of %d bytes, errno %d\n", sent_amount, errno); if (sent_amount == -1) { @@ -195,7 +193,6 @@ Error StreamPeerWinsock::read(uint8_t* p_buffer, int p_bytes,int &r_received, bo int to_read = p_bytes; int total_read = 0; - errno = 0; while (to_read) { |