[netperf-dev] netperf2 commit notice r507 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2011-11-30 16:08:59 -0800 (Wed, 30 Nov 2011)
New Revision: 507

Modified:
   trunk/src/nettest_omni.c
Log:
get the congestion control algorithm at the right point on netserver

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2011-12-01 00:03:53 UTC (rev 506)
+++ trunk/src/nettest_omni.c	2011-12-01 00:08:59 UTC (rev 507)
@@ -5280,6 +5280,17 @@
     lsr_size_end = lsr_size;
     lss_size_end = lss_size;
 #endif
+    if (omni_request->flags & OMNI_WANT_REM_CONG) {
+      get_transport_cong_control(data_socket,
+				 local_res->ai_protocol,
+				 omni_results->cong_control,
+				 sizeof(omni_results->cong_control));
+    }
+    else {
+      strncpy(omni_results->cong_control,"",sizeof(omni_results->cong_control));
+    }
+
+
     close_data_socket(data_socket,NULL,0,omni_request->protocol);
   }
   else {
@@ -5355,17 +5366,7 @@
     strncpy(omni_results->firmware,"Bug If Seen DRVINFO",32);
     strncpy(omni_results->bus,"Bug If Seen DRVINFO",32);
   }
-  if (omni_request->flags & OMNI_WANT_REM_CONG) {
-    get_transport_cong_control(s_listen,
-			       local_res->ai_protocol,
-			       omni_results->cong_control,
-			       sizeof(omni_results->cong_control));
-  }
-  else {
-    strncpy(omni_results->cong_control,"",sizeof(omni_results->cong_control));
-  }
 
-
   if (debug) {
     fprintf(where,
 	    "recv_omni: test complete, sending results.\n");