- bulk deletion for all addresses

- no break, since solve can be called when addresses is empty due to autosolve parameter

2 files changed, 4 insertions, 5 deletions

diff --git a/src/ats/gnunet-service-ats-solver_mlp.c b/src/ats/gnunet-service-ats-solver_mlp.c
index 2d8ac1c79..377e0014a 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.c
+++ b/src/ats/gnunet-service-ats-solver_mlp.c
@@ -1054,10 +1054,7 @@ GAS_mlp_solve_problem (void *solver)
                 return GNUNET_OK;
         }
         if (0 == GNUNET_CONTAINER_multihashmap_size(mlp->addresses))
-        {
-                GNUNET_break (0);
-                return GNUNET_OK;
-        }
+                return GNUNET_OK; /* No addresses available */
 
         if ((GNUNET_NO == mlp->mlp_prob_changed) && (GNUNET_NO == mlp->mlp_prob_updated))
         {
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index a7a1dbe69..073530c22 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -1202,7 +1202,7 @@ GAS_addresses_in_use (struct GAS_Addresses_Handle *handle,
   if (NULL == ea)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Trying to set unknown address `%s', %s %u %s \n",
+                "Trying to set unknown address `%s' `%s' `%u' to %s \n",
                 GNUNET_i2s (peer),
                 plugin_name, session_id,
                 (GNUNET_NO == in_use) ? "NO" : "YES");
@@ -1896,8 +1896,10 @@ GAS_addresses_destroy_all (struct GAS_Addresses_Handle *handle)
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Destroying all addresses\n");
+  handle->s_bulk_start (handle->solver);
   if (handle->addresses != NULL)
     GNUNET_CONTAINER_multihashmap_iterate (handle->addresses, &destroy_all_address_it, handle);
+  handle->s_bulk_start (handle->solver);
 }