GitHub/cc-mek-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#636 close connections on nic switch

Browse Source
This commit is contained in:
Mikayla Fischler
2025-11-08 19:14:34 -05:00
parent 76fc5751c9
commit 3987d337c4
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coordinator/coordinator.lua
View File

@@ -250,7 +250,10 @@ function coordinator.comms(version, nic, wl_nic, sv_watchdog)
-- switch the current active NIC -- switch the current active NIC
---@param act_nic nic ---@param act_nic nic
function public.switch_nic(act_nic) nic = act_nic end function public.switch_nic(act_nic)
public.close()
nic = act_nic
end
-- try to connect to the supervisor if not already linked -- try to connect to the supervisor if not already linked
---@param abort boolean? true to print out cancel info if not linked (use on program terminate) ---@param abort boolean? true to print out cancel info if not linked (use on program terminate)

5
reactor-plc/plc.lua
View File

@@ -830,7 +830,10 @@ function plc.comms(version, nic, reactor, rps, conn_watchdog)
-- switch the current active NIC -- switch the current active NIC
---@param act_nic nic ---@param act_nic nic
function public.switch_nic(act_nic) nic = act_nic end function public.switch_nic(act_nic)
public.close()
nic = act_nic
end
-- reconnect a newly connected reactor -- reconnect a newly connected reactor
---@param new_reactor table ---@param new_reactor table

8
rtu/backplane.lua
View File

@@ -136,7 +136,7 @@ function backplane.attach(type, device, iface, print_no_fp)
-- switch back to preferred wired -- switch back to preferred wired
_bp.act_nic = wd_nic _bp.act_nic = wd_nic
comms.switch_nic(_bp.act_nic) comms.switch_nic(_bp.act_nic, _bp.smem.rtu_state)
log.info("BKPLN: switched comms to wired modem (preferred)") log.info("BKPLN: switched comms to wired modem (preferred)")
end end
elseif wl_nic and (not wl_nic.is_connected()) and m_is_wl then elseif wl_nic and (not wl_nic.is_connected()) and m_is_wl then
@@ -152,7 +152,7 @@ function backplane.attach(type, device, iface, print_no_fp)
-- switch back to preferred wireless -- switch back to preferred wireless
_bp.act_nic = wl_nic _bp.act_nic = wl_nic
comms.switch_nic(_bp.act_nic) comms.switch_nic(_bp.act_nic, _bp.smem.rtu_state)
log.info("BKPLN: switched comms to wireless modem (preferred)") log.info("BKPLN: switched comms to wireless modem (preferred)")
end end
elseif wl_nic and m_is_wl then elseif wl_nic and m_is_wl then
@@ -227,14 +227,14 @@ function backplane.detach(type, device, iface, print_no_fp)
elseif wd_nic and wd_nic.is_connected() then elseif wd_nic and wd_nic.is_connected() then
_bp.act_nic = wd_nic _bp.act_nic = wd_nic
comms.switch_nic(_bp.act_nic) comms.switch_nic(_bp.act_nic, _bp.smem.rtu_state)
log.info("BKPLN: switched comms to wired modem") log.info("BKPLN: switched comms to wired modem")
end end
elseif wl_nic and wl_nic.is_connected() then elseif wl_nic and wl_nic.is_connected() then
-- wired active disconnected, wireless available -- wired active disconnected, wireless available
_bp.act_nic = wl_nic _bp.act_nic = wl_nic
comms.switch_nic(_bp.act_nic) comms.switch_nic(_bp.act_nic, _bp.smem.rtu_state)
log.info("BKPLN: switched comms to wireless modem") log.info("BKPLN: switched comms to wireless modem")
else else
-- wired active disconnected, wireless unavailable -- wired active disconnected, wireless unavailable

6
rtu/rtu.lua
View File

@@ -359,7 +359,11 @@ function rtu.comms(version, nic, conn_watchdog)
-- switch the current active NIC -- switch the current active NIC
---@param act_nic nic ---@param act_nic nic
function public.switch_nic(act_nic) nic = act_nic end ---@param rtu_state rtu_state
function public.switch_nic(act_nic, rtu_state)
public.close(rtu_state)
nic = act_nic
end
-- unlink from the server -- unlink from the server
---@param rtu_state rtu_state ---@param rtu_state rtu_state