Changeset 2088 for Whitix/branches/netchannel/user/sdk/network/udp.c

Timestamp:

05/26/10 12:23:09 (2 years ago)

Author:

mwhitworth

Message:

Update to actually include all network stack progress so far.

Files:

• Whitix/branches/netchannel/user/sdk/network/udp.c (modified) (4 diffs)

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

@@ -5 +5 @@
 #include <net/channels.h>
 #include <net/ipv4.h>
+
+#include "checksum.h"
 
 static struct SocketOps udpSocketOps;
@@ -127 +129 @@
 }
 
+int UdpCalcChecksum(struct IpHeader* ipHeader, struct UdpHeader* udpHeader, int read)
+{
+        ushort sum = udpHeader->checkSum;
+
+        udpHeader->checkSum = 0;
+
+        udpHeader->checkSum = sum;
+}
+
 int UdpSocketRecvFrom(Socket* socket, void* buffer, unsigned long length, int flags,
         struct SockAddr* dest)
@@ -134 +145 @@
         char* buf;
         int dataByteCnt;
+        struct IpHeader* ipHeader;
+        struct UdpHeader* udpHeader;
 
+again:
         read = ChanBufferRecv(socket->channel, &chanBuff, &buf, 2000);
 
@@ -142 +156 @@
                 return read;
         }
+
+        /* Verify checksum */
+        ipHeader = (struct IpHeader*)buf;
+        udpHeader = (struct UdpHeader*)(buf + sizeof(struct IpHeader));
+        if (NetToHostShort(udpHeader->checkSum) != UdpCalcChecksum(ipHeader, udpHeader, read))
+                goto again;
 
         dataByteCnt = read - sizeof(struct UdpHeader) - sizeof(struct IpHeader);