From 1b83c83d6dee5450d3707eba0c6aea64025d9047 Mon Sep 17 00:00:00 2001 From: payonel Date: Mon, 31 Aug 2015 23:57:14 -0700 Subject: [PATCH] initial modem implementation. this does not support disconnecting clients --- src/component/modem.lua | 298 +++++++++++++++++++++++++++++++++++++--- src/main.lua | 2 + 2 files changed, 282 insertions(+), 18 deletions(-) diff --git a/src/component/modem.lua b/src/component/modem.lua index c2a3cf5..cd9b55b 100644 --- a/src/component/modem.lua +++ b/src/component/modem.lua @@ -1,6 +1,254 @@ local address, _, wireless = ... +print(address, _, wireless); compCheckArg(1,wireless,"boolean") +local socket = require("socket") +local ser = require("loot.OpenOS.lib.serialization") + +-- yes, global +modem_host = {} + +-- modem component +local obj = {} + +-- Modem cards communicate on a real backend port +modem_host.comms_port = 61234 +modem_host.comms_ip = "127.0.0.10" +modem_host.connected = false +modem_host.messages = {} +modem_host.socket = nil + +modem_host.hosting = false +modem_host.clients = {} + +-- [port_number] = true when open +modem_host.open_ports = {} + +local function createPacket(type, address, port, ...) + -- args are not checked here (unlike the modem api methods) + -- address can be nil, which means broadcast + local packed = + { + type or "unknown_type", + address or "no address", + modem_host.id or "no sender", + port or "no port", + 0, -- distance + table.unpack(table.pack(...)) + } + + local datagram = ser.serialize(packed) + return datagram .. '\n' +end + +local function parsePacket(raw) + assert(raw) + local packed = ser.unserialize(raw) + assert(packed ~= nil) + assert(#packed >= 5) + + local packet = {} + packet.type = packed[1] + packet.target = packed[2] + packet.source = packed[3] + packet.port = packed[4] + packet.distance = packed[5] + packet.payload = {} + + for i=6,#packed do + table.insert(packet.payload, packed[i]) + end + + return packet +end + +local function packetToArray(packet) + return + { + packet.type, + packet.target, + packet.source, + packet.port, + packet.distance, + table.unpack(packet.payload) + } +end + +function modem_host.broadcast(packet) + -- only host broadcasts + -- this method will be hit for all broadcasted messages + -- but nonhosting clients will simply not repeat the broadcast + if modem_host.hosting then + local plainArray = packetToArray(packet) + local datagram = ser.serialize(plainArray) + for addr,client in pairs(modem_host.clients) do + client:send(datagram) + end + end +end + +function modem_host.validTarget(target) + if target == modem_host.id then + return true + end + + if not modem_host.hosting then + return false + end + + for address,client in pairs(modem_host.clients) do + if address == target then + return true + end + end + + return false +end + +-- backend private methods, these are not pushed to user machine environments +function modem_host.pushMessage(target, datagram) + + if not modem_host.validTarget(target) then + return false, "invalid target, no such client listening" --ignored + end + + local packet = parsePacket(datagram) + table.insert(modem_host.messages, packet) + + return true +end + +function modem_host.processPendingMessages() + modem_host.recvPendingMessages() + + -- computer address seems to be applied late + if not modem_host.id then + modem_host.id = component.list("computer",true)() + assert(modem_host.id) + end + + local i = 1; + while i <= #modem_host.messages do + local packet = modem_host.messages[i] + local move = true + + if packet.type == 'modem_message' then + + -- broadcast if no target + if packet.target == 0 then + modem_host.broadcast(packet) + -- clean up for broadcasting to self + packet.target = modem_host.id + end + + if packet.target == modem_host.id then + if obj.isOpen(packet.port) then + table.insert(machine.signals, packetToArray(packet)) + end + move = false + end + end + + if move then + i = i + 1 + else + table.remove(modem_host.messages, i) + end + + end +end + +function modem_host.recvPendingMessages() + if modem_host.hosting then + while 1 do + local client = modem_host.socket:accept() + if not client then + break; + end + + local handshakeDatagram, err = client:receive() + if err then + client:close() + else + client:settimeout(0, 't') + + local handshake = parsePacket(handshakeDatagram) + modem_host.clients[handshake.source] = client + end + end + + -- recv all pending packets + for source, client in pairs(modem_host.clients) do + local line, err = client:receive() + if not err then + modem_host.pushMessage(source, line) + end + end + elseif modem_host.socket then + while 1 do + local line, err = modem_host.socket:receive() + if not err then + modem_host.pushMessage(modem_host.id, line) + else + break + end + end + end +end + +function modem_host.createNewMessageBoard() + local why + modem_host.socket, why = socket.bind(modem_host.comms_ip, modem_host.comms_port) + if modem_host.socket then + modem_host.hosting = true + end + return modem_host.socket, why +end + +function modem_host.joinExistingMessageBoard() + local why + modem_host.socket, why = socket.connect(modem_host.comms_ip, modem_host.comms_port) + if modem_host.socket then + modem_host.hosting = nil + + -- send handshake data + local datagram = createPacket("client_handshake") + modem_host.send(datagram) + end + return modem_host.socket, why +end + +function modem_host.connectMessageBoard() + + if modem_host.connected then + return true + end + + local ok, reason = + modem_host.joinExistingMessageBoard() or + modem_host.createNewMessageBoard() + + if not ok then + return nil, reason + end + + modem_host.socket:settimeout(0, 't') -- accept calls must be already pending + modem_host.connected = true + modem_host.clients = {} + modem_host.messages = {} + + return true +end + +function modem_host.send(datagram) + -- if we are the host, we simply call pushMessage directly + if modem_host.hosting then + return modem_host.pushMessage(modem_host.id, datagram) + else + return not not modem_host.socket:send(datagram) + end +end + local wakeMessage local strength if wireless then @@ -14,36 +262,38 @@ local function checkPort(port) return math.floor(port) end --- modem component -local obj = {} - function obj.send(address, port, ...) -- Sends the specified data to the specified target. - --STUB cprint("modem.send",address, port, ...) compCheckArg(1,address,"string") compCheckArg(2,port,"number") port=checkPort(port) - return true + + local datagram = createPacket("modem_message", address, port, ...) + return modem_host.send(datagram) end + function obj.getWakeMessage() -- Get the current wake-up message. - --STUB cprint("modem.getWakeMessage") return wakeMessage end function obj.setWakeMessage(message) -- Set the wake-up message. - --STUB cprint("modem.setWakeMessage",message) compCheckArg(1,message,"string","nil") wakeMessage = message end function obj.close(port) -- Closes the specified port (default: all ports). Returns true if ports were closed. - --STUB cprint("modem.close",port) compCheckArg(1,port,"number","nil") if port ~= nil then port=checkPort(port) end - return false + + if not obj.isOpen(port) then + return false; + end + + modem_host.open_ports[port] = nil + return true end function obj.maxPacketSize() -- Gets the maximum packet size (config setting). cprint("modem.maxPacketSize") @@ -51,41 +301,53 @@ function obj.maxPacketSize() -- Gets the maximum packet size (config setting). end if wireless then function obj.getStrength() -- Get the signal strength (range) used when sending messages. - --STUB cprint("modem.getStrength") return strength end function obj.setStrength(newstrength) -- Set the signal strength (range) used when sending messages. - --STUB cprint("modem.setStrength",newstrength) compCheckArg(1,newstrength,"number") strength = newstrength end end function obj.isOpen(port) -- Whether the specified port is open. - --STUB cprint("modem.isOpen",port) compCheckArg(1,port,"number") - return false + return modem_host.open_ports[port] ~= nil end function obj.open(port) -- Opens the specified port. Returns true if the port was opened. - --STUB cprint("modem.open",port) compCheckArg(1,port,"number") port=checkPort(port) - return false + + if obj.isOpen(port) then + return false + end + + -- make sure we are connected to the message board + if not modem_host.connectMessageBoard() then + return false + end + + modem_host.open_ports[port] = true + return true end function obj.isWireless() -- Whether this is a wireless network card. - --STUB cprint("modem.isWireless") return wireless end function obj.broadcast(port, ...) -- Broadcasts the specified data on the specified port. - --STUB cprint("modem.broadcast",port, ...) compCheckArg(1,port,"number") port=checkPort(port) - return true + + -- we cannot broadcast unless we are connected to the message board + if not modem_host.connectMessageBoard() then + return false + end + + local datagram = createPacket("modem_message", 0, port, ...) + return modem_host.send(datagram) end local cec = {} diff --git a/src/main.lua b/src/main.lua index 64ac711..b897116 100644 --- a/src/main.lua +++ b/src/main.lua @@ -53,6 +53,7 @@ if settings.components == nil then {"filesystem",nil,7,"loot/OpenOS",true}, {"filesystem",nil,nil,"tmpfs",false}, {"filesystem",nil,5,nil,false}, + {"modem",nil,nil,false}, {"internet"}, {"computer"}, {"ocemu"}, @@ -313,6 +314,7 @@ function elsa.update(dt) table.remove(kbdcodes,1) table.insert(machine.signals,{kbdcode.type,kbdcode.addr,kbdcode.char or 0,kbdcode.code}) end + modem_host.processPendingMessages() if #machine.signals > 0 then signal = machine.signals[1] table.remove(machine.signals, 1)