Changeset 2101 for Whitix/branches/netchannel/user/sdk/network/tcp/tcp.h

Timestamp:

06/16/10 15:11:16 (2 years ago)

Author:

mwhitworth

Message:

Add to TCP.

Files:

• Whitix/branches/netchannel/user/sdk/network/tcp/tcp.h (modified) (6 diffs)

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

@@ -8 +8 @@
 #include <net/ipv4.h>
 #include <net/tcp.h>
+
+#include "../stats/stats.h"
 
 #define CHAN_TYPE_TCP           3
@@ -20 +22 @@
         ulong droppedPackets, droppedBytes;
         ulong retxBytesSent, retxPacketsSent;
-        ulong wrongSumPackets, wrongSumBytes;
+        ulong minWin, maxWin;
 
         /* (Mainly) protocol */
@@ -65 +67 @@
         struct UserTimer retxTimer;
         int retxTimerHnd;
-        int rto;
+        int rto, rtt, mdev;
 
         /* Sequence numbers. */
@@ -111 +113 @@
 
         /* Events */
-        struct AsyncCtx* remWinChanged; 
+        struct AsyncCtx *remWinChanged, *retxTimerOut, *localWinChanged, *droppedPkts; 
 };
+
+extern int _netDebug;
+
+#ifndef DEBUG_TCP
+#define DEBUG_TCP 0x1
+#endif
 
 //#define TCP_DEBUG_Y
 
 #ifdef TCP_DEBUG_Y
-#define TCP_DEBUG(args) do { printf("[TCP]: %d: %s: ", SysGetCurrentThreadId(), __func__); printf args; printf(" (%s:%d)\n", __FILE__, __LINE__); } while (0)
+#define TCP_DEBUG(args) do { if (_netDebug & DEBUG_TCP) { printf("[TCP]: %d: %s: ", SysGetCurrentThreadId(), __func__); printf args; printf(" (%s:%d)\n", __FILE__, __LINE__); } } while (0)
 #else
 #define TCP_DEBUG(args)
@@ -132 +140 @@
 {
         return ((struct Ipv4EndPoint*)(&socket->channel->src))->port;
+}
+
+static inline ulong TcpDestAddress(struct TcpSocket* socket)
+{
+        return ((struct Ipv4EndPoint*)(&socket->channel->dest))->address;
 }
 
@@ -156 +169 @@
 #define TCP_AGAIN       -2
 
+/* Buffer flags */
+#define TCP_FLAG_RETX   0x01
+
 #endif