-improve UDP logging

[oweals/gnunet.git] / src / ats / test_ats_solver_add_address_and_request.c

diff --git a/src/ats/test_ats_solver_add_address_and_request.c b/src/ats/test_ats_solver_add_address_and_request.c
index a0965c91509a5ca23c48c24a85c4f99e9801f43e..1a354596747f114b21b29a5e72f4963a59776eef 100644 (file)
--- a/src/ats/test_ats_solver_add_address_and_request.c
+++ b/src/ats/test_ats_solver_add_address_and_request.c
@@ -6,7 +6,7 @@
     GNUNET_SCHEDULER_add_now (end_badly, NULL);
   }
  This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 Christian Grothoff (and other contributing authors)
 
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
@@ -50,6 +50,11 @@ static struct GNUNET_STATISTICS_Handle *stats;
  */
 static struct GNUNET_ATS_SchedulingHandle *sched_ats;
 
+/**
+ * Connectivity handle
+ */
+static struct GNUNET_ATS_ConnectivityHandle *connect_ats;
+
 /**
  * Return value
  */
@@ -106,6 +111,11 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_ATS_scheduling_done (sched_ats);
     sched_ats = NULL;
   }
+  if (NULL != connect_ats)
+  {
+    GNUNET_ATS_connectivity_done (connect_ats);
+    connect_ats = NULL;
+  }
 
   GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
   if (NULL != stats)
@@ -144,7 +154,7 @@ address_suggest_cb (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Received sugggestion for peer `%s'\n",
-              GNUNET_i2s (&address->peer));
+              GNUNET_i2s (peer));
   GNUNET_SCHEDULER_add_now (&end, NULL);
 }
 
@@ -154,7 +164,7 @@ stat_cb (void *cls, const char *subsystem,
          const char *name, uint64_t value,
          int is_persistent)
 {
-  struct GNUNET_ATS_SuggestHandle *sh;
+  static struct GNUNET_ATS_ConnectivitySuggestHandle *sh;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "ATS statistics: `%s' `%s' %llu\n",
@@ -162,7 +172,7 @@ stat_cb (void *cls, const char *subsystem,
               name,
               value);
   if (NULL == sh)
-    sh = GNUNET_ATS_suggest_address (sched_ats, &p.id);
+    sh = GNUNET_ATS_connectivity_suggest (connect_ats, &p.id);
   return GNUNET_OK;
 }
 
@@ -177,6 +187,7 @@ run (void *cls,
   GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
 
 
+  connect_ats = GNUNET_ATS_connectivity_init (mycfg);
   /* Connect to ATS scheduling */
   sched_ats = GNUNET_ATS_scheduling_init (mycfg, &address_suggest_cb, NULL);
   if (sched_ats == NULL)