Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows client.

Browse Source 
Windows returns WSAEWOULDBLOCK on a connect() attempt on a nonblocking socket.

Also wrap socket error handling so errors are correctly reported on Windows.

Fixes #19.
This commit is contained in:
Peter Johnson
2015-08-24 21:21:13 -07:00
parent 822dc45834
commit a3dbe9a800
4 changed files with 84 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tcpsockets/TCPAcceptor.cpp
View File

@@ -36,6 +36,9 @@
#include "llvm/SmallString.h"
#include "../Log.h"
#include "SocketError.h"
using namespace tcpsockets;
TCPAcceptor::TCPAcceptor(int port, const char* address)
: m_lsd(0),
@@ -75,7 +78,7 @@ int TCPAcceptor::start() {
if (m_address.size() > 0) {
#ifdef _WIN32
llvm::SmallString<128> addr_copy(m_address);
addr_copy.append('\0');
addr_copy.push_back('\0');
int size = sizeof(address);
WSAStringToAddress(addr_copy.data(), PF_INET, nullptr, (struct sockaddr*)&address, &size);
#else
@@ -91,13 +94,13 @@ int TCPAcceptor::start() {
int result = bind(m_lsd, (struct sockaddr*)&address, sizeof(address));
if (result != 0) {
ERROR("bind() failed: " << strerror(errno));
ERROR("bind() failed: " << SocketStrerror());
return result;
}
result = listen(m_lsd, 5);
if (result != 0) {
ERROR("listen() failed: " << strerror(errno));
ERROR("listen() failed: " << SocketStrerror());
return result;
}
m_listening = true;
@@ -125,7 +128,7 @@ std::unique_ptr<NetworkStream> TCPAcceptor::accept() {
std::memset(&address, 0, sizeof(address));
int sd = ::accept(m_lsd, (struct sockaddr*)&address, &len);
if (sd < 0) {
if (!m_shutdown) ERROR("accept() failed: " << strerror(errno));
if (!m_shutdown) ERROR("accept() failed: " << SocketStrerror());
return nullptr;
}
return std::unique_ptr<NetworkStream>(new TCPStream(sd, &address));