From ad4284a340c4da107dc47ef108c8312d0ef0c512 Mon Sep 17 00:00:00 2001
From: Izaya <redtailedairways@gmail.com>
Date: Thu, 5 Apr 2018 18:19:02 +1000
Subject: [PATCH] confirmed working more or less

---
 TCPBridge/bridge.lua       | 50 ++++++++++++++++++++++++++++++--------
 TCPBridge/interminitel.lua | 14 ++++++-----
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/TCPBridge/bridge.lua b/TCPBridge/bridge.lua
index 694a0e8..008381c 100644
--- a/TCPBridge/bridge.lua
+++ b/TCPBridge/bridge.lua
@@ -5,12 +5,31 @@ local clients, coroutines, messages = {}, {}, {}
 
 local function spawn(f)
  coroutines[#coroutines+1] = coroutine.create(function()
+  pid = #coroutines
   while true do
-   print(pcall(f))
+   print(pid,pcall(f))
   end
  end)
 end
 
+function reprint(...)
+ local tA = {...}
+ for k,v in pairs(tA) do
+  local s = ""
+  v=tostring(v)
+  for i = 1, v:len() do
+   if string.byte(v:sub(i,i)) < 32 or string.byte(v:sub(i,i)) > 127 then
+    s=s .. "\\" .. tostring(string.byte(v:sub(i,i)))
+   else
+    s=s..v:sub(i,i)
+   end
+  end
+  print(s)
+ end
+end
+
+reprint(imt.encodePacket("Hello, world!",123))
+
 local function hasValidPacket(s)
  local w, res = pcall(imt.decodePacket,s)
  if res then return true end
@@ -25,7 +44,8 @@ function socketLoop()
   if client then
    client:settimeout(0)
    clients[#clients+1] = {["conn"]=client,last=os.time(),buffer=""}
-   print("Gained client: "..client:getsockname())
+   local i,p = client:getsockname()
+   print("Gained client #"..tostring(#clients)..": "..i..":"..tostring(p))
   end
   coroutine.yield()
  end
@@ -35,11 +55,21 @@ spawn(socketLoop)
 
 function clientLoop()
  while true do
-  for _,client in pairs(clients) do
-   local s=client.conn:receive()
+  for id,client in pairs(clients) do
+   local s,b,c=client.conn:receive(1)
    if s then
     client.buffer = client.buffer .. s
-    print(s)
+    client.last=os.time()
+   end
+   if client.buffer:len() > 16384 then
+    print("Dropping client "..tostring(id).." for wasting resources")
+    client.conn:close()
+    clients[id] = nil
+   end
+   if client.last+30 < os.time() then
+    print("Dropping client "..tostring(id).." for inactivity")
+    client.conn:close()
+    clients[id] = nil
    end
   end
   coroutine.yield()
@@ -52,10 +82,10 @@ function pushLoop()
  while true do
   for id,msg in pairs(messages) do
    for _,client in pairs(clients) do
-    client.conn:send(msg.."\n")
+    client.conn:send(msg)
    end
    messages[id] = nil
-   print(msg)
+   reprint(msg)
   end
   coroutine.yield()
  end
@@ -67,9 +97,9 @@ function bufferLoop()
  while true do
   for _,client in pairs(clients) do
    if client.buffer:len() > 0 then
-    if hasValidPacket(client.buffer) then
-     messages[#messages+1] = imt.encodePacket(imt.decodePacket(client.buffer))
-     client.buffer = imt.getRemainder(client.buffer)
+    if imt.decodePacket(client.buffer) then
+    messages[#messages+1] = imt.encodePacket(imt.decodePacket(client.buffer))
+    client.buffer = imt.getRemainder(client.buffer) or ""
     end
    end
   end
diff --git a/TCPBridge/interminitel.lua b/TCPBridge/interminitel.lua
index 9dc5bca..7cc4f04 100644
--- a/TCPBridge/interminitel.lua
+++ b/TCPBridge/interminitel.lua
@@ -31,18 +31,20 @@ function imt.decodePacket(s)
   s=s:sub(n+1)
   return ns
  end
+ if s:len() < 2 then return false end
  local plen = imt.from16bn(getfirst(2))
+ local segments = {}
  if s:len() < plen then return false end
  local nsegments = string.byte(getfirst(1))
- local tsegments = {}
+ --print(tostring(plen).." bytes, "..tostring(nsegments).." segments")
  for i = 1, nsegments do
-  if s:len() < 1 then return false end
   local seglen = imt.from16bn(getfirst(2))
-  local segtype = string.byte(getfirst(1))
-  local tempseg = getfirst(seglen)
-  tsegments[#tsegments+1] = imt.ftypes[segtype](tempseg)
+  local segtype = imt.ftypes[string.byte(getfirst(1))]
+  local segment = segtype(getfirst(seglen))
+  --print(seglen,segtype,segment,type(segment))
+  segments[#segments+1] = segment
  end
- return table.unpack(tsegments)
+ return table.unpack(segments)
 end
 function imt.getRemainder(s)
  local function getfirst(n)