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

[raj at netperf.org]

Author: raj
Date: 2008-02-04 12:20:49 -0800 (Mon, 04 Feb 2008)
New Revision: 211

Modified:
   trunk/src/nettest_bsd.c
Log:
try to allow omni tests to use alternate protocols without needing WANT_mumble but it isnt complete

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2008-02-03 05:01:48 UTC (rev 210)
+++ trunk/src/nettest_bsd.c	2008-02-04 20:20:49 UTC (rev 211)
@@ -701,7 +701,7 @@
        no surprise that linux needs a kludge for DCCP...actually not
        only does it need the ai_protocol kludge, it needs an
        ai_socktype kludge too... sigh raj 2008-02-01 */
-#if defined(WANT_SCTP) || defined (WANT_DCCP)
+#if defined(IPPROTO_SCTP) || defined (IPPROTO_DCCP)
     if (EAI_SOCKTYPE == error
 #ifdef EAI_BADHINTS
         || EAI_BADHINTS == error
@@ -712,7 +712,7 @@
 	 that we did this so the code for the Solaris kludge can do
 	 the fix-up for us.  also flip error over to EAI_AGAIN and
 	 make sure we don't "count" this time around the loop. */
-#if defined(WANT_DCCP)
+#if defined(IPPROTO_DCCP)
       /* only tweak on this one the second time around, after we've
 	 kludged the ai_protocol field */
       if ((hints.ai_socktype == SOCK_DCCP) &&
@@ -731,7 +731,7 @@
       }
 
 #endif
-#if defined(WANT_SCTP)
+#if defined(IPPROTO_SCTP)
       if (hints.ai_protocol == IPPROTO_SCTP) {
 	change_info |= CHANGED_SCTP;
 	hints.ai_protocol = 0;
@@ -1237,8 +1237,10 @@
        only time we would have called getaddrinfo with a hints asking
        for SCTP, but just in case there is an SCTP implementation out
        there _without_ SCTP_NODELAY... raj 2005-03-15 */ 
-
-#if defined(WANT_SCTP) && defined(SCTP_NODELAY)
+    /* change this to IPPROTO_SCTP rather than WANT_SCTP to better fit
+       with the modus operendi (sp) of the new "omni" tests. raj
+       2008-02-04 */
+#if defined(IPPROTO_SCTP) && defined(SCTP_NODELAY)
     if (IPPROTO_SCTP == res->ai_protocol) {
       option = SCTP_NODELAY;
     }