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

#164 reporting comms version mismatches

Browse Source
This commit is contained in:
Mikayla Fischler
2023-02-15 19:59:58 -05:00
parent 2babd67198
commit 5e65ca636e
9 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtu/rtu.lua
View File

@@ -175,7 +175,8 @@ function rtu.comms(version, modem, local_port, server_port, range, conn_watchdog
modem = modem,
s_port = server_port,
l_port = local_port,
conn_watchdog = conn_watchdog
conn_watchdog = conn_watchdog,
last_est_ack = ESTABLISH_ACK.ALLOW
}
---@class rtu_comms
@@ -414,10 +415,21 @@ function rtu.comms(version, modem, local_port, server_port, range, conn_watchdog
log.info("supervisor connection established")
else
-- establish denied
if est_ack ~= self.last_est_ack then
if est_ack == ESTABLISH_ACK.BAD_VERSION then
-- version mismatch
println_ts("supervisor comms version mismatch (try updating), retrying...")
log.warning("supervisor connection denied due to comms version mismatch")
else
println_ts("supervisor connection denied, retrying...")
log.warning("supervisor connection denied")
end
end
public.unlink(rtu_state)
println_ts("supervisor connection denied")
log.warning("supervisor connection denied by remote host")
end
self.last_est_ack = est_ack
else
log.debug("SCADA_MGMT establish packet length mismatch")
end

2
rtu/startup.lua
View File

@@ -25,7 +25,7 @@ local sna_rtu = require("rtu.dev.sna_rtu")
local sps_rtu = require("rtu.dev.sps_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "beta-v0.10.5"
local RTU_VERSION = "beta-v0.10.6"
local rtu_t = types.rtu_t