moved nsh stuff to the net dir

configs/everything-debug.cfg

@@ -6,6 +6,8 @@ library/print.lua
 library/fs-min.lua
 library/fs-std.lua
 library/fs-util.lua
+library/buffer.lua
+library/io.lua
 util/fs-automount.lua
 drivers/tty.lua
 drivers/kbd.lua
@@ -17,10 +19,11 @@ library/base64.lua
 library/chauth.lua
 library/fs-ext.lua
 library/readline.lua
-applications/nshd.lua
+net/nshd.lua
-applications/nshc.lua
+net/nshc.lua
-applications/nshd-auth.lua
+net/nshd-auth.lua
-applications/nshc-auth.lua
+net/nshc-auth.lua
+applications/inshc.lua
 applications/shutil.lua
 applications/skex2.lua
 applications/luash.lua

configs/everything-noinit.cfg

@@ -15,10 +15,10 @@ library/base64.lua
 library/chauth.lua
 library/fs-ext.lua
 library/readline.lua
-applications/nshd.lua
+net/nshd.lua
-applications/nshc.lua
+net/nshc.lua
-applications/nshd-auth.lua
+net/nshd-auth.lua
-applications/nshc-auth.lua
+net/nshc-auth.lua
 applications/shutil.lua
 applications/skex2.lua
 applications/luash.lua

configs/everything.cfg

@@ -13,8 +13,8 @@ net/ping.lua
 library/base64.lua
 library/fs-ext.lua
 library/readline.lua
-applications/nshd.lua
+net/nshd.lua
-applications/nshc.lua
+net/nshc.lua
 applications/shutil.lua
 applications/skex2.lua
 applications/luash.lua

configs/headless.cfg

@@ -2,7 +2,7 @@ base/header.lua
 library/print.lua
 library/net.lua
 library/readline.lua
-applications/nshd.lua
+net/nshd.lua
 applications/luash.lua
 applications/shutil.lua
 library/fs-min.lua

configs/network-terminal.cfg

@@ -5,7 +5,7 @@ drivers/kbd.lua
 util/autogpu.lua
 library/net.lua
 library/readline.lua
-applications/nshc.lua
+net/nshc.lua
 applications/luash.lua
 applications/autoluash.lua
 util/loadeeprom.lua

configs/virt.lua

@@ -0,0 +1,3 @@
+base/header.lua
+base/virt.lua
+base/footer.lua

modules/net/nshc-auth.lua

@@ -0,0 +1,33 @@
+function nshcs_w(evPP,nid,pW)
+ local sI = E().sI or 1
+ chauthc(nid,evPP,pW)
+ while true do
+  if ev[1] == "net_msg" then
+   local V,msg=false,tostring(ev[4])
+   if ev[3] == evPP and ev[2] == nid then
+    if msg:sub(1,3) == "dis" then
+     write(msg:sub(4))
+    end
+   end
+  elseif ev[1] == "key" and ev[2] == sI and ev[3] == 29 and ev[4] == 27 then
+   break
+  elseif ev[1] == "key" and ev[2] == sI then
+   ns(nid,evPP,"key"..tostring(ev[3]))
+  end
+  C.yield()
+ end
+ ns(nid,evPP,"exit")
+end
+
+function nshcs(P,nid,pW)
+ ns(nid,P,"initnsh")
+ while true do
+  if ev[1] == "net_msg" and ev[2] == nid and ev[3] == P then
+   break
+  elseif ev[1] == "key" and ev[2] == sI and ev[3] == 29 and ev[4] == 27 then
+   break
+  end
+  C.yield()
+ end
+ nshcs_w(ev[4],nid,pW)
+end

modules/net/nshc.lua

@@ -0,0 +1,32 @@
+function nshc_w(evPP,nid)
+ local sI = E().sI or 1
+ while true do
+  if ev[1] == "net_msg" then
+   local V,msg=false,tostring(ev[4])
+   if ev[3] == evPP and ev[2] == nid then
+    if msg:sub(1,3) == "dis" then
+     write(msg:sub(4))
+    end
+   end
+  elseif ev[1] == "key" and ev[2] == sI and ev[3] == 29 and ev[4] == 27 then
+   break
+  elseif ev[1] == "key" and ev[2] == sI then
+   ns(nid,evPP,"key"..tostring(ev[3]))
+  end
+  C.yield()
+ end
+ ns(nid,evPP,"exit")
+end
+
+function nshc(P,nid)
+ ns(nid,P,"initnsh")
+ while true do
+  if ev[1] == "net_msg" and ev[2] == nid and ev[3] == P then
+   break
+  elseif ev[1] == "key" and ev[2] == sI and ev[3] == 29 and ev[4] == 27 then
+   break
+  end
+  C.yield()
+ end
+ nshc_w(ev[4],nid)
+end

modules/net/nshd-auth.lua

@@ -0,0 +1,38 @@
+function nshds_w(evPP,cA,sI,pW)
+s("nshds - "..tostring(sI),function()
+ chauths(cA,evPP,pW) 
+ luash({["sI"]=sI})
+ while true do
+  if ev[1] == "net_msg" then
+   local msg=tostring(ev[4])
+   if ev[3] == evPP and ev[2] == cA then
+    if msg:sub(1,3) == "key" then
+     h("key",tT[cT][3].sI,tonumber(msg:sub(4)),0)
+    elseif msg == "exit" then pcall(killsession,sI) break
+    end
+   end
+  elseif ev[1] == "display" and ev[3] == tT[cT][3].sI then
+   ns(cA,evPP,"dis"..tostring(ev[2]))
+  end
+  C.yield()
+ end
+end,{["sI"]=sI})
+end
+
+function nshds(P,pW)
+ s("nshds",function()
+  local Cc=1
+  while true do
+   if ev[1] == "net_msg" and ev[3] == P then
+    if ev[4] == "initnsh" then
+     nnID="nsh-"..tostring(Cc)
+     Cc=Cc+1
+     ns(ev[2],P,nnID)
+     nshds_w(nnID,ev[2],nnID,pW)
+     print("[nshds]Spawned "..nnID.." for "..tostring(ev[2]))
+    end
+   end
+   C.yield()
+  end
+ end,{["sI"]="log"})
+end

modules/net/nshd.lua

@@ -0,0 +1,37 @@
+function nshd_w(evPP,cA,sI)
+s("nshd - "..tostring(sI),function()
+ luash({["sI"]=sI})
+ while true do
+  if ev[1] == "net_msg" then
+   local msg=tostring(ev[4])
+   if ev[3] == evPP and ev[2] == cA then
+    if msg:sub(1,3) == "key" then
+     h("key",tT[cT][3].sI,tonumber(msg:sub(4)),0)
+    elseif msg == "exit" then pcall(killsession,sI) break
+    end
+   end
+  elseif ev[1] == "display" and ev[3] == tT[cT][3].sI then
+   ns(cA,evPP,"dis"..tostring(ev[2]))
+  end
+  C.yield()
+ end
+end,{["sI"]=sI})
+end
+
+function nshd(P)
+ s("nshd",function()
+  local Cc=1
+  while true do
+   if ev[1] == "net_msg" and ev[3] == P then
+    if ev[4] == "initnsh" then
+     nnID="nsh-"..tostring(Cc)
+     Cc=Cc+1
+     ns(ev[2],P,nnID)
+     nshd_w(nnID,ev[2],nnID)
+     print("[nshd]Spawned "..nnID.." for "..tostring(ev[2]))
+    end
+   end
+   C.yield()
+  end
+ end,{["sI"]="log"})
+end