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

[raj at netperf.org]

Author: raj
Date: 2008-03-06 12:22:39 -0800 (Thu, 06 Mar 2008)
New Revision: 244

Modified:
   trunk/src/nettest_omni.c
Log:
actually return device ids from netserver and use them

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2008-03-06 17:53:02 UTC (rev 243)
+++ trunk/src/nettest_omni.c	2008-03-06 20:22:39 UTC (rev 244)
@@ -4361,7 +4361,7 @@
 	 calculated service demand and all those interesting things. If
 	 it wasn't supposed to care, it will return obvious values. */
   
-      recv_response_n(17);
+      recv_response_n(21);
       if (!netperf_response.content.serv_errno) {
 	if (debug)
 	  fprintf(where,"remote results obtained\n");
@@ -4404,6 +4404,10 @@
 	remote_driver_version[31] = 0;
 	remote_driver_firmware[31] = 0;
 	remote_driver_bus[31] = 0;
+	remote_interface_vendor = omni_result->vendor;
+	remote_interface_device = omni_result->device;
+	remote_interface_subvendor = omni_result->subvendor;
+	remote_interface_subdevice = omni_result->subdevice;
       }
       else {
 	Set_errno(netperf_response.content.serv_errno);
@@ -5233,6 +5237,11 @@
   local_interface_slot = find_interface_slot(local_interface_name);
   strncpy(omni_results->ifslot,local_interface_slot,16);
   omni_results->ifslot[16] = 0;
+  find_interface_ids(local_interface_name,
+		     &omni_results->vendor,
+		     &omni_results->device,
+		     &omni_results->subvendor,
+		     &omni_results->subdevice);
   find_driver_info(local_interface_name,
 		   omni_results->driver,
 		   omni_results->version,
@@ -5245,7 +5254,7 @@
     fflush(where);
   }
   
-  send_response_n(17);
+  send_response_n(21);
 
   /* when we implement this, it will look a little strange, but we do
      it to avoid certain overheads when running aggregates and using