]> sjero.net Git - iperf/blobdiff - src/Reporter.c
TCP Congestion Control Module via options
[iperf] / src / Reporter.c
index db9418e3bb97baecd1754950589a574d9f7b662f..f3bd21930e933b5c639af47c475e89a9f5e61559 100644 (file)
@@ -169,11 +169,7 @@ MultiHeader* InitMulti( thread_Settings *agent, int inID ) {
                 if ( isConnectionReport( agent ) ) {
                     data->type |= CONNECTION_REPORT;
                     data->connection.peer = agent->peer;
-                    data->connection.size_peer = agent->size_peer;
-                    SockAddr_setPortAny( &data->connection.peer );
                     data->connection.local = agent->local;
-                    data->connection.size_local = agent->size_local;
-                    SockAddr_setPortAny( &data->connection.local );
                 }
             }
         } else {
@@ -227,6 +223,7 @@ ReportHeader* InitReport( thread_Settings *agent ) {
             data->info.transferID = agent->mSock;
             data->info.groupID = (agent->multihdr != NULL ? agent->multihdr->groupID 
                                                           : -1);
+            data->info.congAlgo = agent->congAlgo;
             data->type = TRANSFER_REPORT;
             if ( agent->mInterval != 0.0 ) {
                 struct timeval *interval = &data->intervalTime;
@@ -264,6 +261,7 @@ ReportHeader* InitReport( thread_Settings *agent ) {
                 data = &reporthdr->report;
                 data->info.transferID = agent->mSock;
                 data->info.groupID = -1;
+                data->info.congAlgo = agent->congAlgo;
             } else {
                 FAIL(1, "Out of Memory!!\n", agent);
             }
@@ -271,9 +269,7 @@ ReportHeader* InitReport( thread_Settings *agent ) {
         if ( reporthdr != NULL ) {
             data->type |= CONNECTION_REPORT;
             data->connection.peer = agent->peer;
-            data->connection.size_peer = agent->size_peer;
             data->connection.local = agent->local;
-            data->connection.size_local = agent->size_local;
         } else {
             FAIL(1, "Out of Memory!!\n", agent);
         }
@@ -448,12 +444,12 @@ void ReportSettings( thread_Settings *agent ) {
             data->mProtocol = agent->mProtocol;
             data->mThreadMode = agent->mThreadMode;
             data->mPort = agent->mPort;
+            data->mMcastIface = agent->mMcastIface;
             data->info.mFormat = agent->mFormat;
             data->info.mTTL = agent->mTTL;
+            data->info.congAlgo = agent->congAlgo;
             data->connection.peer = agent->peer;
-            data->connection.size_peer = agent->size_peer;
             data->connection.local = agent->local;
-            data->connection.size_local = agent->size_local;
     
     #ifdef HAVE_THREAD
             /*
@@ -513,9 +509,7 @@ void ReportServerUDP( thread_Settings *agent, server_hdr *server ) {
             stats->cntDatagrams = ntohl( server->datagrams );
             stats->mUDP = (char)kMode_Server;
             reporthdr->report.connection.peer = agent->local;
-            reporthdr->report.connection.size_peer = agent->size_local;
             reporthdr->report.connection.local = agent->peer;
-            reporthdr->report.connection.size_local = agent->size_peer;
             
 #ifdef HAVE_THREAD
             /*