fixing resource leaks
[oweals/gnunet.git] / src / ats / test_ats_solver_request_and_add_address.c
index a78b98aabfc5af43adaa44d6766765b251eafabe..1eced520d491fecbff3ab49fe872b59939838181 100644 (file)
@@ -128,7 +128,9 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 static void
-address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+address_suggest_cb (void *cls,
+                    const struct GNUNET_PeerIdentity *peer,
+                    const struct GNUNET_HELLO_Address *address,
                     struct Session *session,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
@@ -138,8 +140,6 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
 
   GNUNET_assert (NULL != address);
   GNUNET_assert (NULL == session);
-  GNUNET_assert (ntohl(bandwidth_in.value__) > 0);
-  GNUNET_assert (ntohl(bandwidth_out.value__) > 0);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received sugggestion for peer `%s'\n",
       GNUNET_i2s (&address->peer));
@@ -179,14 +179,7 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
   }
 
   /* Set up peer */
-  if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, &p.id.hashPubKey))
-  {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
-      GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-      return;
-  }
-  GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));
-
+  memset (&p.id, '1', sizeof (p.id));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
               GNUNET_i2s_full(&p.id));
 
@@ -206,7 +199,7 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
   test_hello_address.address_length = test_addr.addr_len;
 
   /* Request */
-  GNUNET_ATS_suggest_address (sched_ats, &p.id);
+  GNUNET_ATS_suggest_address (sched_ats, &p.id, NULL, NULL);
 
 
   /* Adding address */