Changeset 2099 for Whitix/branches/netchannel/user/sdk/network/socket.c

Timestamp:

06/03/10 22:43:33 (2 years ago)

Author:

mwhitworth

Message:

Add to network stack.

Files:

• Whitix/branches/netchannel/user/sdk/network/socket.c (modified) (3 diffs)

Whitix/branches/netchannel/user/sdk/network/socket.c

@@ -1 +1 @@
 #include <net/socket.h>
+#include <net/inet_raw.h>
 
 #include <stdio.h>
 
-#include "tcp.h"
+#include "tcp/tcp.h"
 #include "udp.h"
 
@@ -12 +13 @@
                 return -1;
 
-        if (type == NET_TYPE_STREAM)
+        memset(socket, 0, sizeof(Socket));
+
+        switch (type)
         {
-                return _TcpSocketCreate(socket);
-        }else{
-                return _UdpSocketCreate(socket);
+                case NET_TYPE_STREAM:
+                        return _TcpSocketCreate(socket);
+
+                case NET_TYPE_DGRAM:
+                        return _UdpSocketCreate(socket);
+
+                case NET_TYPE_DIAG:
+                        return _IcmpSocketCreate(socket);
         }
 
@@ -40 +48 @@
 int SocketAccept(Socket* socket, Socket* child, struct SockAddr* addr, int* addrLen)
 {
-        printf("SocketAccept(%#X, %#X, %#X, %#X)\n", socket, child, addr, addrLen);
-
-        printf("accept = %#X\n", socket->ops->accept);
-
         if (socket && socket->ops && socket->ops->accept)
                 return socket->ops->accept(socket, child, addr, addrLen);