Changeset 2092

Timestamp:

05/27/10 12:20:14 (21 months ago)

Author:

mwhitworth

Message:

Fix UDP warnings.

Files:

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

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

@@ -5 +5 @@
 #include <net/channels.h>
 #include <net/ipv4.h>
+#include <net/udp.h>
 
 #include "checksum.h"
+#include "ipv4.h"
 
 static struct SocketOps udpSocketOps;
@@ -72 +74 @@
 }
 
-ulong WrapSum(ulong sum)
-{
-        sum=~sum & 0xFFFF;
-        return HostToNetShort(sum);
-}
-
-ulong UdpCheckSum()
-{
-        return 0;
-}
-
 int UdpSocketSendTo(Socket* socket, const void* buffer, unsigned long length, int flags, struct SockAddr* dest)
 {
@@ -101 +92 @@
         chanBuff = ChanSendBufferAlloc(socket->channel, &data);
 
-        printf("chanBuff = %#X, data = %#X\n", chanBuff, data);
-
         if (!chanBuff)
                 return -1;
@@ -117 +106 @@
         
         memcpy(data + sizeof(struct IpHeader) + sizeof(struct UdpHeader), buffer, length);
-        
-/*      udpHeader->checkSum = WrapSum(IpCheckSum((unsigned char*)udpHeader, sizeof(struct UdpHeader),
-                                                IpCheckSum(start+sizeof(struct IpHeader)+sizeof(struct UdpHeader), length,
-                                                        IpCheckSum((unsigned char*)&ipHeader->sourceAddr, 8,
-                                                        PROTOCOL_RAW_UDP +
-                                                        HostToNetShort(udpHeader->length))))); */
-
-        ret = ChanBufferSend(socket->channel, chanBuff, totalLength);
+        
+        ret = ChanBufferSend(socket->channel, chanBuff, totalLength);
         
         return ret;
 }
 
-int UdpCalcChecksum(struct IpHeader* ipHeader, struct UdpHeader* udpHeader, int read)
+ushort UdpCalcChecksum(struct IpHeader* ipHeader, struct UdpHeader* udpHeader, int read)
 {
-        ushort sum = udpHeader->checkSum;
+        ushort oldSum = udpHeader->checkSum, sum;
+        int protoLength = NetToHostShort(ipHeader->totalLength) - sizeof(struct IpHeader);
 
         udpHeader->checkSum = 0;
+        
+        sum = TcpUdpHeaderSum(ipHeader->sourceAddr, ipHeader->destAddr, protoLength, IP_PROTOCOL_UDP);
+        sum = ~IpPartialSum(udpHeader, protoLength, sum);
 
-        udpHeader->checkSum = sum;
+        udpHeader->checkSum = oldSum;
+
+        return sum;
 }
 
@@ -160 +149 @@
         ipHeader = (struct IpHeader*)buf;
         udpHeader = (struct UdpHeader*)(buf + sizeof(struct IpHeader));
-        if (NetToHostShort(udpHeader->checkSum) != UdpCalcChecksum(ipHeader, udpHeader, read))
+        if (udpHeader->checkSum != UdpCalcChecksum(ipHeader, udpHeader, read))
                 goto again;
+
+        /* TODO: Current buffer. Partial recv */
 
         dataByteCnt = read - sizeof(struct UdpHeader) - sizeof(struct IpHeader);