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

#213 strict sequence verification

Browse Source
This commit is contained in:
Mikayla
2023-04-21 21:10:15 +00:00
parent c75f08a9f7
commit 783c4936cc
15 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coordinator/coordinator.lua
View File

@@ -506,7 +506,7 @@ function coordinator.comms(version, modem, sv_port, sv_listen, api_listen, range
-- check sequence number
if self.sv_r_seq_num == nil then
self.sv_r_seq_num = packet.scada_frame.seq_num()
elseif self.connected and self.sv_r_seq_num >= packet.scada_frame.seq_num() then
elseif self.connected and ((self.sv_r_seq_num + 1) ~= packet.scada_frame.seq_num()) then
log.warning("sequence out-of-order: last = " .. self.sv_r_seq_num .. ", new = " .. packet.scada_frame.seq_num())
return
else

2
coordinator/session/api.lua
View File

@@ -104,7 +104,7 @@ function api.new_session(id, in_queue, out_queue, timeout)
-- check sequence number
if self.r_seq_num == nil then
self.r_seq_num = pkt.scada_frame.seq_num()
elseif self.r_seq_num >= pkt.scada_frame.seq_num() then
elseif (self.r_seq_num + 1) ~= pkt.scada_frame.seq_num() then
log.warning(log_header .. "sequence out-of-order: last = " .. self.r_seq_num .. ", new = " .. pkt.scada_frame.seq_num())
return
else

2
coordinator/startup.lua
View File

@@ -20,7 +20,7 @@ local sounder = require("coordinator.sounder")
local apisessions = require("coordinator.session.apisessions")
local COORDINATOR_VERSION = "v0.13.6"
local COORDINATOR_VERSION = "v0.13.7"
local println = util.println
local println_ts = util.println_ts