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
supervisor/session/coordinator.lua
View File

@@ -178,7 +178,7 @@ function coordinator.new_session(id, in_queue, out_queue, timeout, facility)
-- 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
supervisor/session/plc.lua
View File

@@ -284,7 +284,7 @@ function plc.new_session(id, reactor_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
supervisor/session/pocket.lua
View File

@@ -89,7 +89,7 @@ function pocket.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
supervisor/session/rtu.lua
View File

@@ -214,7 +214,7 @@ function rtu.new_session(id, in_queue, out_queue, timeout, advertisement, facili
-- 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
supervisor/startup.lua
View File

@@ -14,7 +14,7 @@ local supervisor = require("supervisor.supervisor")
local svsessions = require("supervisor.session.svsessions")
local SUPERVISOR_VERSION = "v0.15.4"
local SUPERVISOR_VERSION = "v0.15.5"
local println = util.println
local println_ts = util.println_ts