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

[raj at netperf.org]

Author: raj
Date: 2011-06-28 16:25:36 -0700 (Tue, 28 Jun 2011)
New Revision: 407

Modified:
   trunk/src/nettest_omni.c
Log:
make the omni udp maerts test finish before the timer expires

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2011-06-28 22:47:03 UTC (rev 406)
+++ trunk/src/nettest_omni.c	2011-06-28 23:25:36 UTC (rev 407)
@@ -4266,12 +4266,23 @@
 
 
 int
-close_data_socket(SOCKET data_socket, struct sockaddr *peer, int peerlen)
+close_data_socket(SOCKET data_socket, struct sockaddr *peer, int peerlen, int protocol)
 {
 
   int ret;
   char buffer[4];
 
+  if (debug) {
+    fprintf(where,
+	    "%s sock %d peer %p peerlen %d protocol %d\n",
+	    __FUNCTION__,
+	    data_socket,
+	    peer,
+	    peerlen,
+	    protocol);
+    fflush(where);
+  }
+
   if (protocol == IPPROTO_UDP) {
     /* try to give the remote a signal. what this means if we ever
        wanted to actually send zero-length messages remains to be seen
@@ -6367,7 +6378,7 @@
       lsr_size_end = lsr_size;
       lss_size_end = lss_size;
 #endif
-      ret = close_data_socket(data_socket,NULL,0);
+      ret = close_data_socket(data_socket,NULL,0,omni_request->protocol);
       if (ret == -1) {
 	times_up = 1;
 	timed_out = 1;
@@ -6436,10 +6447,10 @@
     lsr_size_end = lsr_size;
     lss_size_end = lss_size;
 #endif
-    close_data_socket(data_socket,NULL,0);
+    close_data_socket(data_socket,NULL,0,omni_request->protocol);
   }
   else {
-    close_data_socket(data_socket,(struct sockaddr *)&peeraddr_in,addrlen);
+    close_data_socket(data_socket,(struct sockaddr *)&peeraddr_in,addrlen,omni_request->protocol);
     lsr_size_end = lsr_size;
     lss_size_end = lss_size;
   }