added seperate input and working on http / sockets

2026-05-27 17:01:26 -04:00
parent 59e09a5995
commit f7b64c11b7
43 changed files with 5035 additions and 533 deletions
@@ -1,67 +1,194 @@
 --:Minify:--
-- Supports:
--   AF_UNIX  - local IPC via /var/run/*.sock paths
--   AF_INET  - network sockets with three backends:
--      Implemented by drivers but expect http:// and https://
--
-- Socket lifecycle:
--   fd = syscall.socket(domain, socktype)   -- "unix"/"inet", "stream"/"dgram"
--   syscall.bind(fd, address)               -- server: claim address
--   syscall.listen(fd, backlog)             -- server: mark as listening
--   cfd = syscall.accept(fd)                -- server: get connected client fd (blocking poll)
--   syscall.connect(fd, address)            -- client: connect to server
--   syscall.send(fd, data)                  -- send bytes
--   syscall.recv(fd, len)                   -- receive bytes (blocking poll, returns "" on nothing)
--   syscall.sockshutdown(fd)                -- half-close send side
--   -- normal vfs.close(fd) closes the socket
+local kernel = ...

-local kernel=...
-local socket={}
-socket.handlers={}
-kernel.socket=socket
+local socket = {}

-function socket.registerProtocal(protocal, handler)
-    socket.handlers[protocal] = handler
+socket.handlers = {}
+
+kernel.socket = socket
+
+local P = kernel.vfs.P
+local sys = kernel.syscalls
+
+function socket.registerProtocal(proto, handler)
+    socket.handlers[proto] = handler
 end

-function socket.socket()
-    local P=kernel.vfs.P
-    local data=kernel.newFifo()
-    local isClosed=false
-    return kernel.vfs.newfd({
-        handle={
-            read=function() if isClosed then error("ECCON") end return data.pop() end,
-            write=function(data) if isClosed then error("ECCON") end return data.push(data) end,
-            close=function() isClosed = true end
+local function getHandler(address)
+    for proto, handler in pairs(socket.handlers) do
+        if string.hasPrefix(address, proto) then
+            return handler
+        end
+    end
+end
+
+function socket.socket(domain, socktype)
+    local fd = kernel.vfs.newfd({
+        handle = {},
+
+        type = "socket",
+
+        refcount = 1,
+
+        socket = {
+            connected = false,
+            protocol = nil,
+            address = nil
        },
-        type="socket",
-        refcount=1,
-        socket={},
-        meta={
-            owner=kernel.currentTask.uid,
-            group=kernel.currentTask.uid,
-            etype=2,
-            perms=P.OWNER_R+P.OWNER_W+P.GROUP_R+P.GROUP_W
+
+        meta = {
+            owner = kernel.currentTask.uid,
+            group = kernel.currentTask.uid,
+            etype = 2,
+
+            perms =
+                P.OWNER_R +
+                P.OWNER_W +
+                P.GROUP_R +
+                P.GROUP_W
        },
-        isvirt=true
+
+        isvirt = true
    })
+
+    local fdo = kernel.currentTask.fd[fd]
+
+    fdo.handle.read = function()
+        return ""
+    end
+
+    fdo.handle.write = function()
+        return nil, "ENOTCONN"
+    end
+
+    fdo.handle.close = function()
+        fdo.socket.connected = false
+        return true
+    end
+
+    return fd
 end

 function socket.connect(fd, address)
-    local handler
-    for k, v in pairs(socket.handlers) do
-        if string.hasPrefix(address, k) then
-            handler=v
-        end
+    local fdo = kernel.currentTask.fd[fd]
+
+    if not fdo then
+        return nil, "EBADF"
    end
-    handler.connect(kernel.currentTask.fd[fd], address)
+
+    if fdo.type ~= "socket" then
+        return nil, "ENOTSOCK"
+    end
+
+    local handler =
+        getHandler(address)
+
+    if not handler then
+        return nil, "EPROTONOSUPPORT"
+    end
+
+    fdo.socket.protocol = handler
+    fdo.socket.address = address
+
+    local ok, err =
+        handler.connect(fd, address)
+
+    if not ok then
+        return nil, err
+    end
+
+    fdo.socket.connected = true
+
+    return true
 end

 function socket.listen(fd, backlog)
-    error("Not Implemented")
+    local fdo =
+        kernel.currentTask.fd[fd]
+
+    if not fdo then
+        return nil, "EBADF"
+    end
+
+    if not fdo.handle.listen then
+        return nil, "EOPNOTSUPP"
+    end
+
+    return fdo.handle.listen(backlog)
 end

-local sys=kernel.syscalls
-sys["socket"]=socket.socket
+function socket.send(fd, data)
+    local fdo =
+        kernel.currentTask.fd[fd]
+
+    if not fdo then
+        return nil, "EBADF"
+    end
+
+    if fdo.type ~= "socket" then
+        return nil, "ENOTSOCK"
+    end
+
+    if not fdo.socket.connected then
+        return nil, "ENOTCONN"
+    end
+
+    if not fdo.handle.write then
+        return nil, "EOPNOTSUPP"
+    end
+
+    return fdo.handle.write(data)
+end
+
+function socket.recv(fd, amount)
+    local fdo =
+        kernel.currentTask.fd[fd]
+
+    if not fdo then
+        return nil, "EBADF"
+    end
+
+    if fdo.type ~= "socket" then
+        return nil, "ENOTSOCK"
+    end
+
+    if not fdo.socket.connected then
+        return nil, "ENOTCONN"
+    end
+
+    if not fdo.handle.read then
+        return nil, "EOPNOTSUPP"
+    end
+
+    return fdo.handle.read(amount)
+end
+
+function socket.sockshutdown(fd)
+    local fdo =
+        kernel.currentTask.fd[fd]
+
+    if not fdo then
+        return nil, "EBADF"
+    end
+
+    if fdo.type ~= "socket" then
+        return nil, "ENOTSOCK"
+    end
+
+    if fdo.handle.close then
+        return fdo.handle.close()
+    end
+
+    fdo.socket.connected = false
+
+    return true
+end
+
+sys.socket = socket.socket
+sys.connect = socket.connect
+sys.listen = socket.listen
+sys.send = socket.send
+sys.recv = socket.recv
+sys.sockshutdown = socket.sockshutdown

 kernel.log("Loaded socket module")