- changes

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

diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index bbdc591f49dcd905862dbae05367138dda82cb68..71da46be4e9e6dff6164c6b7a010c5bead8cab91 100644 (file)
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -45,16 +45,18 @@ static struct GNUNET_PEERINFO_Handle *h;
 static unsigned int retries;
 
 static int
-check_it (void *cls, const char *tname, struct GNUNET_TIME_Absolute expiration,
-          const void *addr, uint16_t addrlen)
+check_it (void *cls, const struct GNUNET_HELLO_Address *address,
+          struct GNUNET_TIME_Absolute expiration)
 {
   unsigned int *agc = cls;
 
-  if (addrlen > 0)
+  if (address != NULL)
   {
-    GNUNET_assert (0 == strcmp ("peerinfotest", tname));
-    GNUNET_assert (0 == strncmp ("Address", addr, addrlen));
-    (*agc) -= (1 << (addrlen - 1));
+    GNUNET_assert (0 == strcmp ("peerinfotest", address->transport_name));
+    GNUNET_assert (0 ==
+                   strncmp ("Address", address->address,
+                            address->address_length));
+    (*agc) -= (1 << (address->address_length - 1));
   }
   return GNUNET_OK;
 }
@@ -65,14 +67,18 @@ address_generator (void *cls, size_t max, void *buf)
 {
   size_t *agc = cls;
   size_t ret;
+  struct GNUNET_HELLO_Address address;
 
   if (0 == *agc)
     return 0;
+  memset (&address.peer, 0, sizeof (struct GNUNET_PeerIdentity));
+  address.address = "Address";
+  address.transport_name = "peerinfotest";
+  address.address_length = *agc;
   ret =
-      GNUNET_HELLO_add_address ("peerinfotest",
+      GNUNET_HELLO_add_address (&address,
                                 GNUNET_TIME_relative_to_absolute
-                                (GNUNET_TIME_UNIT_HOURS), "Address", *agc, buf,
-                                max);
+                                (GNUNET_TIME_UNIT_HOURS), buf, max);
   (*agc)--;
   return ret;
 }
@@ -173,7 +179,7 @@ check ()
     GNUNET_GETOPT_OPTION_END
   };
   proc =
-      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
+    GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-peerinfo",
                                "gnunet-service-peerinfo",
 #if DEBUG_PEERINFO
                                "-L", "DEBUG",