[OCNetFS] Clean up both servers

Move all locals to where they should be and not at the top
Sanitize debug printing
Convert control numbers to string for better debugging
Fix skipping clients if one client closes
Remove useless arg support

Author: gamax92

OCNetFS/lfs-server.lua

@@ -1,15 +1,14 @@
 -- Warning, given a bug in this program, the client could potentially access files outside the folder
 -- Best to chroot/limit permissions for this server
-local server, curclient, totalspace, curspace, port, label, change, debug, recurseCount
-local sockets, hndls = {}, {}
 
 -- Configuration
-totalspace = math.huge
-curspace = 0
-port = 14948
-label = "netfs"
-change = false
-debug = false
+local totalspace = math.huge
+local curspace = 0
+local port = 14948
+local label = "netfs"
+local change = false
+local debug = false
+-- End of Configuration
 
 local socket = require("socket")
 local lfs = require("lfs")
@@ -49,6 +48,7 @@ local function getDirectoryItems(path)
 	return output
 end
 
+local recurseCount
 function recurseCount(path)
 	local count = 0
 	local list = getDirectoryItems(path)
@@ -61,14 +61,12 @@ function recurseCount(path)
 				print(path .. "/" .. list[i])
 				print(lfs.attributes(path .. "/" .. list[i],"mode"))
 			end
-			count = count + (lfs.attributes(path .. "/" .. list[i],"size") or 0)
+			count = count + (size or 0)
 		end
 	end
 	return count
 end
 
-local arg = { ... }
-
 print("Warning, I take no responsibility if a bug in this program eats your computer\nIt's your fault for running it under such a permission\nThough, bug reports and fixes are welcomed ;)\n")
 
 if change then
@@ -78,15 +76,13 @@ end
 print("Calculating current space usage ...")
 curspace = recurseCount(sanitizePath("/"))
 
-local stat
-stat, server = pcall(assert,socket.bind("*", port))
+local stat, server = pcall(assert,socket.bind("*", port))
 if not stat then
 	print("Failed to get default port " .. port .. ": " .. server)
 	server = assert(socket.bind("*", 0))
 end
 local sID, sPort = server:getsockname()
 server:settimeout(0)
-sockets[1] = server
 
 print("Listening on " .. sID .. ":" .. sPort)
 
@@ -155,6 +151,7 @@ function unserialize(str)
 	end
 end
 
+local curclient
 local function sendData(msg)
 	if debug then
 		local ip,port = curclient:getpeername()
@@ -171,9 +168,22 @@ local function checkArg(pos,obj,what)
 	return true
 end
 
+local function dprint(ctrl, line)
+	print(" > " .. ctrl .. "," .. line:gsub("[^\32-\126]", function(a) return "\\"..a:byte() end))
+end
+
+-- do not change order
+local ops={"size","seek","read","isDirectory","open","spaceTotal","setLabel","lastModified","close","rename","isReadOnly","exists","getLabel","spaceUsed","makeDirectory","list","write","remove"}
+
+local sockets = {server}
+local hndls = {}
 local function update()
 	-- Check for new data or new clients
-	local ready, err, err2 = socket.select(sockets,nil) or {}
+	local ready, _, err = socket.select(sockets,nil)
+	if not ready then
+		print("select gave " .. tostring(err))
+		return
+	end
 	for _, client in ipairs(ready) do
 		if client == server then
 			client = server:accept()
@@ -198,34 +208,36 @@ local function update()
 					break
 				end
 			end
-			return
+			break
 		end
 		local ctrl = line:byte(1,1) - 31
+		ctrl = ops[ctrl] or ctrl
+		local line = line:sub(2)
 		if debug then
-			print(" > " .. ctrl .. "," .. line:sub(2))
+			dprint(ctrl, line)
 		end
-		local stat,ret = pcall(unserialize,line:sub(2))
+		local stat,ret = pcall(unserialize, line)
 		if not stat then
 			if not debug then
-				print(" > " .. ctrl .. "," .. line:sub(2))
+				dprint(ctrl, line)
 			end
 			print("Bad Input: " .. ret)
 			sendData("{nil,\"bad input\"}")
 			return
 		end
 		if type(ret) ~= "table" then
 			if not debug then
-				print(" > " .. ctrl .. "," .. line:sub(2))
+				dprint(ctrl, line)
 			end
 			print("Bad Input (exec): " .. type(ret))
 			sendData("{nil,\"bad input\"}")
 			return
 		end
-		if ctrl == 1 then -- size
+		if ctrl == "size" then
 			if not checkArg(1,ret[1],"string") then return end
 			local size = lfs.attributes(sanitizePath(ret[1]),"size")
 			sendData("{" .. (size or 0) .. "}")
-		elseif ctrl == 2 then -- seek
+		elseif ctrl == "seek" then
 			if not checkArg(1,ret[1],"number") then return end
 			if not checkArg(2,ret[2],"string") then return end
 			if not checkArg(3,ret[3],"number") then return end
