From 9be026efc7ddf53c46a92d07e62025274d8e7c3d Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Thu, 25 Feb 2016 10:37:44 +0100 Subject: [PATCH] allow EPICS_PVAS_INTF_ADDR_LIST=127.0.0.1, tests pass now --- src/utils/inetAddressUtil.cpp | 9 +++++++-- testApp/remote/channelAccessIFTest.cpp | 2 -- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/utils/inetAddressUtil.cpp b/src/utils/inetAddressUtil.cpp index 640f82d..6eca68f 100644 --- a/src/utils/inetAddressUtil.cpp +++ b/src/utils/inetAddressUtil.cpp @@ -387,8 +387,13 @@ int discoverInterfaces(IfaceNodeVector &list, SOCKET socket, const osiSockAddr * } #endif else { - /*ifDepenDebugPrintf ( ( "discoverInterfaces(): net intf \"%s\": not point to point or bcast?\n", pIfreqList->ifr_name ) );*/ - continue; + if (match) + node.ifaceBCast.sa.sa_family = AF_UNSPEC; + else + { + /*ifDepenDebugPrintf ( ( "discoverInterfaces(): net intf \"%s\": not point to point or bcast?\n", pIfreqList->ifr_name ) );*/ + continue; + } } diff --git a/testApp/remote/channelAccessIFTest.cpp b/testApp/remote/channelAccessIFTest.cpp index 05a25ba..d1a1082 100755 --- a/testApp/remote/channelAccessIFTest.cpp +++ b/testApp/remote/channelAccessIFTest.cpp @@ -63,7 +63,6 @@ int ChannelAccessIFTest::runAllTest() { .add("EPICS_PVA_ADDR_LIST", "127.0.0.1") .add("EPICS_PVA_AUTO_ADDR_LIST","0") .add("EPICS_PVA_SERVER_PORT", "0") - .add("EPICS_PVA_BROADCAST_PORT", "0") .push_map() .build()); @@ -75,7 +74,6 @@ int ChannelAccessIFTest::runAllTest() { ConfigurationFactory::registerConfiguration("pvAccess-client", ConfigurationBuilder() .push_config(base_config) - .add("EPICS_PVA_BROADCAST_PORT", tstserv->getBroadcastPort()) .push_map() .build()); ScopedClientFactory SCF;