-address dying doesn't depend on bandwidth suggestion of ATS, just on in_destroy flag

2 files changed, 10 insertions, 10 deletions

diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index b1ceb4083..8d2cdc84e 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -479,9 +479,7 @@ process_ats_address_suggestion_message (void *cls,
   }
   if (NULL == sh->suggest_cb)
     return;
-  if ( (GNUNET_YES == ar->in_destroy) &&
-       ( (0 != ntohl (m->bandwidth_out.value__)) ||
-         (0 != ntohl (m->bandwidth_in.value__)) ) )
+  if (GNUNET_YES == ar->in_destroy)
   {
     /* ignore suggestion, as this address is dying */
     return;
@@ -490,7 +488,7 @@ process_ats_address_suggestion_message (void *cls,
        (GNUNET_HELLO_address_check_option (ar->address,
                                            GNUNET_HELLO_ADDRESS_INFO_INBOUND)) )
   {
-    GNUNET_break (0);
+    GNUNET_assert (0);
     return;
   }
   sh->suggest_cb (sh->suggest_cb_cls,
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index 99cbb1b55..874741a2b 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -587,17 +587,19 @@ distribute_bandwidth (struct GAS_PROPORTIONAL_Handle *s,
   if (count_addresses != net->active_addresses)
   {
     GNUNET_break (0);
-    LOG(GNUNET_ERROR_TYPE_WARNING,
-        "%s: Counted %u active addresses, but network says to have %u active addresses \n",
-        net->desc, count_addresses, net->active_addresses);
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "%s: Counted %u active addresses, but network says to have %u active addresses\n",
+         net->desc, count_addresses, net->active_addresses);
     for (cur_address = net->head; NULL != cur_address; cur_address = cur_address->next)
     {
       if (GNUNET_YES != cur_address->addr->active)
         continue;
 
-      LOG (GNUNET_ERROR_TYPE_WARNING, "Active: `%s' `%s' length %u\n",
-          GNUNET_i2s (&cur_address->addr->peer), cur_address->addr->plugin,
-          cur_address->addr->addr_len);
+      LOG (GNUNET_ERROR_TYPE_WARNING,
+           "Active: `%s' `%s' length %u\n",
+           GNUNET_i2s (&cur_address->addr->peer),
+           cur_address->addr->plugin,
+           cur_address->addr->addr_len);
     }
   }