.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-insert_final_newline = true
-
-[*.lua]
-indent_style = space
-indent_size = 1

KittenOS/apps/svc-minitel.lua

@@ -40,8 +40,10 @@ sender: original sender of packet
 data: the actual packet data, duh.
 ]]--
 
+local listeners = {}
 local timers = {}
 local hostname = computer.address():sub(1,8)
+local listener = false
 local dbug = false
 local modems = {}
 local port = 4096
@@ -110,7 +112,7 @@ local function genPacketID()
  return npID
 end
 
-local function sendPacket(packetID,packetType,dest,sender,vport,data,repeatingFrom)
+local function sendPacket(packetID,packetType,dest,sender,vport,data)
  if rcache[dest] then
   dprint("Cached", rcache[dest][1],"send",rcache[dest][2],port,packetID,packetType,dest,sender,vport,data)
   if modems[rcache[dest][1]].type == "modem" then
@@ -121,14 +123,10 @@ local function sendPacket(packetID,packetType,dest,sender,vport,data,repeatingFr
  else
   dprint("Not cached", port,packetID,packetType,dest,sender,vport,data)
   for k,v in pairs(modems) do
-   -- do not send message back to the wired or linked modem it came from
-   -- the check for tunnels is for short circuiting `v.isWireless()`, which does not exist for tunnels
-   if v.address ~= repeatingFrom or (v.type ~= "tunnel" and v.isWireless()) then
-    if v.type == "modem" then
-     v.broadcast(port,packetID,packetType,dest,sender,vPort,data)
-    elseif v.type == "tunnel" then
-     v.send(packetID,packetType,dest,sender,vPort,data)
-    end
+   if v.type == "modem" then
+    v.broadcast(port,packetID,packetType,dest,sender,vport,data)
+   elseif v.type == "tunnel" then
+    v.send(packetID,packetType,dest,sender,vport,data)
    end
   end
  end

OpenOS/etc/rc.d/minitel.lua

@@ -19,11 +19,10 @@ local event = require "event"
 local component = require "component"
 local computer = require "computer"
 local serial = require "serialization"
-
 local hostname = computer.address():sub(1,8)
-local modems = {}
-
+local listener = false
 cfg.debug = false
+local modems = {}
 cfg.port = 4096
 cfg.retry = 10
 cfg.retrycount = 64
@@ -92,9 +91,7 @@ function start()
   f:close()
  end
  print("Hostname: "..hostname)
-
- if next(listeners) ~= nil then return end
-
+ if listener then return end
  modems={}
  for a,t in component.list("modem") do
   modems[#modems+1] = component.proxy(a)
@@ -115,7 +112,7 @@ function start()
   return npID
  end
  
- local function sendPacket(packetID,packetType,dest,sender,vPort,data,repeatingFrom)
+ local function sendPacket(packetID,packetType,dest,sender,vPort,data)
   if rcache[dest] then
    dprint("Cached", rcache[dest][1],"send",rcache[dest][2],cfg.port,packetID,packetType,dest,sender,vPort,data)
    if component.type(rcache[dest][1]) == "modem" then
@@ -126,14 +123,10 @@ function start()
   else
    dprint("Not cached", cfg.port,packetID,packetType,dest,sender,vPort,data)
    for k,v in pairs(modems) do
-    -- do not send message back to the wired or linked modem it came from
-    -- the check for tunnels is for short circuiting `v.isWireless()`, which does not exist for tunnels
-    if v.address ~= repeatingFrom or (v.type ~= "tunnel" and v.isWireless()) then
-     if v.type == "modem" then
-      v.broadcast(cfg.port,packetID,packetType,dest,sender,vPort,data)
-     elseif v.type == "tunnel" then
-      v.send(packetID,packetType,dest,sender,vPort,data)
-     end
+    if v.type == "modem" then
+     v.broadcast(cfg.port,packetID,packetType,dest,sender,vPort,data)
+    elseif v.type == "tunnel" then
+     v.send(packetID,packetType,dest,sender,vPort,data)
     end
    end
   end
@@ -184,7 +177,7 @@ function start()
    elseif dest:sub(1,1) == "~" then -- broadcasts start with ~
     computer.pushSignal("net_broadcast",sender,vPort,data)
    elseif cfg.route then -- repeat packets if route is enabled
-    sendPacket(packetID,packetType,dest,sender,vPort,data,localModem)
+    sendPacket(packetID,packetType,dest,sender,vPort,data)
    end
    if not rcache[sender] then -- add the sender to the rcache
     dprint("rcache: "..sender..":", localModem,from,computer.uptime())
@@ -240,12 +233,10 @@ end
 function stop()
  for k,v in pairs(listeners) do
   event.ignore(k,v)
-  listeners[k] = nil
   print("Stopped listener: "..tostring(v))
  end
  for k,v in pairs(timers) do
   event.cancel(v)
-  timers[k] = nil
   print("Stopped timer: "..tostring(v))
  end
 end

protocol-3.md

@@ -12,7 +12,7 @@ Upon a node receiving a message addressed to itself, it should:
 2. Check if the packet is addressed to the node, and if so, queue it as a net_msg event
 3. If the packet is indeed addressed to this node, and the packet type is 1 (reliable), send an acknowledgement packet.
 4. Optional: Add the sender to the address cache if it isn't already in the cache
-5. Optional: If the packet is addressed to a different node, repeat the packet via all wireless modems and all wired/linked modems, preferably excluding the one receiving the packet, and preferably respecting the address cache
+5. Optional: If the packet is addressed to a different node, repeat the packet, preferably respecting the address cache
 
 If the packet is, for some reason invalid, simply drop the packet.