[netperf-dev] netperf2 commit notice r385 - in trunk: . src

[raj at netperf.org]

Author: raj
Date: 2011-01-26 17:31:24 -0800 (Wed, 26 Jan 2011)
New Revision: 385

Modified:
   trunk/configure
   trunk/configure.ac
   trunk/src/nettest_bsd.c
   trunk/src/nettest_omni.c
Log:
omni tests might want to try to do SCTP without forcing the user to enable sctp from the configure line

Modified: trunk/configure
===================================================================
--- trunk/configure	2011-01-26 22:32:19 UTC (rev 384)
+++ trunk/configure	2011-01-27 01:31:24 UTC (rev 385)
@@ -4493,7 +4493,8 @@
 
 
 
-for ac_header in arpa/inet.h endian.h errno.h fcntl.h limits.h malloc.h netdb.h netinet/in.h signal.h stdlib.h string.h strings.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h unistd.h ifaddrs.h sys/sockio.h sys/sysinfo.h syscall.h
+
+for ac_header in arpa/inet.h endian.h errno.h fcntl.h limits.h malloc.h netdb.h netinet/in.h signal.h stdlib.h string.h strings.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h unistd.h ifaddrs.h sys/sockio.h sys/sysinfo.h syscall.h netinet/sctp.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2011-01-26 22:32:19 UTC (rev 384)
+++ trunk/configure.ac	2011-01-27 01:31:24 UTC (rev 385)
@@ -36,7 +36,7 @@
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h endian.h errno.h fcntl.h limits.h malloc.h netdb.h netinet/in.h signal.h stdlib.h string.h strings.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h unistd.h ifaddrs.h sys/sockio.h sys/sysinfo.h syscall.h])
+AC_CHECK_HEADERS([arpa/inet.h endian.h errno.h fcntl.h limits.h malloc.h netdb.h netinet/in.h signal.h stdlib.h string.h strings.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h unistd.h ifaddrs.h sys/sockio.h sys/sysinfo.h syscall.h netinet/sctp.h])
 
 # Some platforms require these.  There may be a better way.
 AC_HAVE_LIBRARY(socket)

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2011-01-26 22:32:19 UTC (rev 384)
+++ trunk/src/nettest_bsd.c	2011-01-27 01:31:24 UTC (rev 385)
@@ -105,7 +105,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
-#ifdef WANT_SCTP
+#ifdef HAVE_NETINET_SCTP_H
 #include <netinet/sctp.h>
 #endif
 
@@ -611,6 +611,10 @@
   case IPPROTO_SDP:
     return "SDP";
 #endif
+#ifdef IPPROTO_IP
+  case IPPROTO_IP:
+    return "IP Default";
+#endif
   default:
     return "Unknown Protocol";
   }
@@ -1279,7 +1283,7 @@
        for SCTP, but just in case there is an SCTP implementation out
        there _without_ SCTP_NODELAY... raj 2005-03-15 */ 
     /* change this to IPPROTO_SCTP rather than WANT_SCTP to better fit
-       with the modus operendi (sp) of the new "omni" tests. raj
+       with the modus operandi of the new "omni" tests. raj
        2008-02-04 */
 #if defined(IPPROTO_SCTP) && defined(SCTP_NODELAY)
     if (IPPROTO_SCTP == res->ai_protocol) {

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2011-01-26 22:32:19 UTC (rev 384)
+++ trunk/src/nettest_omni.c	2011-01-27 01:31:24 UTC (rev 385)
@@ -72,7 +72,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
-#ifdef WANT_SCTP
+#ifdef HAVE_NETINET_SCTP_H
 #include <netinet/sctp.h>
 #endif