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

[raj at netperf.org]

Author: raj
Date: 2010-03-15 17:23:43 -0700 (Mon, 15 Mar 2010)
New Revision: 347

Modified:
   trunk/src/nettest_omni.c
Log:
eghads has it started to work

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2010-03-15 23:34:05 UTC (rev 346)
+++ trunk/src/nettest_omni.c	2010-03-16 00:23:43 UTC (rev 347)
@@ -698,7 +698,9 @@
        0xE0000000 to 0xEFFFFFFF. Thankfully though there are macros
        available to make the checks for one */
     struct in_addr bar = ((struct sockaddr_in *)res->ai_addr)->sin_addr;
-    return IN_MULTICAST(bar.s_addr);
+    /* and here I thought IN_MULTICAST would operate on things in
+       network byte order???  raj 20100315 */
+    return IN_MULTICAST(ntohl(bar.s_addr));
   }
 #if defined(AF_INET6)
   case AF_INET6: {
@@ -5348,6 +5350,13 @@
   connection_test = omni_request->flags & OMNI_CONNECT_TEST;
   direction       = omni_request->direction;
 
+  /* kludgy, because I have no way at present to say how many bytes
+     needed to be swapped around for the request from which this is
+     pulled, and it is probably all wrong for IPv6 :( */
+  for (ret=0; ret < 4; ret++) {
+    omni_request->netserver_ip[ret] = htonl(omni_request->netserver_ip[ret]);
+  }
+
   set_hostname_and_port_2(omni_request->netserver_ip,
 			  local_name,
 			  port_buffer,
@@ -5427,7 +5436,9 @@
 
     /* do we need to join a multicast group? */
     if (is_multicast_addr(local_res)) {
-      join_multicast_addr(data_socket, local_res);
+      /* yes, s_listen - for a UDP test we will be copying it to
+	 data_socket but that hasn't happened yet. raj 20100315 */
+      join_multicast_addr(s_listen, local_res);
     }
 
     if (omni_request->request_size > 0) {