[GNUnet-SVN] r34999 - gnunet/src/ats

[gnunet]

Author: grothoff
Date: 2015-01-25 22:14:37 +0100 (Sun, 25 Jan 2015)
New Revision: 34999

Modified:
   gnunet/src/ats/ats_api_scheduling.c
   gnunet/src/ats/plugin_ats_proportional.c
Log:
-address dying doesn't depend on bandwidth suggestion of ATS, just on 
in_destroy flag

Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2015-01-25 21:11:07 UTC (rev 34998)
+++ gnunet/src/ats/ats_api_scheduling.c 2015-01-25 21:14:37 UTC (rev 34999)
@@ -479,9 +479,7 @@
   }
   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 @@
        (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,

Modified: gnunet/src/ats/plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/plugin_ats_proportional.c    2015-01-25 21:11:07 UTC (rev 
34998)
+++ gnunet/src/ats/plugin_ats_proportional.c    2015-01-25 21:14:37 UTC (rev 
34999)
@@ -587,17 +587,19 @@
   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);
     }
   }