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

[raj at netperf.org]

Author: raj
Date: 2011-08-25 15:39:07 -0700 (Thu, 25 Aug 2011)
New Revision: 485

Modified:
   trunk/src/netsh.c
   trunk/src/nettest_bsd.c
Log:
even though the netperf side may not know about SO_PRIORITY the netserver side might so do not reject the request entirely at least not right away

Modified: trunk/src/netsh.c
===================================================================
--- trunk/src/netsh.c	2011-08-25 21:18:49 UTC (rev 484)
+++ trunk/src/netsh.c	2011-08-25 22:39:07 UTC (rev 485)
@@ -944,17 +944,20 @@
 	recv_width = convert(arg2);
       break;
     case 'y':
+      break_args(optarg, arg1, arg2);
 #if defined(SO_PRIORITY)
-      break_args(optarg, arg1, arg2);
       if (arg1[0])
 	local_socket_prio = convert(arg1);
+#else
+      if (debug) {
+	fprintf(where,
+		"Setting SO_PRIORITY is not supported on this platform, request to set SO_PRIORITY locally ignored.\n");
+	fflush(where);
+      }
+      local_socket_prio = -3;
+#endif
       if (arg2[0])
 	remote_socket_prio = convert(arg2);
-#else
-      fprintf(where,"Setting SO_PRIORITY is not supported on this platform\n");
-      fflush(where);
-      exit(-1);
-#endif
       break;
     case 'l':
       /* determine test end conditions */

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2011-08-25 21:18:49 UTC (rev 484)
+++ trunk/src/nettest_bsd.c	2011-08-25 22:39:07 UTC (rev 485)
@@ -1455,6 +1455,8 @@
 		 &sock_opt_len);	       
     }
   }
+#else
+  local_socket_prio = -3;
 #endif
 
   return(temp_socket);