- changes

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

diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c
index d9107c8fee6cf75c6d273105bb83120d5dbeb582..3396930544b38dc55b45842ae6259627936cb5d1 100755 (executable)
--- a/src/peerinfo/perf_peerinfo_api.c
+++ b/src/peerinfo/perf_peerinfo_api.c
@@ -46,14 +46,17 @@ static struct GNUNET_PEERINFO_Handle *h;
 
 static unsigned int numpeers;
 
+static struct GNUNET_PeerIdentity pid;
+
+
 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)
 {
 #if DEBUG
   if (addrlen > 0)
   {
-    fprintf (stderr, "name: %s, addr: %s\n", tname, (const char *) addr);
+    FPRINTF (stderr, "name: %s, addr: %s\n", tname, (const char *) addr);
   }
 #endif
   return GNUNET_OK;
@@ -65,19 +68,22 @@ address_generator (void *cls, size_t max, void *buf)
 {
   size_t *agc = cls;
   size_t ret;
-  char *address;
+  char *caddress;
+  struct GNUNET_HELLO_Address address;
 
   if (*agc == 0)
     return 0;
 
-  GNUNET_asprintf (&address, "Address%d", *agc);
-
+  GNUNET_asprintf (&caddress, "Address%d", *agc);
+  address.peer = pid;
+  address.address_length = strlen (caddress) + 1;
+  address.address = caddress;
+  address.transport_name = "peerinfotest";
   ret =
-      GNUNET_HELLO_add_address ("peerinfotest",
+      GNUNET_HELLO_add_address (&address,
                                 GNUNET_TIME_relative_to_absolute
-                                (GNUNET_TIME_UNIT_HOURS), address,
-                                strlen (address) + 1, buf, max);
-  GNUNET_free (address);
+                                (GNUNET_TIME_UNIT_HOURS), buf, max);
+  GNUNET_free (caddress);
   *agc = 0;
   return ret;
 }
@@ -87,7 +93,6 @@ static void
 add_peer (size_t i)
 {
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
-  struct GNUNET_PeerIdentity pid;
   struct GNUNET_HELLO_Message *h2;
 
   memset (&pkey, i, sizeof (pkey));
@@ -105,13 +110,13 @@ process (void *cls, const struct GNUNET_PeerIdentity *peer,
   if (peer == NULL)
   {
 #if DEBUG
-    fprintf (stderr, "Process received NULL response\n");
+    FPRINTF (stderr, "Process received NULL response\n");
 #endif
   }
   else
   {
 #if DEBUG
-    fprintf (stderr, "Processed a peer\n");
+    FPRINTF (stderr, "Processed a peer\n");
 #endif
     numpeers++;
     if (0 && (hello != NULL))
@@ -162,7 +167,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",
@@ -174,7 +179,7 @@ check ()
   GNUNET_assert (NULL != proc);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
                       "perf-peerinfo-api", "nohelp", options, &run, &ok);
-  fprintf (stderr, "Received %u/%u calls before timeout\n", numpeers,
+  FPRINTF (stderr, "Received %u/%u calls before timeout\n", numpeers,
            NUM_REQUESTS * NUM_REQUESTS / 2);
   GAUGER ("PEERINFO", "Peerinfo lookups", numpeers / 30, "peers/s");
 #if START_SERVICE