From fcfe7ed3120934fef03c4062d988c258689e2fe7 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 4 Feb 2016 17:39:28 -0500 Subject: [PATCH] pcas: no fallbacks for beacon address list Don't mix client and server configuration by defaulting the server beacon list to use the client address list. --- .../legacy/pcas/io/bsdSocket/casDGIntfIO.cc | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc b/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc index f50961c10..af36d3f4f 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc +++ b/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc @@ -148,26 +148,8 @@ casDGIntfIO::casDGIntfIO ( caServerI & serverIn, clientBufMemoryManager & memMgr } if ( addConfigBeaconAddr ) { - - // - // by default use EPICS_CA_ADDR_LIST for the - // beacon address list - // - const ENV_PARAM *pParam; - - if ( envGetConfigParamPtr ( & EPICS_CAS_INTF_ADDR_LIST ) || - envGetConfigParamPtr ( & EPICS_CAS_BEACON_ADDR_LIST ) ) { - pParam = & EPICS_CAS_BEACON_ADDR_LIST; - } - else { - pParam = & EPICS_CA_ADDR_LIST; - } - - // - // add in the configured addresses - // addAddrToChannelAccessAddressList ( - & BCastAddrList, pParam, beaconPort, pParam == & EPICS_CA_ADDR_LIST ); + & BCastAddrList, &EPICS_CAS_BEACON_ADDR_LIST, beaconPort, 0 ); } removeDuplicateAddresses ( & this->beaconAddrList, & BCastAddrList, 0 );