@@ -236,7 +248,7 @@ local function update()
 				local new = hndls[fd]:seek(ret[2],ret[3])
 				sendData("{" .. new .. "}")
 			end
-		elseif ctrl == 3 then -- read
+		elseif ctrl == "read" then
 			if not checkArg(1,ret[1],"number") then return end
 			if not checkArg(2,ret[2],"number") then return end
 			local fd = ret[1]
@@ -250,10 +262,10 @@ local function update()
 					sendData("{nil}")
 				end
 			end
-		elseif ctrl == 4 then -- isDirectory
+		elseif ctrl == "isDirectory" then
 			if not checkArg(1,ret[1],"string") then return end
 			sendData("{" .. tostring(lfs.attributes(sanitizePath(ret[1]),"mode") == "directory") .. "}")
-		elseif ctrl == 5 then -- open
+		elseif ctrl == "open" then
 			if not checkArg(1,ret[1],"string") then return end
 			if not checkArg(2,ret[2],"string") then return end
 			local mode = ret[2]:sub(1,1)
@@ -275,21 +287,21 @@ local function update()
 					sendData("{" .. randhand .. "}")
 				end
 			end
-		elseif ctrl == 6 then -- spaceTotal
+		elseif ctrl == "spaceTotal" then
 			sendData("{" .. tostring(totalspace) .. "}")
-		elseif ctrl == 7 then -- setLabel
+		elseif ctrl == "setLabel" then
 			if not checkArg(1,ret[1],"string") then return end
 			if change then
 				label = ret[1]
 				sendData("{\"" .. label .. "\"}")
 			else
 				sendData("label is read only")
 			end
-		elseif ctrl == 8 then -- lastModified
+		elseif ctrl == "lastModified" then
 			if not checkArg(1,ret[1],"string") then return end
 			local modtime = lfs.attributes(sanitizePath(ret[1]),"modification")
 			sendData("{" .. (modtime or 0) .. "}")
-		elseif ctrl == 9 then -- close
+		elseif ctrl == "close" then
 			if not checkArg(1,ret[1],"number") then return end
 			local fd = ret[1]
 			if hndls[fd] == nil then
@@ -299,32 +311,32 @@ local function update()
 				hndls[fd] = nil
 				sendData("{}")
 			end
-		elseif ctrl == 10 then -- rename
+		elseif ctrl == "rename" then
 			if not checkArg(1,ret[1],"string") then return end
 			if not checkArg(2,ret[2],"string") then return end
 			if change then
 				sendData("{" .. tostring(os.rename(sanitizePath(ret[1]),sanitizePath(ret[2])) == true) .. "}")
 			else
 				sendData("{false}")
 			end
-		elseif ctrl == 11 then -- isReadOnly
+		elseif ctrl == "isReadOnly" then
 			sendData("{" .. tostring(not change) .. "}")
-		elseif ctrl == 12 then -- exists
+		elseif ctrl == "exists" then
 			if not checkArg(1,ret[1],"string") then return end
 			sendData("{" .. tostring(lfs.attributes(sanitizePath(ret[1]),"mode") ~= nil) .. "}")
-		elseif ctrl == 13 then -- getLabel
+		elseif ctrl == "getLabel" then
 			sendData("{\"" .. label .. "\"}")
-		elseif ctrl == 14 then -- spaceUsed
+		elseif ctrl == "spaceUsed" then
 			-- TODO: Need to update this
 			sendData("{" .. curspace .. "}")
-		elseif ctrl == 15 then -- makeDirectory
+		elseif ctrl == "makeDirectory" then
 			if not checkArg(1,ret[1],"string") then return end
 			if change then
 				sendData("{" .. tostring(lfs.mkdir(sanitizePath(ret[1]))) .. "}")
 			else
 				sendData("{false}")
 			end
-		elseif ctrl == 16 then -- list
+		elseif ctrl == "list" then
 			if not checkArg(1,ret[1],"string") then return end
 			ret[1] = sanitizePath(ret[1])
 			local list = getDirectoryItems(ret[1])
@@ -339,7 +351,7 @@ local function update()
 				end
 			end
 			sendData("{{" .. out .. "}}")
-		elseif ctrl == 17 then -- write
+		elseif ctrl == "write" then
 			if not checkArg(1,ret[1],"number") then return end
 			if not checkArg(2,ret[2],"string") then return end
 			local fd = ret[1]
@@ -349,7 +361,7 @@ local function update()
 				local success = hndls[fd]:write(ret[2])
 				sendData("{" .. tostring(success) .. "}")
 			end
-		elseif ctrl == 18 then -- remove
+		elseif ctrl == "remove" then
 			-- TODO: Recursive remove
 			if not checkArg(1,ret[1],"string") then return end
 			if change then