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

Make EPICS_CAS_BEACON_ADDR_LIST fall back to EPICS_CA_ADDR_LIST

Browse Source 
This will allow "simple" configurations that only define
EPICS_CA_ADDR_LIST and EPICS_CA_AUTO_ADDR_LIST=NO to get
beacons sent to that configured audience.
(fixes #7)
This commit is contained in:
Ralph Lange
2022-05-12 16:07:53 -07:00
parent 849e873dd7
commit a8ba939c33
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pcas/io/bsdSocket/casDGIntfIO.cc
View File

@ -151,12 +151,18 @@ casDGIntfIO::casDGIntfIO ( caServerI & serverIn, clientBufMemoryManager & memMgr
epicsSocketDestroy (this->sock);
throw S_cas_bindFail;
}
if ( addConfigBeaconAddr ) {
addAddrToChannelAccessAddressList (
& BCastAddrList, &EPICS_CAS_BEACON_ADDR_LIST, beaconPort, 0 );
if (addConfigBeaconAddr) {
if (envGetConfigParamPtr ( & EPICS_CAS_BEACON_ADDR_LIST ) ) {
addAddrToChannelAccessAddressList (
& BCastAddrList, & EPICS_CAS_BEACON_ADDR_LIST, beaconPort, 0 );
}
else {
addAddrToChannelAccessAddressList (
& BCastAddrList, & EPICS_CA_ADDR_LIST, beaconPort, 0 );
}
}
removeDuplicateAddresses ( & this->beaconAddrList, & BCastAddrList, 0 );
{