performance API indicates disconnect

6 files changed, 21 insertions, 3 deletions

diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index a1d8dc21a..35dcc558f 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -587,6 +587,7 @@ process_ats_message (void *cls, const struct GNUNET_MessageHeader *msg)
   GNUNET_CLIENT_receive (ph->client, &process_ats_message, ph,
       GNUNET_TIME_UNIT_FOREVER_REL);
   return;
+
  reconnect:
   if (NULL != ph->th)
   {
@@ -595,7 +596,14 @@ process_ats_message (void *cls, const struct GNUNET_MessageHeader *msg)
   }
   GNUNET_CLIENT_disconnect (ph->client);
   ph->client = NULL;
-  /* FIXME: need to signal monitor that we were disconnected! */
+  if (NULL != ph->addr_info_cb)
+  {
+    /* Indicate reconnect */
+    ph->addr_info_cb (ph->addr_info_cb_cls, NULL, GNUNET_NO,
+        GNUNET_BANDWIDTH_value_init (0),
+        GNUNET_BANDWIDTH_value_init(0),
+        NULL, 0);
+  }
   ph->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
                                            &reconnect_task, ph);
 }
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index a5307028d..4e1e68c23 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -27,7 +27,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-ats_addresses.h"
-
+#include "gnunet-service-ats_normalization.h"
 #include "gnunet_ats_service.h"
 #include "gnunet_ats_plugin.h"
 #include "test_ats_api_common.h"
diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c
index 493323657..b05a7cf22 100644
--- a/src/ats/test_ats_api_bandwidth_consumption.c
+++ b/src/ats/test_ats_api_bandwidth_consumption.c
@@ -192,7 +192,7 @@ run (void *cls,
   p = GNUNET_new (struct PeerContext);
   addr = GNUNET_new (struct Address);
 
-  atp = GNUNET_ATS_performance_init (cfg, &performance_cb, NULL);
+  atp = GNUNET_ATS_performance_init (cfg, NULL, NULL);
   if (atp == NULL)
   {
     ret = GNUNET_SYSERR;
diff --git a/src/ats/test_ats_api_performance_monitor.c b/src/ats/test_ats_api_performance_monitor.c
index 6ccac45d1..4b6b08b74 100644
--- a/src/ats/test_ats_api_performance_monitor.c
+++ b/src/ats/test_ats_api_performance_monitor.c
@@ -106,6 +106,10 @@ ats_perf_cb (void *cls,
   static int peer0 = GNUNET_NO;
   static int peer1 = GNUNET_NO;
   static int done = GNUNET_NO;
+
+  if (NULL == address)
+    return;
+
   if ((GNUNET_NO == peer0) && (0 == memcmp (address, &p[0].id, sizeof (p[0].id))))
   {
     peer0 = GNUNET_YES;
diff --git a/src/ats/test_ats_api_performance_monitor_initial_callback.c b/src/ats/test_ats_api_performance_monitor_initial_callback.c
index 6d305d3a5..377686673 100644
--- a/src/ats/test_ats_api_performance_monitor_initial_callback.c
+++ b/src/ats/test_ats_api_performance_monitor_initial_callback.c
@@ -107,6 +107,9 @@ ats_perf_cb (void *cls,
   static int peer1 = GNUNET_NO;
   static int done = GNUNET_NO;
 
+  if (NULL == address)
+    return;
+
   if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
   {
     peer0 ++;
diff --git a/src/ats/test_ats_solver_preferences.c b/src/ats/test_ats_solver_preferences.c
index 117af470b..4de3d9a5b 100644
--- a/src/ats/test_ats_solver_preferences.c
+++ b/src/ats/test_ats_solver_preferences.c
@@ -145,6 +145,9 @@ perf_info_cb (void *cls,
     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
     const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
+  if (NULL == address)
+    return;
+
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, "ATS performance info: `%s'\n",
       GNUNET_i2s (&address->peer));
 }