sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes Windows build with TCP enabled

pull/64/head
Jonathan Schwartz 2024-02-23 14:16:15 +00:00
parent 05888e5c20
commit 219a5edbd8
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -378,7 +378,7 @@ endif()
if(LIBICSNEO_ENABLE_TCP) if(LIBICSNEO_ENABLE_TCP)
target_compile_definitions(icsneocpp PRIVATE ICSNEO_ENABLE_TCP) target_compile_definitions(icsneocpp PRIVATE ICSNEO_ENABLE_TCP)
if(WIN32) if(WIN32)
target_link_libraries(icsneocpp PRIVATE ws2_32) target_link_libraries(icsneocpp PRIVATE ws2_32 iphlpapi)
endif() endif()
endif() endif()

2
include/icsneo/platform/tcp.h
View File

@ -42,7 +42,7 @@ private:
SocketFileDescriptor fd; SocketFileDescriptor fd;
}; };
NetworkInterface interface; NetworkInterface interfaceDescription;
uint32_t dstIP; uint32_t dstIP;
uint16_t dstPort; uint16_t dstPort;
std::unique_ptr<Socket> socket; std::unique_ptr<Socket> socket;

16
platform/tcp.cpp
View File

@ -184,8 +184,8 @@ void TCP::Find(std::vector<FoundDevice>& found) {
return; return;
} }
for(auto interface = interfaces.begin(); interface; interface = interface.next()) { for(auto intf = interfaces.begin(); intf; intf = intf.next()) {
if(!interface.validType()) if(!intf.validType())
continue; continue;
Socket socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); Socket socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(!socket) { if(!socket) {
@ -205,14 +205,14 @@ void TCP::Find(std::vector<FoundDevice>& found) {
continue; continue;
} }
#ifndef __APPLE__ #ifndef __APPLE__
if(::setsockopt(socket, SOL_SOCKET, SO_BINDTODEVICE, interface.name().data(), interface.name().size()) < 0) { if(::setsockopt(socket, SOL_SOCKET, SO_BINDTODEVICE, intf.name().data(), intf.name().size()) < 0) {
EventManager::GetInstance().add(APIEvent::Type::ErrorSettingSocketOption, APIEvent::Severity::EventWarning); EventManager::GetInstance().add(APIEvent::Type::ErrorSettingSocketOption, APIEvent::Severity::EventWarning);
continue; continue;
} }
#endif #endif
#endif #endif
} }
auto ifAddrIn = (sockaddr_in*)interface.address(); auto ifAddrIn = (sockaddr_in*)intf.address();
ifAddrIn->sin_port = MDNS_PORT; ifAddrIn->sin_port = MDNS_PORT;
{ {
@ -394,7 +394,7 @@ void TCP::Find(std::vector<FoundDevice>& found) {
continue; continue;
NetworkInterface on = { NetworkInterface on = {
std::string(interface.name()), std::string(intf.name()),
ntohl(ifAddrIn->sin_addr.s_addr) ntohl(ifAddrIn->sin_addr.s_addr)
}; };
@ -407,7 +407,7 @@ void TCP::Find(std::vector<FoundDevice>& found) {
} }
TCP::TCP(const device_eventhandler_t& err, NetworkInterface on, uint32_t dstIP, uint16_t dstPort) : TCP::TCP(const device_eventhandler_t& err, NetworkInterface on, uint32_t dstIP, uint16_t dstPort) :
Driver(err), interface(on), dstIP(dstIP), dstPort(dstPort) { Driver(err), interfaceDescription(on), dstIP(dstIP), dstPort(dstPort) {
} }
bool TCP::open() { bool TCP::open() {
@ -419,7 +419,7 @@ bool TCP::open() {
auto partiallyOpenSocket = std::make_unique<Socket>(AF_INET, SOCK_STREAM, IPPROTO_TCP); auto partiallyOpenSocket = std::make_unique<Socket>(AF_INET, SOCK_STREAM, IPPROTO_TCP);
#if !defined(_WIN32) && !defined(__APPLE__) #if !defined(_WIN32) && !defined(__APPLE__)
if(::setsockopt(*partiallyOpenSocket, SOL_SOCKET, SO_BINDTODEVICE, interface.name.c_str(), interface.name.size()) < 0) { if(::setsockopt(*partiallyOpenSocket, SOL_SOCKET, SO_BINDTODEVICE, interfaceDescription.name.c_str(), interfaceDescription.name.size()) < 0) {
report(APIEvent::Type::ErrorSettingSocketOption, APIEvent::Severity::Error); report(APIEvent::Type::ErrorSettingSocketOption, APIEvent::Severity::Error);
return false; return false;
} }
@ -428,7 +428,7 @@ bool TCP::open() {
{ {
sockaddr_in addr = {}; sockaddr_in addr = {};
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl(interface.ip); addr.sin_addr.s_addr = htonl(interfaceDescription.ip);
APPLE_SIN_LEN(addr); APPLE_SIN_LEN(addr);
if(::bind(*partiallyOpenSocket, (sockaddr*)&addr, sizeof(addr)) < 0) { if(::bind(*partiallyOpenSocket, (sockaddr*)&addr, sizeof(addr)) < 0) {
report(APIEvent::Type::FailedToBind, APIEvent::Severity::Error); report(APIEvent::Type::FailedToBind, APIEvent::Severity::Error);