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

drop getBroadcastAddresses()

Browse Source 
in favor of discoverInterfaces().

if we have to do NIC discovery ourselves, then at least
avoid mixing our results with the similar, but not identical
results of osiSockDiscoverBroadcastAddresses() from Base.
This commit is contained in:
Michael Davidsaver
2018-07-02 14:34:34 -07:00
parent 2d5ba15095
commit fc037f0a39
3 changed files with 1 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
testApp/utils/testInetAddressUtils.cpp
View File

@ -178,27 +178,6 @@ void test_isMulticastAddress()
testOk1(isMulticastAddress(&vec.at(5)));
}
void test_getBroadcastAddresses()
{
testDiag("Test getBroadcastAddresses()");
osiSockAttach();
SOCKET socket = epicsSocketCreate(AF_INET, SOCK_STREAM, IPPROTO_TCP);
InetAddrVector broadcasts;
getBroadcastAddresses(broadcasts, socket, 6678);
// at least one is expected, in case of no network connection a fallback address is returned
testOk1(static_cast<size_t>(0) < broadcasts.size());
//testDiag("getBroadcastAddresses() returned %zu entry/-ies.", broadcasts->size());
epicsSocketDestroy(socket);
// debug
for(size_t i = 0; i<broadcasts.size(); i++) {
testDiag("%s", inetAddressToString(broadcasts[i]).c_str());
}
}
void test_getLoopbackNIF()
{
testDiag("Test getLoopbackNIF()");
@ -369,7 +348,7 @@ void test_multicastLoopback()
MAIN(testInetAddressUtils)
{
testPlan(80);
testPlan(79);
testDiag("Tests for InetAddress utils");
test_getSocketAddressList();
@ -377,7 +356,6 @@ MAIN(testInetAddressUtils)
test_intToIPv4Address();
test_encodeAsIPv6Address();
test_isMulticastAddress();
test_getBroadcastAddresses();
test_getLoopbackNIF();
test_multicastLoopback();