Changeset 637 for Whitix/branches

Timestamp:

06/24/08 14:01:44 (5 months ago)

Author:

mwhitworth

Message:

Add RawReceive and RawAddPacket functions.

Files:

• Whitix/branches/network/net/inet/raw.c (modified) (5 diffs)

Whitix/branches/network/net/inet/raw.c

@@ -20 +20 @@
 #include <error.h>
 #include <init.h>
+#include <malloc.h>
 #include <net/network.h>
 #include <net/tcp.h>
@@ -38 +39 @@
 }
 
+int RawAddPacket(struct SocketBuffer* sockBuff)
+{
+        struct Socket* curr;
+
+        ListForEachEntry(curr, &rawSocketList, next)
+        {
+                struct SocketBuffer* copy=(struct SocketBuffer*)malloc(sizeof(struct SocketBuffer)+sockBuff->length);
+                memcpy(copy, sockBuff, sizeof(struct SocketBuffer)+sockBuff->length);
+                ListAddTail(&copy->next, &curr->recvPackets);
+        }
+
+        return 0;
+}
+
 int RawClose(struct Socket* socket)
 {
+        ListRemove(&socket->next);
         return 0;
 }
@@ -54 +70 @@
                 return -ENOMEM;
 
-        if (!socket->device->ops || !socket->device->ops->send)
-                return -ENOTIMPL;
+        return NetDeviceSend(socket->device, sockBuff);
+}
 
-        return socket->device->ops->send(socket->device, sockBuff);
+int RawReceive(struct Socket* socket, void* buffer, int length, int flags)
+{
+        struct SocketBuffer* sockBuff;
+
+        while (ListEmpty(&socket->recvPackets))
+                ThrSchedule();
+
+        sockBuff=ListEntry(socket->recvPackets.next,struct SocketBuffer, next);
+
+        int toCopy=MIN(length, sockBuff->length);
+
+        memcpy((char*)buffer, sockBuff->data, toCopy);
+
+        SocketDestroyBuffer(sockBuff);
+
+        return toCopy;
 }
 
@@ -65 +96 @@
         .close = RawClose,
         .send = RawSend,
+        .receive = RawReceive,
 };
 
@@ -71 +103 @@
         InetRegisterOps(INET_PROTOCOL_RAW, &rawOps);
         printf("RAW: Registered protocol.\n");
+        return 0;
 }