X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=include%2FReporter.h;h=db3defe5ca605ffc8e996d5469b8dedfb6013ff3;hb=a5a03e6ab0fdf9c4d7d4c085fcf01436f9ba3202;hp=91343f4d521627a81944ce3b384f89e91a631cd8;hpb=13e2957cedb002750f49045e221375ffff3d5ee3;p=iperf

diff --git a/include/Reporter.h b/include/Reporter.h
index 91343f4..db3defe 100644
--- a/include/Reporter.h
+++ b/include/Reporter.h
@@ -109,10 +109,8 @@ typedef struct Transfer_Info {
 } 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 +127,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 +142,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 +153,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;