diff --git a/src/server/pv/serverContextImpl.h b/src/server/pv/serverContextImpl.h index ff07e93..aabe7d1 100644 --- a/src/server/pv/serverContextImpl.h +++ b/src/server/pv/serverContextImpl.h @@ -64,18 +64,6 @@ public: */ static const Version VERSION; - /** - * Get beacon address list. - * @return beacon address list. - */ - std::string getBeaconAddressList(); - - /** - * Get beacon address list auto flag. - * @return beacon address list auto flag. - */ - bool isAutoBeaconAddressList(); - /** * Get beacon period (in seconds). * @return beacon period (in seconds). @@ -100,12 +88,6 @@ public: */ epics::pvData::int32 getBroadcastPort() OVERRIDE FINAL; - /** - * Get ignore search address list. - * @return ignore search address list. - */ - std::string getIgnoreAddressList(); - /** * Get registered beacon server status provider. * @return registered beacon server status provider. diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp index ffdc3c2..d517283 100644 --- a/src/server/serverContext.cpp +++ b/src/server/serverContext.cpp @@ -228,13 +228,13 @@ ServerContextImpl::getCurrentConfig() SET("EPICS_PVAS_INTF_ADDR_LIST", buf); } - SET("EPICS_PVAS_BEACON_ADDR_LIST", getBeaconAddressList()); - SET("EPICS_PVA_ADDR_LIST", getBeaconAddressList()); + SET("EPICS_PVAS_BEACON_ADDR_LIST", _beaconAddressList); + SET("EPICS_PVA_ADDR_LIST", _beaconAddressList); SET("EPICS_PVAS_AUTO_BEACON_ADDR_LIST", - isAutoBeaconAddressList() ? "YES" : "NO"); + _autoBeaconAddressList ? "YES" : "NO"); SET("EPICS_PVA_AUTO_ADDR_LIST", - isAutoBeaconAddressList() ? "YES" : "NO"); + _autoBeaconAddressList ? "YES" : "NO"); SET("EPICS_PVAS_BEACON_PERIOD", getBeaconPeriod()); SET("EPICS_PVA_BEACON_PERIOD", getBeaconPeriod()); @@ -464,16 +464,6 @@ void ServerContextImpl::setBeaconServerStatusProvider(BeaconServerStatusProvider _beaconServerStatusProvider = beaconServerStatusProvider; } -std::string ServerContextImpl::getBeaconAddressList() -{ - return _beaconAddressList; -} - -bool ServerContextImpl::isAutoBeaconAddressList() -{ - return _autoBeaconAddressList; -} - float ServerContextImpl::getBeaconPeriod() { return _beaconPeriod; @@ -494,11 +484,6 @@ int32 ServerContextImpl::getBroadcastPort() return _broadcastPort; } -std::string ServerContextImpl::getIgnoreAddressList() -{ - return _ignoreAddressList; -} - BeaconServerStatusProvider::shared_pointer ServerContextImpl::getBeaconServerStatusProvider() { return _beaconServerStatusProvider;