Skip to content

Push 2025 11 13 #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 13, 2025
Merged

Push 2025 11 13 #986

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eac5cb
Fix IPv4 socket binding on non-Windows systems
Copilot Nov 13, 2025
9eff39d
Merge remote-tracking branch 'opcm-github/master'
rdementi Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/pcm-sensor-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,6 @@ class Server {
int retval = 0;

if (useIPv4) {
#ifdef _WIN32
// Use IPv4
struct sockaddr_in serv4;
memset(&serv4, 0, sizeof(serv4));
Expand All @@ -1479,13 +1478,16 @@ class Server {
if ( 1 != ::inet_pton( AF_INET, listenIP_.c_str(), &(serv4.sin_addr) ) )
{
DBG( 3, "close clientsocketFD" );
#ifdef _WIN32
closesocket(sockfd);
#else
::close(sockfd);
#endif
throw std::runtime_error(std::string("Server Constructor: Cannot convert IP string ") + listenIP_ + " to IPv4 address");
}
}
socklen_t len = sizeof( struct sockaddr_in );
retval = ::bind( sockfd, reinterpret_cast<struct sockaddr*>(&serv4), len );
#endif
} else {
// Use IPv6
struct sockaddr_in6 serv;
Expand Down
Loading