[netperf-dev] netperf4 commit notice r37 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2006-01-23 13:41:11 -0800 (Mon, 23 Jan 2006)
New Revision: 37

Modified:
   trunk/src/nettest_bsd.c
   trunk/src/nettest_dns.c
   trunk/src/nettest_vst.c
Log:
Fix compiler warnings for option lengths in socket calls.


Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2006-01-20 00:41:21 UTC (rev 36)
+++ trunk/src/nettest_bsd.c	2006-01-23 21:41:11 UTC (rev 37)
@@ -67,6 +67,10 @@
 
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <values.h>
 #include <unistd.h>
@@ -556,7 +560,7 @@
 
   int temp_socket;
   int one;
-  int sock_opt_len;
+  netperf_socklen_t sock_opt_len;
 
   if (test->debug) {
     fprintf(test->where,
@@ -1062,7 +1066,7 @@
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   myaddr;
-  int               mylen;
+  netperf_socklen_t mylen;
 
   my_data   = test->test_specific_data;
   proc_name = "recv_tcp_stream_preinit";        
@@ -1119,7 +1123,7 @@
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   peeraddr;
-  int               peerlen;
+  netperf_socklen_t peerlen;
 
   my_data   = test->test_specific_data;
   proc_name = "recv_tcp_stream_preinit";        
@@ -1155,7 +1159,7 @@
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   peeraddr;
-  int               peerlen;
+  netperf_socklen_t peerlen;
   int               len;
 
   my_data   = test->test_specific_data;
@@ -1651,7 +1655,7 @@
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   myaddr;
-  int               mylen;
+  netperf_socklen_t mylen;
 
   my_data   = test->test_specific_data;
   proc_name = "recv_tcp_rr_preinit";
@@ -1713,7 +1717,7 @@
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   peeraddr;
-  int               peerlen;
+  netperf_socklen_t peerlen;
 
   my_data   = test->test_specific_data;
   proc_name = "recv_tcp_stream_init";
@@ -1750,7 +1754,7 @@
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   peeraddr;
-  int               peerlen;
+  netperf_socklen_t peerlen;
 
   my_data   = test->test_specific_data;
   proc_name = "recv_tcp_rr_idle_link";

Modified: trunk/src/nettest_dns.c
===================================================================
--- trunk/src/nettest_dns.c	2006-01-20 00:41:21 UTC (rev 36)
+++ trunk/src/nettest_dns.c	2006-01-23 21:41:11 UTC (rev 37)
@@ -426,7 +426,7 @@
 
   int temp_socket;
   int one;
-  int sock_opt_len;
+  netperf_socklen_t sock_opt_len;
 
   if (test->debug) {
     fprintf(test->where,

Modified: trunk/src/nettest_vst.c
===================================================================
--- trunk/src/nettest_vst.c	2006-01-20 00:41:21 UTC (rev 36)
+++ trunk/src/nettest_vst.c	2006-01-23 21:41:11 UTC (rev 37)
@@ -45,6 +45,10 @@
 
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <values.h>
 #include <unistd.h>
@@ -918,7 +922,7 @@
 
   int temp_socket;
   int one;
-  int sock_opt_len;
+  netperf_socklen_t sock_opt_len;
 
   if (test->debug) {
     fprintf(test->where,
@@ -1481,7 +1485,7 @@
   int               s_listen;
   vst_data_t       *my_data;
   struct sockaddr   myaddr;
-  int               mylen;
+  netperf_socklen_t mylen;
 
   my_data   = GET_TEST_DATA(test);
   mylen     = sizeof(myaddr);
@@ -1532,7 +1536,7 @@
   int               s_data;
   vst_data_t       *my_data;
   struct sockaddr   peeraddr;
-  int               peerlen;
+  netperf_socklen_t peerlen;
 
   my_data   = GET_TEST_DATA(test);
   peerlen   = sizeof(peeraddr);
@@ -1568,7 +1572,7 @@
   uint32_t          new_state;
   vst_data_t       *my_data;
   struct sockaddr   peeraddr;
-  int               peerlen;
+  netperf_socklen_t peerlen;
 
   NETPERF_DEBUG_ENTRY(test->debug, test->where);