From 581edc74a1dcc1dae47691ec87063ec9c3b88ee4 Mon Sep 17 00:00:00 2001 From: XeonSquared Date: Wed, 2 Aug 2017 23:51:30 +1000 Subject: [PATCH] made the network driver use _G.net for configuration. --- modules/drivers/net.lua | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/drivers/net.lua b/modules/drivers/net.lua index 0b8057b..a9777b9 100644 --- a/modules/drivers/net.lua +++ b/modules/drivers/net.lua @@ -1,21 +1,25 @@ -function _G.net_send(id,po,msg) -- id, port, message +net = {} +net.id = computer.address():sub(1,8) +net.vlan = 1 +net.np = 4096 +net.tm = {} +function net.send(id,po,msg) -- id, port, message event.push("sendmsg",id,po,msg) end spawn("network daemon",function () - tM,nP,_G.nID,nVL = {}, 4096, computer.address():sub(1,8), 1 - for a,t in component.list("modem") do -- open the port of the vlan on all network interfaces - table.insert(tM,component.proxy(a)) - component.proxy(a).open(nVL) + for a,t in component.list("modem") do + table.insert(net.tm,component.proxy(a)) + component.proxy(a).open(net.vlan) end while true do - local ev = {event.pull()} -- this totally isn't just MultICE code with a fancy wrapper + local ev = {event.pull()} if ev[1] == "sendmsg" then local eT = ev - for k,v in ipairs(tM) do - v.broadcast(nVL,nP,eT[2],nID,eT[3],eT[4]) + for k,v in ipairs(net.tm) do + v.broadcast(net.vlan,net.np,eT[2],net.id,eT[3],eT[4]) end elseif ev[1] == "modem_message" then - if ev[7] == nID then + if ev[7] == net.id then event.push("net_msg",ev[8],ev[9],ev[10]) end end