Native IPv6 support for iperf

[iperf] / include / Settings.hpp

diff --git a/include/Settings.hpp b/include/Settings.hpp
index bf125cbeadbc886b829c82a85a59a0584e207f13..3a9fa2a9592302c8eccfd35e412555f73b0c20b3 100644 (file)
--- a/include/Settings.hpp
+++ b/include/Settings.hpp
@@ -151,7 +151,8 @@ typedef struct thread_Settings {
     // int's
     int mThreads;                   // -P
     int mTOS;                       // -S
-    int mSock;
+    int mSock;                      // socket descriptor
+    int mSockAF;                    // type of @mSock
     int Extractor_size;
     int mBufLen;                    // -l
     int mMSS;                       // -M
@@ -193,15 +194,14 @@ typedef struct thread_Settings {
     // shorts
     unsigned short mListenPort;     // -L
     unsigned short mPort;           // -p
+    unsigned short mMcastIface;     // -j or -J
     // chars
     char   mFormat;                 // -f
-    int mTTL;                    // -T
+    int    mTTL;                    // -T
     char pad1[2];
     // structs or miscellaneous
-    iperf_sockaddr peer;
-    Socklen_t size_peer;
-    iperf_sockaddr local;
-    Socklen_t size_local;
+    struct sockaddr_storage peer;   // remote part of socket
+    struct sockaddr_storage local;  // local part of socket
     nthread_t mTID;
 } thread_Settings;