Skip to content

Commit

Permalink
Make EPICS_CAS_BEACON_ADDR_LIST fall back to EPICS_CA_ADDR_LIST
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
ralphlange committed May 12, 2022
1 parent 849e873 commit a8ba939
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions src/pcas/io/bsdSocket/casDGIntfIO.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

{
Expand Down

0 comments on commit a8ba939

Please sign in to comment.