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

[gnunet]

Author: wachs
Date: 2014-06-05 09:49:44 +0200 (Thu, 05 Jun 2014)
New Revision: 33535

Modified:
   gnunet/src/ats/plugin_ats_proportional.c
Log:
debug code to track down assertion in line 668


Modified: gnunet/src/ats/plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/plugin_ats_proportional.c    2014-06-05 07:32:12 UTC (rev 
33534)
+++ gnunet/src/ats/plugin_ats_proportional.c    2014-06-05 07:49:44 UTC (rev 
33535)
@@ -665,8 +665,23 @@
     count_addresses ++;
   }
 
-  GNUNET_assert (count_addresses == net->active_addresses);
+  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);
+    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_INFO,
       "Total relative preference %.3f for %u addresses in network %s\n",
       sum_relative_peer_prefences, net->active_addresses, net->desc);
@@ -1212,7 +1227,8 @@
 
   if (NULL != current_address)
   {
-    if ((NULL == best_address) || ((NULL != best_address) && (GNUNET_NO == 
address_eq (current_address, best_address))))
+    if ((NULL == best_address) || ((NULL != best_address) &&
+        (GNUNET_NO == address_eq (current_address, best_address))))
     {
       /* We switch to a new address, mark old address as inactive */
       LOG (GNUNET_ERROR_TYPE_INFO,