fix indentation, typo, improve logging

[oweals/gnunet.git] / src / util / test_os_network.c

diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c
index 3c3bc71980356433a9f458b6da1cc6f614d4f30e..85f98201f066419a1128d1fe2b3ce3a60b72f4ef 100644 (file)
--- a/src/util/test_os_network.c
+++ b/src/util/test_os_network.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2003, 2004, 2005, 2006, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2003, 2004, 2005, 2006, 2009 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,19 +14,16 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file util/test_os_network.c
  * @brief testcase for util/os_network.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
 
-#define VERBOSE 0
 
 /**
  * Check if the address we got is IPv4 or IPv6 loopback (which should
@@ -40,20 +37,20 @@ proc (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
 {
   int *ok = cls;
   char buf[INET6_ADDRSTRLEN];
+  const char * protocol;
 
   if (NULL == addr)
     return GNUNET_OK;
-#if VERBOSE
-  const char * protocol;
   if (addrlen == sizeof (struct sockaddr_in))
     protocol = "IPv4";
   else
     protocol = "IPv6";
-  printf ("%s Address `%s'\n", protocol, GNUNET_a2s ((const struct sockaddr *) addr,addrlen) );
-  printf ("     Netmask `%s'\n", GNUNET_a2s ((const struct sockaddr *) netmask, addrlen) );
-  printf ("     Broadcast `%s'\n", GNUNET_a2s ((const struct sockaddr *) broadcast_addr,addrlen) );
-#endif
-
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "%s Address `%s'\n", protocol, GNUNET_a2s ((const struct sockaddr *) addr,addrlen) );
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Netmask `%s'\n", GNUNET_a2s ((const struct sockaddr *) netmask, addrlen) );
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "`%s'\n", GNUNET_a2s ((const struct sockaddr *) broadcast_addr,addrlen) );
   inet_ntop (addr->sa_family,
              (addr->sa_family ==
               AF_INET) ? (void *) &((struct sockaddr_in *) addr)->sin_addr
@@ -64,23 +61,16 @@ proc (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
   return GNUNET_OK;
 }
 
-static int
-testifcs ()
+
+int
+main (int argc, char *argv[])
 {
   int ret;
 
+  GNUNET_log_setup ("test-os-network", "WARNING", NULL);
   ret = 1;
   GNUNET_OS_network_interfaces_list (&proc, &ret);
   return ret;
 }
 
-int
-main (int argc, char *argv[])
-{
-  int errCnt = 0;
-
-  GNUNET_log_setup ("test-os-network", "WARNING", NULL);
-  if (0 != testifcs ())
-    errCnt++;
-  return errCnt;
-}
+/* end of test_os_network.c */