[netperf-dev] netperf4 commit notice r209 - trunk/src

raj at netperf.org raj at netperf.org
Fri Mar 9 14:22:31 PST 2007


Author: raj
Date: 2007-03-09 14:22:30 -0800 (Fri, 09 Mar 2007)
New Revision: 209

Modified:
   trunk/src/nettest_bsd.c
Log:
pick some gcc -Wall nits and use the dump_addrinfo from netlib

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2007-03-09 22:16:06 UTC (rev 208)
+++ trunk/src/nettest_bsd.c	2007-03-09 22:22:30 UTC (rev 209)
@@ -130,6 +130,7 @@
 #endif
 
 #include "netperf.h"
+#include "netlib.h"
 
 #include "nettest_bsd.h"
 
@@ -335,45 +336,8 @@
 
 
 
-static void
-dump_addrinfo(FILE *dumploc, struct addrinfo *info,
-              xmlChar *host, xmlChar *port, int family)
-{
-  struct sockaddr *ai_addr;
-  struct addrinfo *temp;
-  temp=info;
 
-  fprintf(dumploc, "getaddrinfo returned the following for host '%s' ", host);
-  fprintf(dumploc, "port '%s' ", port);
-  fprintf(dumploc, "family %d\n", family);
-  while (temp) {
-    fprintf(dumploc,
-            "\tcannonical name: '%s'\n",temp->ai_canonname);
-    fprintf(dumploc,
-            "\tflags: %d family: %d: socktype: %d protocol %d addrlen %d\n",
-            temp->ai_flags,
-            temp->ai_family,
-            temp->ai_socktype,
-            temp->ai_protocol,
-            temp->ai_addrlen);
-    ai_addr = temp->ai_addr;
-    if (ai_addr != NULL) {
-      fprintf(dumploc,
-              "\tsa_family: %d sadata: %d %d %d %d %d %d\n",
-              ai_addr->sa_family,
-              (u_char)ai_addr->sa_data[0],
-              (u_char)ai_addr->sa_data[1],
-              (u_char)ai_addr->sa_data[2],
-              (u_char)ai_addr->sa_data[3],
-              (u_char)ai_addr->sa_data[4],
-              (u_char)ai_addr->sa_data[5]);
-    }
-    temp = temp->ai_next;
-  }
-  fflush(dumploc);
-}
 
-
 static int
 get_port_number(struct addrinfo *res)
 {
@@ -3971,8 +3935,6 @@
 recv_udp_rr_meas(test_t *test)
 {
   int               len;
-  int               bytes_left;
-  char             *req_ptr;
   uint32_t          new_state;
   bsd_data_t       *my_data;
   struct sockaddr   peeraddr;



More information about the netperf-dev mailing list