#76 added trusted connection ranges for modem messages

reactor-plc/config.lua

@@ -8,6 +8,8 @@ config.REACTOR_ID = 1
 config.SERVER_PORT = 16000
 -- port to listen to incoming packets FROM server
 config.LISTEN_PORT = 14001
+-- max trusted modem message distance (0 to disable check)
+config.TRUSTED_RANGE = 0
 -- log path
 config.LOG_PATH = "/log.txt"
 -- log mode

reactor-plc/plc.lua

@@ -404,15 +404,16 @@ function plc.rps_init(reactor, is_formed)
 end
 
 -- Reactor PLC Communications
----@param id integer
----@param version string
----@param modem table
----@param local_port integer
----@param server_port integer
----@param reactor table
----@param rps rps
----@param conn_watchdog watchdog
-function plc.comms(id, version, modem, local_port, server_port, reactor, rps, conn_watchdog)
+---@param id integer reactor ID
+---@param version string PLC version
+---@param modem table modem device
+---@param local_port integer local listening port
+---@param server_port integer remote server port
+---@param range integer trusted device connection range
+---@param reactor table reactor device
+---@param rps rps RPS reference
+---@param conn_watchdog watchdog watchdog reference
+function plc.comms(id, version, modem, local_port, server_port, range, reactor, rps, conn_watchdog)
     local self = {
         seq_num = 0,
         r_seq_num = nil,
@@ -428,6 +429,13 @@ function plc.comms(id, version, modem, local_port, server_port, reactor, rps, co
         max_burn_rate = nil
     }
 
+    ---@class plc_comms
+    local public = {}
+
+    comms.set_trusted_range(range)
+
+    -- PRIVATE FUNCTIONS --
+
     -- configure modem channels
     local function _conf_channels()
         self.modem.closeAll()
@@ -436,11 +444,6 @@ function plc.comms(id, version, modem, local_port, server_port, reactor, rps, co
 
     _conf_channels()
 
-    ---@class plc_comms
-    local public = {}
-
-    -- PRIVATE FUNCTIONS --
-
     -- send an RPLC packet
     ---@param msg_type RPLC_TYPES
     ---@param msg table

reactor-plc/startup.lua

@@ -14,7 +14,7 @@ local config  = require("reactor-plc.config")
 local plc     = require("reactor-plc.plc")
 local threads = require("reactor-plc.threads")
 
-local R_PLC_VERSION = "beta-v0.10.5"
+local R_PLC_VERSION = "beta-v0.10.6"
 
 local print = util.print
 local println = util.println
@@ -31,6 +31,7 @@ cfv.assert_type_bool(config.NETWORKED)
 cfv.assert_type_int(config.REACTOR_ID)
 cfv.assert_port(config.SERVER_PORT)
 cfv.assert_port(config.LISTEN_PORT)
+cfv.assert_type_int(config.TRUSTED_RANGE)
 cfv.assert_type_str(config.LOG_PATH)
 cfv.assert_type_int(config.LOG_MODE)
 assert(cfv.valid(), "bad config file: missing/invalid fields")
@@ -162,7 +163,7 @@ local function main()
 
                 -- start comms
                 smem_sys.plc_comms = plc.comms(config.REACTOR_ID, R_PLC_VERSION, smem_dev.modem, config.LISTEN_PORT, config.SERVER_PORT,
-                    smem_dev.reactor, smem_sys.rps, smem_sys.conn_watchdog)
+                                                config.TRUSTED_RANGE, smem_dev.reactor, smem_sys.rps, smem_sys.conn_watchdog)
                 log.debug("init> comms init")
             else
                 println("boot> starting in offline mode")