From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 8 Jun 2010 08:17:06 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: initial-import-from-subversion-38251~21455
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4ebfb5622e1e65f8b9b21ad9149b3b6e5a4837a0;p=oweals%2Fgnunet.git

---

diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c
index 89abc0900..8643dde43 100644
--- a/src/hostlist/hostlist-client.c
+++ b/src/hostlist/hostlist-client.c
@@ -1063,6 +1063,9 @@ static void
 task_check (void *cls,
 	    const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  static int once;
+  struct GNUNET_TIME_Relative delay;
+
   ti_check_download = GNUNET_SCHEDULER_NO_TASK;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
@@ -1074,14 +1077,11 @@ task_check (void *cls,
                                                           NULL);
   }
 
-  static int once;
-  struct GNUNET_TIME_Relative delay;
-
   if (stats == NULL)
-    {
-      curl_global_cleanup ();
-      return; /* in shutdown */
-    }
+  {
+    curl_global_cleanup ();
+    return; /* in shutdown */
+  }
   delay = hostlist_delay;
   if (hostlist_delay.value == 0)
     hostlist_delay = GNUNET_TIME_UNIT_SECONDS;
@@ -1168,11 +1168,17 @@ handler_connect (void *cls,
 		 struct GNUNET_TIME_Relative latency,
 		 uint32_t distance)
 {
+  unsigned int max = 0 ;
+  max --;
+
+  if (stat_connection_count < max)
+  {
   stat_connection_count++;
   GNUNET_STATISTICS_update (stats, 
 			    gettext_noop ("# active connections"), 
 			    1, 
-			    GNUNET_NO);  
+			    GNUNET_NO);
+  }
 }
 
 
@@ -1187,17 +1193,12 @@ handler_disconnect (void *cls,
 		    const struct
 		    GNUNET_PeerIdentity * peer)
 {
-  if (stat_connection_count > 0)
-  {
-    stat_connection_count--;
-    GNUNET_STATISTICS_update (stats,
-                              gettext_noop ("# active connections"),
-                              -1,
-                              GNUNET_NO);
-    return;
-  }
-  GNUNET_break(0);
-
+  GNUNET_assert (stat_connection_count > 0);
+  stat_connection_count--;
+  GNUNET_STATISTICS_update (stats,
+                            gettext_noop ("# active connections"),
+                            -1,
+                            GNUNET_NO);
 }
 
 /**