rahix/oc-basecontrol
1
1
Fork 0
Code Issues Releases Activity

Fix network mock

Browse source 
Signed-off-by: Rahix <rahix@rahix.de>
This commit is contained in:
rahix 2019-04-16 21:09:37 +02:00
parent 646a5b28fd
commit 9c44faa811
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
event.lua
View file

@ -28,7 +28,7 @@ end
function event.pullFiltered(timeout, filter) function event.pullFiltered(timeout, filter)
while true do while true do
local msg = table.pack(network.pull()) local msg = table.pack(network.pull())
if msg == nil then if msg[1] == nil then
return nil return nil
elseif filter(table.unpack(msg)) then elseif filter(table.unpack(msg)) then
return table.unpack(msg) return table.unpack(msg)

7
network.lua
View file

@ -64,18 +64,19 @@ function network.pull()
local message = inject_message[current_node][1] local message = inject_message[current_node][1]
table.remove(inject_message[current_node], 1) table.remove(inject_message[current_node], 1)
-- print("pulled "..require("serialization").serialize(message))
-- Actually send the injected message now -- Actually send the injected message now
-- but save the last latest_message
local latest = latest_message[current_node]
table.insert(active_node, message.from) table.insert(active_node, message.from)
network.send(current_node, message.port, message.msg) network.send(current_node, message.port, message.msg)
active_node[#active_node] = nil active_node[#active_node] = nil
latest_message[current_node] = latest
return "modem_message", current_node, message.from, message.port, 0, message.msg return "modem_message", current_node, message.from, message.port, 0, message.msg
end end
if latest_message[current_node] == nil then if latest_message[current_node] == nil then
error("Tried to pull while no message was available") return nil
end end
local message = latest_message[current_node] local message = latest_message[current_node]