Changeset 2103 for Whitix

Timestamp:

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

Author:

mwhitworth

Message:

Rewrite SocketRead method.

Location:

Whitix/branches/netchannel/user/sdk/network/tcp

Files:

• tcp.c (modified) (3 diffs)
• tcp.h (modified) (1 diff)
• tcp_buffer.h (modified) (2 diffs)
• tcp_input.c (modified) (4 diffs)

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

@@ -179 +179 @@
                 {
                         TcpChangeState(tcpSock, TCP_ESTABLISHED);
+            tcpSock->seqRead = seq + 1;
                         TcpSendBit(tcpSock, TCP_FLAG_ACK);
                         return 0;
@@ -293 +294 @@
         if (dataLen > 0)
         {
-                ChanRecvBuffAddRead(tcpSock->channel, buffer, IpGetHeaderSize(ipHeader) + TcpGetHeaderSize(header));
-
                 tcpSock->stats.totalBytesRecv += dataLen;
                 tcpSock->stats.totalPacketsRecv++;
@@ -382 +381 @@
 
         if (header->ack)
-        {
-                if (SeqBetween(ack, tcpSock->localUna, tcpSock->localNext))
-                {
-                        TcpChangeState(tcpSock, TCP_ESTABLISHED);
-                        return TcpEstablished(tcpSock, header, buffer, length);
-                }
-        }
+        if (SeqBetween(ack, tcpSock->localUna, tcpSock->localNext))
+        {
+                TcpChangeState(tcpSock, TCP_ESTABLISHED);
+            tcpSock->seqRead = NetToHostLong(header->seqNum);
+                return TcpEstablished(tcpSock, header, buffer, length);
+        }
 
         if (header->fin)

Whitix/branches/netchannel/user/sdk/network/tcp/tcp.h

@@ -72 +72 @@
         ulong localUrg, localWl1, localWl2, localSeqInit;
         ulong localCwnd, localCwndBytes, localThresh;
+    ulong seqRead;
 
         /* Acknowledgements. */

Whitix/branches/netchannel/user/sdk/network/tcp/tcp_buffer.h

@@ -13 +13 @@
 }
 
-static inline int TcpBufferGetRead(Channel* channel, ChanRecvBuffer* buffer)
-{
-        struct TcpHeader* header = (ChanRecvBufferData(channel, buffer) + sizeof(struct
-                                IpHeader));
-        return ChanRecvBuffGetRead(buffer) - TcpGetHeaderSize(header) -
-                sizeof(struct IpHeader);
-}
-
 static inline char* TcpBufferData(Channel* channel, ChanRecvBuffer* buffer)
 {
@@ -28 +20 @@
 }
 
-static inline void TcpBufferAddRead(Channel* channel, ChanRecvBuffer* buffer, unsigned short add)
-{
-        ChanRecvBuffAddRead(channel, buffer, add);
-}
-
 #endif

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);