epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

discoverInterfaces() fixup bcast address on win32

Browse Source 
Apparently SIO_GET_INTERFACE_LIST sometimes gives
the global broadcast (255.255.255.255) for one of
the interfaces.  In this case silently compute
the iface bcast address.
This commit is contained in:
Michael Davidsaver
2018-07-02 15:56:16 -07:00
parent 7912718664
commit 59a65ce317
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils/inetAddressUtil.cpp
View File

@@ -199,7 +199,7 @@ ifaceNode::ifaceNode()
}
static
void checkNode(const ifaceNode& node)
void checkNode(ifaceNode& node)
{
if(node.validBcast) {
/* Cross-check between addr, mask, and bcast to detect incorrect broadcast
@@ -210,9 +210,16 @@ void checkNode(const ifaceNode& node)
bcast= ntohl(node.bcast.ia.sin_addr.s_addr),
bcast_expect = (addr & mask) | ~mask;
if(bcast == ntohl(INADDR_BROADCAST)) {
// translate global broadcast to iface broadcast.
// Windows (at least) will give us this sometimes.
bcast = bcast_expect;
node.bcast.ia.sin_addr.s_addr = htonl(bcast);
}
if(bcast != bcast_expect) {
errlogPrintf("Detected inconsistent broadcast address on interface %08x/%08x. expect %08x found ~%08x.",
addr, mask, bcast_expect, bcast);
errlogPrintf("Warning: Inconsistent broadcast address on interface %08x/%08x. expect %08x found %08x.\n",
(unsigned)addr, (unsigned)mask, (unsigned)bcast_expect, (unsigned)bcast);
}
}
}