Changeset 2102

Timestamp:

06/17/10 09:10:13 (20 months ago)

Author:

mwhitworth

Message:

Add to TCP, soon we'll add to host and port entries when connection is closed.

Location:

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

Files:

• tcp.c (modified) (6 diffs)
• tcp.h (modified) (3 diffs)
• tcp_input.c (modified) (3 diffs)
• tcp_input.h (modified) (1 diff)

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

@@ -200 +200 @@
         ulong seqEnd = seq + dataLen;
         int err = TCP_ERROR;
+    int reason = TCP_DROP_NONE;
         int after;
 
@@ -209 +210 @@
                 err = 0;
                 TCP_DEBUG(("Duplicate packet, seq < REM.next"));
+        reason = TCP_DROP_DUP;
                 goto dropPacket;
         }
@@ -215 +217 @@
         {
                 TCP_DEBUG(("SEG.SEQ > REM.windowEnd"));
+        reason = TCP_DROP_SEQ;
                 goto dropPacket;
         }
@@ -245 +248 @@
 
                 err = 0;
+        reason = TCP_DROP_ACK;
 
                 goto dropPacket;
@@ -283 +287 @@
                 TcpSendBit(tcpSock, TCP_FLAG_ACK);
                 err = 0;
+        reason = TCP_DROP_OOO;
                 goto dropPacket;
         }
@@ -361 +366 @@
 
 dropPacket:
-        TcpDropPacket(tcpSock, dataLen);
+        TcpDropPacket(tcpSock, dataLen, reason);
         return err;
 }

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

@@ -10 +10 @@
 
 #include "../stats/stats.h"
-
-#define CHAN_TYPE_TCP           3
 
 #define TCP_SYN_TIMEOUT                         2 /* seconds */
@@ -30 +28 @@
         /* Information that we need to keep */
         ulong destAddr, destPort, srcPort;
+    int epRole;
 };
 
@@ -111 +110 @@
 
         struct TcpStatistics stats;
+    struct HostEntry* hostEntry;
 
         /* Events */

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

@@ -24 +24 @@
 }
 
-void TcpDropPacket(struct TcpSocket* tcp, int length)
+void TcpDropPacket(struct TcpSocket* tcp, int length, int reason)
 {
         tcp->stats.droppedPackets++;
@@ -31 +31 @@
         if (tcp->socket && tcp->droppedPkts)
         {
-                _SockEventFireList(tcp->socket, tcp->droppedPkts, NULL, 0);
+                struct TcpDroppedPkt droppedPkt;
+                
+                droppedPkt.bytes = length;
+                droppedPkt.reason = reason;
+                _SockEventFireList(tcp->socket, tcp->droppedPkts, &droppedPkt, sizeof(struct TcpDroppedPkt));
         }
 }
@@ -56 +60 @@
         if (tcpHeader->checkSum != TcpCalcChecksum(ipHeader, tcpHeader, *length))
         {
-                TcpDropPacket(tcpSock, *length - sizeof(struct IpHeader));
+                TcpDropPacket(tcpSock, *length - sizeof(struct IpHeader), TCP_DROP_SUM);
                 goto error;
         }

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

@@ -5 +5 @@
                 length);
 int TcpSocketRecv(Socket* socket, void* buffer, unsigned long length, int flags);
-void TcpDropPacket(struct TcpSocket* tcpSock, int length);
+
+#define TCP_CHECKSUM    0x01
+void TcpDropPacket(struct TcpSocket* tcpSock, int length, int reason);
 
 #endif