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

Use InetNtop on Win32 rather than WSAAddressToString. (#170)

Browse Source 
Similarly, use InetPton rather than WSAStringToAddress.

The WSAAddressToString function is intended to provide a user-readable
string and thus includes the port number.  This breaks some use cases
on Windows which expect to get just the IP address.

Note: The InetPton and InetNtop functions are available only in Vista or above.
This commit is contained in:
Peter Johnson
2016-12-25 01:30:12 -08:00
committed by GitHub
parent 8c7338f2ba
commit 976ca80056
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tcpsockets/TCPAcceptor.cpp
View File

@@ -27,6 +27,7 @@
#include <cstring>
#ifdef _WIN32
#include <WinSock2.h>
#include <Ws2tcpip.h>
#pragma comment(lib, "Ws2_32.lib")
#else
#include <arpa/inet.h>
@@ -85,11 +86,14 @@ int TCPAcceptor::start() {
#ifdef _WIN32
llvm::SmallString<128> addr_copy(m_address);
addr_copy.push_back('\0');
int size = sizeof(address);
WSAStringToAddress(addr_copy.data(), PF_INET, nullptr, (struct sockaddr*)&address, &size);
int res = InetPton(PF_INET, addr_copy.data(), &(address.sin_addr));
#else
inet_pton(PF_INET, m_address.c_str(), &(address.sin_addr));
int res = inet_pton(PF_INET, m_address.c_str(), &(address.sin_addr));
#endif
if (res != 1) {
WPI_ERROR(m_logger, "could not resolve " << m_address << " address");
return -1;
}
} else {
address.sin_addr.s_addr = INADDR_ANY;
}