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

[raj at netperf.org]

Author: raj
Date: 2008-02-01 16:05:35 -0800 (Fri, 01 Feb 2008)
New Revision: 206

Modified:
   trunk/src/netsh.c
   trunk/src/nettest_bsd.c
   trunk/src/nettest_bsd.h
Log:
first halting dccp steps for omni

Modified: trunk/src/netsh.c
===================================================================
--- trunk/src/netsh.c	2008-02-01 22:46:19 UTC (rev 205)
+++ trunk/src/netsh.c	2008-02-02 00:05:35 UTC (rev 206)
@@ -34,6 +34,7 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 #else
 #include <time.h>
@@ -450,7 +451,7 @@
 #endif
 #ifdef IPPROTO_DCCP
   if (!strcasecmp(temp,"dccp")) {
-    socket_type = SOCK_DGRAM;
+    socket_type = SOCK_DCCP;
     return IPPROTO_DCCP;
   }
 #endif

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2008-02-01 22:46:19 UTC (rev 205)
+++ trunk/src/nettest_bsd.c	2008-02-02 00:05:35 UTC (rev 206)
@@ -508,6 +508,11 @@
     return SOCK_DGRAM;
     break;
 #endif
+#ifdef SOCK_DCCP
+  case NST_DCCP:
+    return SOCK_DCCP;
+    break;
+#endif
   default:
     return -1;
   }
@@ -527,6 +532,11 @@
     return NST_DGRAM;
     break;
 #endif
+#ifdef SOCK_DCCP
+  case SOCK_DCCP:
+    return NST_DCCP;
+    break;
+#endif
   default:
     return NST_UNKN;
   }
@@ -545,6 +555,11 @@
     return "Datagram";
     break;
 #endif
+#ifdef SOCK_DCCP
+  case SOCK_DCCP:
+    return "DCCP";
+    break;
+#endif
   default:
     return "Unknown";
   }

Modified: trunk/src/nettest_bsd.h
===================================================================
--- trunk/src/nettest_bsd.h	2008-02-01 22:46:19 UTC (rev 205)
+++ trunk/src/nettest_bsd.h	2008-02-02 00:05:35 UTC (rev 206)
@@ -22,6 +22,7 @@
 #define NST_UNKN   -1
 #define NST_STREAM 1
 #define NST_DGRAM  2
+#define NST_DCCP   3
 
 #ifdef WANT_OMNI
 struct  omni_request_struct {
@@ -585,3 +586,22 @@
 extern void recv_tcp_nbrr();
 #endif
 
+#ifdef WANT_DCCP
+
+#ifndef SOCK_DCCP
+#warning This platform has no SOCK_DCCP define, using 6
+#define SOCK_DCCP 6
+#endif
+
+#ifndef IPPROTO_DCCP
+#warning This platform has no IPPROTO_DCCP define, using 33
+#define IPPROTO_DCCP 33  /* defined by the IANA */
+#endif
+
+#ifndef SOL_DCCP
+#warning This platform has no SOL_DCCP define, using 269
+#warning No, I've no idea why they don't just use IPPROTO_DCCP...
+#define SOL_DCCP 269
+#endif
+
+#endif