TCP Congestion Control Module via options

[iperf] / include / Reporter.h

diff --git a/include/Reporter.h b/include/Reporter.h
index 91343f4d521627a81944ce3b384f89e91a631cd8..1dbb22c0ea52447a95f8dfeaa5dd84fed5cda081 100644 (file)
--- a/include/Reporter.h
+++ b/include/Reporter.h
@@ -106,13 +106,12 @@ typedef struct Transfer_Info {
     u_char mTTL;                    // -T
     char   mUDP;
     char   free;
+    char  *congAlgo;                // -A
 } Transfer_Info;
 
 typedef struct Connection_Info {
-    iperf_sockaddr peer;
-    Socklen_t size_peer;
-    iperf_sockaddr local;
-    Socklen_t size_local;
+    struct sockaddr_storage peer;
+    struct sockaddr_storage local;
 } Connection_Info;
 
 typedef struct ReporterData {
@@ -129,7 +128,7 @@ typedef struct ReporterData {
     int PacketID;
     int mBufLen;                    // -l
     int mMSS;                       // -M
-    int mTCPWin;                    // -w
+    int mWinSize;                    // -w
     /*   flags is a BitMask of old bools
         bool   mBufLenSet;              // -l
         bool   mCompat;                 // -C
@@ -144,7 +143,8 @@ typedef struct ReporterData {
         bool   mSuggestWin;             // -W
         bool   mUDP;
         bool   mMode_time;*/
-    int flags; 
+    int flags;
+    Protocol   mProtocol;
     // enums (which should be special int's)
     ThreadMode mThreadMode;         // -s or -c
     ReportMode mode;
@@ -154,6 +154,7 @@ typedef struct ReporterData {
     double lastTransit;
     // shorts
     unsigned short mPort;           // -p
+    unsigned short mMcastIface;     // -j or -J
     // structs or miscellaneous
     Transfer_Info info;
     Connection_Info connection;