Changeset 2103 for Whitix/branches/netchannel/user/sdk/network/tcp/tcp.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.c (modified) (3 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)