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

pcas: no fallbacks for beacon address list

Browse Source 
Don't mix client and server configuration
by defaulting the server beacon list to use
the client address list.
This commit is contained in:
Michael Davidsaver
2016-02-04 17:39:28 -05:00
parent 167dea3735
commit fcfe7ed312
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc
View File

@@ -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 );