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

[raj at netperf.org]

Author: raj
Date: 2010-09-17 15:36:05 -0700 (Fri, 17 Sep 2010)
New Revision: 358

Modified:
   trunk/src/nettest_omni.c
Log:
fix the omni connect close test to not call send

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2010-09-17 22:08:37 UTC (rev 357)
+++ trunk/src/nettest_omni.c	2010-09-17 22:36:05 UTC (rev 358)
@@ -7112,16 +7112,13 @@
 set_omni_defaults_by_legacy_testname() {
 
   /* the uber defaults are for a unidirectional test using TCP */
-  direction = NETPERF_XMIT;
   protocol = IPPROTO_TCP;
   socket_type = SOCK_STREAM;
+  connection_test = 0;
   req_size = rsp_size = -1;
   legacy = 1;
   if (strcasecmp(test_name,"TCP_STREAM") == 0) {
-    /* yes, it does look a trifle odd having an empty case here, but
-       the only thing here had been a legacy = 1 statement, and I've
-       hoisted that.  I leave the TCP_STREAM case here as a placeholder and
-       as an homage to foolish consistency :) */
+    direction = NETPERF_XMIT;
   }
   else if (strcasecmp(test_name,"TCP_MAERTS") == 0) {
     direction = NETPERF_RECV;
@@ -7144,6 +7141,16 @@
     direction |= NETPERF_RECV;
     req_size = rsp_size = 1;
   }
+  else if (strcasecmp(test_name,"TCP_CC") == 0) {
+    direction = 0;
+    connection_test = 1;
+  }
+  else if (strcasecmp(test_name,"TCP_CRR") == 0) {
+    direction = 0;
+    direction |= NETPERF_XMIT;
+    direction |= NETPERF_RECV;
+    req_size = rsp_size = 1;
+  }
   else if (strcasecmp(test_name,"omni") == 0) {
     /* there is not much to do here but clear the legacy flag */
     legacy = 0;