commented out wrong message type

[oweals/gnunet.git] / src / peerinfo / test_peerinfo_shipped_hellos.c

diff --git a/src/peerinfo/test_peerinfo_shipped_hellos.c b/src/peerinfo/test_peerinfo_shipped_hellos.c
index 0c3ae2b3ca3ae59bf5e539f0bdf409d6ad97d1a0..dfaac5da93a920f5c919ba5789d421572357d4b0 100644 (file)
--- a/src/peerinfo/test_peerinfo_shipped_hellos.c
+++ b/src/peerinfo/test_peerinfo_shipped_hellos.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2004, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2004, 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,12 +14,12 @@
 
      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 peerinfo/test_peerinfo_api.c
+ * @file peerinfo/test_peerinfo_shipped_hellos.c
  * @brief testcase for shipped HELLOs getting parsed
  * @author Christian Grothoff
  * @author Matthias Wachs
@@ -38,76 +38,101 @@ static struct GNUNET_PEERINFO_Handle *h;
 
 static int global_ret;
 
+
 static int
 addr_cb (void *cls,
-                                const struct GNUNET_HELLO_Address *address,
-                                struct GNUNET_TIME_Absolute expiration)
-{;
-       int *addr = cls;
-       (*addr) ++;
-       return GNUNET_OK;
+         const struct GNUNET_HELLO_Address *address,
+         struct GNUNET_TIME_Absolute expiration)
+{
+  unsigned int *addr = cls;
+
+  (*addr) ++;
+  return GNUNET_OK;
 }
 
+
 static void
-process (void *cls, const struct GNUNET_PeerIdentity *peer,
-         const struct GNUNET_HELLO_Message *hello, const char *err_msg)
+process (void *cls,
+         const struct GNUNET_PeerIdentity *peer,
+         const struct GNUNET_HELLO_Message *hello,
+         const char *err_msg)
 {
   static unsigned int calls = 0;
-  int addr;
+  unsigned int addr;
 
-  if (err_msg != NULL)
+  if (NULL != err_msg)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Error in communication with PEERINFO service\n"));
+                "Error in communication with PEERINFO service: %s\n",
+                err_msg);
   }
   if (NULL != peer)
   {
-       addr = 0;
-               if (NULL != hello)
-               {
-                       GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &addr_cb, &addr);
-                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Got information about peer `%s' with %u addresses \n",
-                                       GNUNET_i2s (peer), addr);
-               calls++;
-               }
-               else
-                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail: Got information about peer `%s' without HELLO \n",
-                                       GNUNET_i2s (peer));
+    addr = 0;
+    if (NULL != hello)
+    {
+      GNUNET_HELLO_iterate_addresses (hello,
+                                      GNUNET_NO,
+                                      &addr_cb,
+                                      &addr);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Got information about peer %s with %u addresses\n",
+                  GNUNET_i2s (peer),
+                  addr);
+      calls++;
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Got no HELLP for peer %s\n",
+                  GNUNET_i2s (peer));
+    }
   }
   else
   {
-       if (0 == calls)
-       {
-               fprintf (stderr, "Failed: %u callbacks\n", calls);
-               global_ret = 1;
-       }
-       else
-       {
-                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got %u callbacks\n", calls);
-               global_ret = 0;
-       }
+    if (0 == calls)
+    {
+      fprintf (stderr,
+               "Failed: got no callbacks!\n");
+      global_ret = 1;
+      GNUNET_PEERINFO_disconnect (h);
+      h = NULL;
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Got %u HELLOs in total\n",
+                  calls);
+      global_ret = 0;
+      GNUNET_PEERINFO_disconnect (h);
+      h = NULL;
+    }
   }
 }
 
 
 static void
-run (void *cls, 
+run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
   h = GNUNET_PEERINFO_connect (cfg);
   GNUNET_assert (NULL != h);
-  ic = GNUNET_PEERINFO_iterate (h, GNUNET_YES, NULL,
-                                GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_SECONDS, 15), &process, cls);
+  ic = GNUNET_PEERINFO_iterate (h,
+                                GNUNET_YES,
+                                NULL,
+                                &process,
+                                cls);
+  GNUNET_assert (NULL != ic);
 }
 
 
 int
-main (int argc, char *argv[])
+main (int argc,
+      char *argv[])
 {
   global_ret = 3;
-  if (0 != GNUNET_TESTING_service_run ("test_peerinfo_system_hellos",
+  if (0 != GNUNET_TESTING_service_run ("test_peerinfo_shipped_hellos",
                                       "peerinfo",
                                       "test_peerinfo_api_data.conf",
                                       &run, NULL))