From c8eb348bf93495a580281f08d6fa1568df52456d Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 13 Dec 2021 10:03:26 +0100 Subject: [PATCH] again use EPICS_CA_AUTO_ADDR_LIST in SLS network --- startup.script_linux | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/startup.script_linux b/startup.script_linux index 6ed13f5..56d7532 100644 --- a/startup.script_linux +++ b/startup.script_linux @@ -20,17 +20,13 @@ system "ip a s `ip r|awk '/^default /{print $5;exit}'`|awk -F'[/ ]+' -vP='epicsE < /tmp/$(IOC).net system "rm /tmp/$(IOC).net" -# Default: automatic -epicsEnvSet EPICS_CA_AUTO_ADDR_LIST YES - # Office (only officicial EPICS subnets, not SLS beamlines!) ifEnvSet $(IP_ADDR) ~129.129.130.* EPICS_CA_ADDR_LIST "129.129.131.255 129.129.137.255" ifEnvSet $(IP_ADDR) ~129.129.131.* EPICS_CA_ADDR_LIST "129.129.130.255 129.129.137.255" ifEnvSet $(IP_ADDR) ~129.129.137.* EPICS_CA_ADDR_LIST "129.129.130.255 129.129.131.255" # SLS machine network -ifEnvSet $(IP_ADDR) ~172.20.* EPICS_CA_ADDR_LIST "172.20.255.255 cryo-cagw.psi.ch:5062 sls129-softioc-mevis.psi.ch x01dc-cagw.psi.ch:5062 x02da-cagw.psi.ch:5062 x03da-cagw.psi.ch:5062 x03ma-cagw.psi.ch:5062 x04db-cagw.psi.ch:5062 x04sa-cagw.psi.ch:5062 x05da-cagw.psi.ch:5062 x05la-cagw.psi.ch:5062 x06da-cagw.psi.ch:5062 x06mx-cagw.psi.ch:5062 x06sa-cagw.psi.ch:5062 x07da-cagw.psi.ch:5062 x07ma-cagw.psi.ch:5062 x09la-cagw.psi.ch:5062 x09lb-cagw.psi.ch:5062 x10da-cagw.psi.ch:5062 x10sa-cagw.psi.ch:5062 x11ma-cagw.psi.ch:5062 x12sa-cagw.psi.ch:5062" -ifEnvSet $(IP_ADDR) ~172.20.* EPICS_CA_AUTO_ADDR_LIST NO +ifEnvSet $(IP_ADDR) ~172.20.* EPICS_CA_ADDR_LIST "cryo-cagw.psi.ch:5062 sls129-softioc-mevis.psi.ch x01dc-cagw.psi.ch:5062 x02da-cagw.psi.ch:5062 x03da-cagw.psi.ch:5062 x03ma-cagw.psi.ch:5062 x04db-cagw.psi.ch:5062 x04sa-cagw.psi.ch:5062 x05da-cagw.psi.ch:5062 x05la-cagw.psi.ch:5062 x06da-cagw.psi.ch:5062 x06mx-cagw.psi.ch:5062 x06sa-cagw.psi.ch:5062 x07da-cagw.psi.ch:5062 x07ma-cagw.psi.ch:5062 x09la-cagw.psi.ch:5062 x09lb-cagw.psi.ch:5062 x10da-cagw.psi.ch:5062 x10sa-cagw.psi.ch:5062 x11ma-cagw.psi.ch:5062 x12sa-cagw.psi.ch:5062" # SLS beamlines ifEnvSet $(IP_ADDR) ~129.129.98.* EPICS_CA_ADDR_LIST sls-x01dc-cagw.psi.ch:5800 @@ -53,6 +49,7 @@ ifEnvSet $(IP_ADDR) ~129.129.118.* EPICS_CA_ADDR_LIST sls-x10sa-cagw.psi.ch:5832 ifEnvSet $(IP_ADDR) ~129.129.121.* EPICS_CA_ADDR_LIST sls-x11ma-cagw.psi.ch:5834 ifEnvSet $(IP_ADDR) ~129.129.122.* EPICS_CA_ADDR_LIST sls-x12sa-cagw.psi.ch:5836 + # SwissFEL machine networks # 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 129.129.242.255 129.129.243.255"