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

[raj at netperf.org]

Author: raj
Date: 2008-01-31 17:18:10 -0800 (Thu, 31 Jan 2008)
New Revision: 199

Modified:
   trunk/src/nettest_omni.c
Log:
omni will always pick a value for _end socket size variables even if we asked for explicit values

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2008-02-01 00:19:49 UTC (rev 198)
+++ trunk/src/nettest_omni.c	2008-02-01 01:18:10 UTC (rev 199)
@@ -3356,8 +3356,12 @@
 	   ultimately became. raj 2008-01-15 */
 	if (lsr_size_req < 0)
 	  get_sock_buffer(data_socket, RECV_BUFFER, &lsr_size_end);
+	else
+	  lsr_size_end = lsr_size;
 	if (lss_size_req < 0)
 	  get_sock_buffer(data_socket, SEND_BUFFER, &lss_size_end);
+	else
+	  lss_size_end = lss_size;
 #else
 	lsr_size_end = lsr_size;
 	lss_size_end = lss_size;
@@ -3434,8 +3438,12 @@
 	 ultimately became. raj 2008-01-15 */
       if (lsr_size_req < 0)
 	get_sock_buffer(data_socket, RECV_BUFFER, &lsr_size_end);
+      else
+	lsr_size_end = lsr_size;
       if (lss_size_req < 0)
 	get_sock_buffer(data_socket, SEND_BUFFER, &lss_size_end);
+      else
+	lss_size_end = lss_size;
 #else
       lsr_size_end = lsr_size;
       lss_size_end = lss_size;
@@ -4213,8 +4221,12 @@
 	 ultimately became. raj 2008-01-15 */
       if (lsr_size_req < 0)
 	get_sock_buffer(data_socket, RECV_BUFFER, &lsr_size_end);
+      else
+	lsr_size_end = lsr_size;
       if (lss_size_req < 0)
 	get_sock_buffer(data_socket, SEND_BUFFER, &lss_size_end);
+      else
+	lss_size_end = lss_size;
 #else
       lsr_size_end = lsr_size;
       lss_size_end = lss_size;
@@ -4273,11 +4285,15 @@
        ultimately became. raj 2008-01-15 */
     if (lsr_size_req < 0)
       get_sock_buffer(data_socket, RECV_BUFFER, &lsr_size_end);
+    else
+      lsr_size_end = lsr_size;
     if (lss_size_req < 0)
       get_sock_buffer(data_socket, SEND_BUFFER, &lss_size_end);
+    else
+      lss_size_end = lss_size;
 #else
+    lsr_size_end = lsr_size;
     lss_size_end = lss_size;
-    lsr_size_end = lsr_size;
 #endif
     close_data_socket(data_socket,NULL,0);
   }