izaya/OC-PsychOS2
1
0
Fork 4
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: izaya:88bce6cd96d7de50097616380cf43b24b5c8a38b
Branches Tags
izaya:master
..
compare: izaya:026f2524e681fb5035467846ef4c493f95c1f35f
Branches Tags
izaya:master

No commits in common. "88bce6cd96d7de50097616380cf43b24b5c8a38b" and "026f2524e681fb5035467846ef4c493f95c1f35f" have entirely different histories.
88bce6cd96 ... 026f2524e6

2 changed files with 17 additions and 35 deletions
Show Stats Expand all files Collapse all files

6
lib/netutil.lua
View File

@ -5,7 +5,7 @@ local rpc = require "rpc"
local netutil = {} local netutil = {}
function netutil.importfs(host,rpath,lpath) -- string string string -- boolean -- Import filesystem *rpath* from *host* and attach it to *lpath*. function netutil.importfs(host,rpath,lpath) -- string string string -- boolean -- Import filesystem *rpath* from *host* and attach it to *lpath*.
local px = rpc.proxy(host,"fs_"..rpath.."_") local px = rpc.proxy(host,rpath.."_")
function px.getLabel() function px.getLabel()
return host..":"..rpath return host..":"..rpath
end end
@ -17,8 +17,8 @@ function netutil.exportfs(path) -- string -- boolean -- Export the directory *pa
local path = "/"..table.concat(fs.segments(path),"/") local path = "/"..table.concat(fs.segments(path),"/")
local px = require("unionfs").create(path) local px = require("unionfs").create(path)
for k,v in pairs(px) do for k,v in pairs(px) do
rpc.register("fs_"..path.."_"..k,v) rpc.register(path.."_"..k,v)
print("fs_"..path.."_"..k) print(path.."_"..k)
end end
return true return true
end end

46
lib/rpc.lua
View File

@ -5,34 +5,19 @@ local rpc = {}
_G.rpcf = {} _G.rpcf = {}
rpc.port = 111 rpc.port = 111
local function setacl(self, fname, host)
self[fname] = self[fname] or {}
self[fname][host] = true
end
rpc.allow = setmetatable({},{__call=setacl})
rpc.deny = setmetatable({},{__call=setacl})
local function isPermitted(host,fn)
if rpc.allow[fn] then
return rpc.allow[fn][host] or false
end
if rpc.deny[fn] and rpc.deny[fn][host] then
return false
end
return true
end
local function rpcexec(_, from, port, data) local function rpcexec(_, from, port, data)
os.spawn(function() if port == rpc.port then
if port == rpc.port then local rpcrq = serial.unserialize(data)
local rpcrq = serial.unserialize(data) or {} local rpcn, rpcid = table.remove(rpcrq,1), table.remove(rpcrq,1)
if rpcf[rpcrq[1]] and isPermitted(from,rpcrq[1]) then if rpcf[rpcn] then
minitel.send(from,port,serial.serialize({rpcrq[2],pcall(rpcf[rpcrq[1]],table.unpack(rpcrq,3))})) local rt = {pcall(rpcf[rpcn],table.unpack(rpcrq))}
elseif type(rpcrq[2]) == "string" then if rt[1] == true then
minitel.send(from,port,serial.serialize({rpcrq[2],false,"function unavailable"})) table.remove(rt,1)
end end
minitel.send(from,port,serial.serialize({rpcid,table.unpack(rt)}))
else
end end
end,"rpc worker for "..tostring(from)) end
end end
function rpcf.list() function rpcf.list()
local rt = {} local rt = {}
@ -54,13 +39,10 @@ function rpc.call(hostname,fn,...) -- string string -- boolean -- Calls exported
local _, from, port, data = event.pull(30, "net_msg", hostname, rpc.port) local _, from, port, data = event.pull(30, "net_msg", hostname, rpc.port)
rt = serial.unserialize(tostring(data)) or {} rt = serial.unserialize(tostring(data)) or {}
until (type(rt) == "table" and rt[1] == rv) or computer.uptime() > st + 30 until (type(rt) == "table" and rt[1] == rv) or computer.uptime() > st + 30
if rt[1] == rv then if table.remove(rt,1) == rv then
if rt[2] then return table.unpack(rt)
return table.unpack(rt,3)
end
error(rt[3])
end end
error("timed out") return false
end end
function rpc.proxy(hostname,filter) -- string string -- table -- Returns a component.proxy()-like table from the functions on *hostname* with names matching *filter*. function rpc.proxy(hostname,filter) -- string string -- table -- Returns a component.proxy()-like table from the functions on *hostname* with names matching *filter*.
filter=(filter or "").."(.+)" filter=(filter or "").."(.+)"
@ -87,7 +69,7 @@ function rpc.register(name,fn) -- string function -- -- Registers a function to
if not rpcrunning then if not rpcrunning then
os.spawn(function() os.spawn(function()
while true do while true do
pcall(rpcexec,event.pull("net_msg")) rpcexec(event.pull("net_msg"))
end end
end,"rpc daemon") end,"rpc daemon")
end end