From 6d3d7135b1d39842b85ba5066feab9567ed9b8ab Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 21 Feb 2025 12:06:25 +0100 Subject: [PATCH] send beacons to all machine subnets --- startup.script_common | 6 ++++++ startup.script_linux | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/startup.script_common b/startup.script_common index 3e64b29..342666f 100644 --- a/startup.script_common +++ b/startup.script_common @@ -94,6 +94,8 @@ ifEnvSet IP_ADDR, "~129.129.137.*", "EPICS_CA_ADDR_LIST", "129.129.130.255 129.1 # SLS machine network ifEnvSet IP_ADDR, "~172.22.*", "EPICS_CA_ADDR_LIST", "172.22.4.255 172.22.5.255 172.22.6.255 172.22.7.255 172.22.120.255 172.22.121.255" ifEnvSet IP_ADDR, "~172.22.*", "EPICS_CA_AUTO_ADDR_LIST", "NO" +ifEnvSet IP_ADDR, "~172.22.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.22.4.255 172.22.5.255 172.22.6.255 172.22.7.255 172.22.120.255 172.22.121.255" +ifEnvSet IP_ADDR, "~172.22.*", "EPICS_CAS_BEACON_AUTO_ADDR_LIST", "NO" # Metro Lab ifEnvSet IP_ADDR, "~129.129.128.*", "EPICS_CA_ADDR_LIST", "129.129.128.255" @@ -102,9 +104,13 @@ ifEnvSet IP_ADDR, "~129.129.128.*", "EPICS_CA_AUTO_ADDR_LIST", "NO" # HIPA ifEnvSet IP_ADDR, "~172.19.*", "EPICS_CA_ADDR_LIST", "172.19.10.255 172.19.30.255 172.19.32.255" ifEnvSet IP_ADDR, "~172.19.*", "EPICS_CA_AUTO_ADDR_LIST", "NO" +ifEnvSet IP_ADDR, "~172.19.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.19.10.255 172.19.30.255 172.19.32.255" +ifEnvSet IP_ADDR, "~172.19.*", "EPICS_CAS_BEACON_AUTO_ADDR_LIST", "NO" # PROSCAN ifEnvSet IP_ADDR, "~172.25.*", "EPICS_CA_ADDR_LIST", "172.25.60.255 172.25.11.255" ifEnvSet IP_ADDR, "~172.25.*", "EPICS_CA_AUTO_ADDR_LIST", "NO" +ifEnvSet IP_ADDR, "~172.25.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.25.60.255 172.25.11.255" +ifEnvSet IP_ADDR, "~172.25.*", "EPICS_CAS_BEACON_AUTO_ADDR_LIST", "NO" # End of startup.script_common diff --git a/startup.script_linux b/startup.script_linux index b725bab..ca6fb37 100644 --- a/startup.script_linux +++ b/startup.script_linux @@ -32,6 +32,8 @@ ifEnvSet $(IP_ADDR) ~129.129.137.* EPICS_CA_ADDR_LIST "129.129.130.255 129.129.1 # SLS machine network ifEnvSet $(IP_ADDR) ~172.22.* EPICS_CA_ADDR_LIST "172.22.4.255 172.22.5.255 172.22.6.255 172.22.7.255 172.22.120.255 172.22.121.255" ifEnvSet $(IP_ADDR) ~172.22.* EPICS_CA_AUTO_ADDR_LIST NO +ifEnvSet $(IP_ADDR) ~172.22.* EPICS_CAS_BEACON_ADDR_LIST "172.22.4.255 172.22.5.255 172.22.6.255 172.22.7.255 172.22.120.255 172.22.121.255" +ifEnvSet $(IP_ADDR) ~172.22.* EPICS_CAS_AUTO_BEACON_ADDR_LIST NO # Metro Lab ifEnvSet $(IP_ADDR) ~129.129.128.* EPICS_CA_ADDR_LIST "129.129.128.255" @@ -41,6 +43,8 @@ ifEnvSet $(IP_ADDR) ~129.129.128.* EPICS_CA_AUTO_ADDR_LIST NO # with directed broadcasts ifEnvSet $(IP_ADDR) ~172.26.* EPICS_CA_ADDR_LIST "172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.110.255 172.26.111.255 172.26.120.255 saresa-cagw.psi.ch:5062 saresb-cagw.psi.ch:5062 saresc-cagw.psi.ch:5062 satese-cagw.psi.ch:5062 satesf-cagw.psi.ch:5062" ifEnvSet $(IP_ADDR) ~172.26.* EPICS_CA_AUTO_ADDR_LIST NO +ifEnvSet $(IP_ADDR) ~172.26.* EPICS_CAS_BEACON_ADDR_LIST "172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.110.255 172.26.111.255 172.26.120.255 saresa-cagw.psi.ch:5063 saresb-cagw.psi.ch:5063 saresc-cagw.psi.ch:5063 satese-cagw.psi.ch:5063 satesf-cagw.psi.ch:5063" +ifEnvSet $(IP_ADDR) ~172.26.* EPICS_CAS_BEACON_AUTO_ADDR_LIST NO # SwissFEL end stations to machine via gateway ifEnvSet $(IP_ADDR) ~129.129.242.* EPICS_CA_ADDR_LIST sf-saresa-cagw:5062 @@ -53,10 +57,14 @@ ifEnvSet $(IP_ADDR) ~129.129.247.* EPICS_CA_ADDR_LIST sf-satesf-cagw:5062 # HIPA ifEnvSet $(IP_ADDR) ~172.19.* EPICS_CA_ADDR_LIST "172.19.10.255 172.19.30.255 172.19.32.255" ifEnvSet $(IP_ADDR) ~172.19.* EPICS_CA_AUTO_ADDR_LIST NO +ifEnvSet $(IP_ADDR) ~172.19.* EPICS_CAS_BEACON_ADDR_LIST "172.19.10.255 172.19.30.255 172.19.32.255" +ifEnvSet $(IP_ADDR) ~172.19.* EPICS_CAS_BEACON_AUTO_ADDR_LIST NO # PROSCAN ifEnvSet $(IP_ADDR) ~172.25.* EPICS_CA_ADDR_LIST "172.25.60.255 172.25.11.255" ifEnvSet $(IP_ADDR) ~172.25.* EPICS_CA_AUTO_ADDR_LIST NO +ifEnvSet $(IP_ADDR) ~172.25.* EPICS_CAS_BEACON_ADDR_LIST "172.25.60.255 172.25.11.255" +ifEnvSet $(IP_ADDR) ~172.25.* EPICS_CAS_BEACON_AUTO_ADDR_LIST NO # WLHA ifEnvSet $(IP_ADDR) ~172.21.11.* EPICS_CA_ADDR_LIST 172.21.11.255