diff --git a/scada-common/network.lua b/scada-common/network.lua index cd2cfdd..7483c8e 100644 --- a/scada-common/network.lua +++ b/scada-common/network.lua @@ -4,6 +4,7 @@ local comms = require("scada-common.comms") local log = require("scada-common.log") +local ppm = require("scada-common.ppm") local util = require("scada-common.util") local md5 = require("lockbox.digest.md5") @@ -77,10 +78,11 @@ end -- NIC: Network Interface Controller
-- utilizes HMAC-MD5 for message authentication, if enabled and this is wireless ----@param iface string peripheral interface name ---@param modem Modem modem to use -function network.nic(iface, modem) +function network.nic(modem) local self = { + -- modem interface name + iface = ppm.get_iface(modem), -- used to quickly return out of tx/rx functions if there is nothing to do connected = true, -- used to avoid costly MAC calculations if not required @@ -195,7 +197,7 @@ function network.nic(iface, modem) function public.receive(side, sender, reply_to, message, distance) local packet = nil - if self.connected and side == iface then + if self.connected and side == self.iface then local s_packet = comms.scada_packet() if self.use_hash then diff --git a/supervisor/pcie.lua b/supervisor/pcie.lua index fab96f0..dea089e 100644 --- a/supervisor/pcie.lua +++ b/supervisor/pcie.lua @@ -76,7 +76,7 @@ function pcie_bus.init(config, println) return false end - bus.wd_nic = network.nic(bus.wired_modem, wired_modem) + bus.wd_nic = network.nic(wired_modem) pcie_bus.nic.cards[bus.wired_modem] = bus.wd_nic end @@ -89,7 +89,7 @@ function pcie_bus.init(config, println) return false end - bus.wl_nic = network.nic(wireless_iface, wireless_modem) + bus.wl_nic = network.nic(wireless_modem) pcie_bus.nic.cards[wireless_iface] = bus.wl_nic end diff --git a/supervisor/session/svsessions.lua b/supervisor/session/svsessions.lua index a8c7165..3fae56f 100644 --- a/supervisor/session/svsessions.lua +++ b/supervisor/session/svsessions.lua @@ -6,7 +6,6 @@ local log = require("scada-common.log") local mqueue = require("scada-common.mqueue") local types = require("scada-common.types") local util = require("scada-common.util") -local pcie = require("supervisor.pcie") local databus = require("supervisor.databus")