Changeset 503 for Whitix/branches/hybrid/net/socket.c

Timestamp:

05/14/08 00:02:22 (4 months ago)

Author:

mwhitworth

Message:

Build the network subsystem as a module.

Files:

• Whitix/branches/hybrid/net/socket.c (modified) (9 diffs)

Whitix/branches/hybrid/net/socket.c

@@ -23 +23 @@
 #include <fs/vfs.h>
 #include <malloc.h>
+#include <module.h>
 #include <net/network.h>
 #include <net/socket.h>
@@ -86 +87 @@
 
         if (UNLIKELY(!file))
-                return -EBADF;
+                return;
 
         file->vNode=NULL;
@@ -167 +168 @@
 }
 
+/* Make local-only? */
 int SocketDoAccept(struct Socket* server, struct Socket* client, struct Socket** child)
 {
@@ -186 +188 @@
 }
 
+SYMBOL_EXPORT(SocketDoAccept);
+
 struct SocketBuffer* SocketAllocateBuffer(const void* buffer, int length)
 {
@@ -200 +204 @@
 }
 
+SYMBOL_EXPORT(SocketAllocateBuffer);
+
 int SocketDestroyBuffer(struct SocketBuffer* sockBuff)
 {
@@ -207 +213 @@
 }
 
+SYMBOL_EXPORT(SocketDestroyBuffer);
+
 int SocketPoll(struct File* file, struct PollItem* item, struct PollQueue* pollQueue)
 {
@@ -221 +229 @@
 {
         struct VMArea* base, *curr;
-        int verifiedLen=0;
+        DWORD verifiedLen=0;
 
         base=VmLookupAddress(current, (DWORD)buffer);
@@ -435 +443 @@
 }
 
+SYMBOL_EXPORT(SocketRegisterFamily);
+
+#define NET_SYS_BASE    42
+
 int SocketInit()
 {
@@ -442 +454 @@
                 return -ENOMEM;
 
-        return 0;
-}
-
+        /* Register system calls. */
+        SysRegisterCall(NET_SYS_BASE+0, (DWORD)&SysSocketCreate);
+        SysRegisterCall(NET_SYS_BASE+1, (DWORD)&SysSocketBind);
+        SysRegisterCall(NET_SYS_BASE+2, (DWORD)&SysSocketConnect);
+        SysRegisterCall(NET_SYS_BASE+3, (DWORD)&SysSocketListen);
+        SysRegisterCall(NET_SYS_BASE+4, (DWORD)&SysSocketAccept);
+        SysRegisterCall(NET_SYS_BASE+5, (DWORD)&SysSocketSend);
+        SysRegisterCall(NET_SYS_BASE+6, (DWORD)&SysSocketReceive);
+        SysRegisterCall(NET_SYS_BASE+7, (DWORD)&SysSocketIoCtl);
+        SysRegisterCall(NET_SYS_BASE+8, (DWORD)&SysSocketClose);
+
+        return 0;
+}
+