Changeset 2103 for Whitix/branches/netchannel/user/sdk/network/tcp/tcp_input.c

Timestamp:

06/17/10 10:26:53 (20 months ago)

Author:

mwhitworth

Message:

Rewrite SocketRead method.

Files:

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

Whitix/branches/netchannel/user/sdk/network/tcp/tcp_input.c

@@ -5 +5 @@
 #include "../checksum.h"
 #include "tcp.h"
+#include "../seq.h"
 #include "tcp_buffer.h"
 #include "../ipv4.h"
@@ -77 +78 @@
         int ret = 0;
         struct TcpSocket* tcpSock = (struct TcpSocket*)(socket->priv);
+        struct TcpHeader* tcpHeader;
         ChanRecvBuffer* chanBuff, *next;
         char* write = (char*)buffer;
@@ -102 +104 @@
         while (ret < length)
         {
+                ulong seq, endSeq;
+                char* data;
+                int offset, size;
+
                 chanBuff = tcpSock->data;
 
@@ -107 +113 @@
                         break;
 
-                /* TODO: Verify sequence numbers. Don't allow read unless sequential */
+                data = ChanRecvBufferData(socket->channel, chanBuff);
+                tcpHeader = (struct TcpHeader*)(data + sizeof(struct IpHeader));
 
-                int offset = TcpBufferGetRead(socket->channel, chanBuff);
-                int bytesRead = MIN(TcpBufferLen(socket->channel, chanBuff) - offset, length -
-                                ret);
+                seq = NetToHostLong(tcpHeader->seqNum);
+                endSeq = seq + TcpBufferLen(socket->channel, chanBuff);
 
-                TCP_DEBUG(("memcpy(%#X, %#X, %d) (%d, %d)\n", write + ret, TcpBufferData(socket->channel, chanBuff)+offset, bytesRead, length, ret));
+                if (SeqBefore(tcpSock->seqRead, seq))
+                        break;
+
+                offset = tcpSock->seqRead - seq;
+                size = MIN(length - ret, TcpBufferLen(socket->channel, chanBuff) - offset);
 
                 memcpy(write + ret, TcpBufferData(socket->channel, chanBuff) +
-                                offset, bytesRead);
-                ret += bytesRead;
+                                offset, size);
+                ret += size;
+                tcpSock->seqRead += size;
 
                 pthread_mutex_lock(&tcpSock->dataLock);
 
-                next = ChanRecvBuffGetPriv(chanBuff);
-
-                TcpBufferAddRead(socket->channel, chanBuff, bytesRead);
-
-                if (bytesRead + offset >= TcpBufferLen(socket->channel, chanBuff))
+                if (SeqAfterEq(tcpSock->seqRead, endSeq))
                 {
+                        next = ChanRecvBuffGetPriv(chanBuff);
                         ChanRecvBuffFree(socket->channel, chanBuff);