From 2f00597a249bd5a3feaf10c93a1c77a05ed46813 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 15 Mar 2010 14:22:47 +0000
Subject: [PATCH] fixing shutdown timeout issue

---
 TODO                                     | 4 ++++
 src/core/gnunet-service-core.c           | 2 +-
 src/fs/gnunet-service-fs.c               | 2 +-
 src/peerinfo/gnunet-service-peerinfo.c   | 2 +-
 src/statistics/statistics_api.c          | 7 ++++++-
 src/topology/gnunet-daemon-topology.c    | 2 +-
 src/transport/gnunet-service-transport.c | 2 +-
 src/transport/transport.h                | 6 +++---
 8 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/TODO b/TODO
index 18cca8037..c549759ce 100644
--- a/TODO
+++ b/TODO
@@ -17,8 +17,12 @@ away), in order in which they will likely be done:
 * HOSTLIST/PEERINFO/CORE/TRANSPORT/TOPOLOGY:
   - hostlist server learns about 2nd peer, but soon forgets!
   - peers do not seem to connect (at least not for long!)
+  
 * TOPOLOGY:
   - needs more testing (especially F2F topology)
+  - calls 'GNUNET_CORE_peer_request_connect' with 'my_identity' as the PID,
+    despite having specific checks to prevent exactly that (!?)
+    => assertion failure in gnunet-service-core:2255 (hostlist test)
 * CORE:
   - needs more testing
 * UTIL:
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 5acecc5f9..654f93808 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -3580,7 +3580,7 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (my_private_key != NULL)
     GNUNET_CRYPTO_rsa_key_free (my_private_key);
   if (stats != NULL)
-    GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
 }
 
 
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 1b3bad6bb..aa0f92f7e 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -957,7 +957,7 @@ shutdown_task (void *cls,
   core = NULL;
   if (stats != NULL)
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
       stats = NULL;
     }
   sched = NULL;
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 1d84b5dcf..5c3f2dfbf 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -775,7 +775,7 @@ shutdown_task (void *cls,
   notify_list = NULL;
   if (stats != NULL)
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
       stats = NULL;
     }
 }
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index c8a341b0c..5c5588e91 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -32,7 +32,12 @@
 #include "gnunet_strings_lib.h"
 #include "statistics.h"
 
-#define SET_TRANSMIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+/**
+ * How long do we wait until a statistics request for setting
+ * a value times out?  (The update will be lost if the
+ * service does not react within this timeframe).  
+ */
+#define SET_TRANSMIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250)
 
 
 /**
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index fa7168cf8..b466dfbbe 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -1331,7 +1331,7 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     }
   if (stats != NULL)
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
       stats = NULL;
     }
 }
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index c268125e4..6f6891002 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -3373,7 +3373,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   validation_map = NULL;
   if (stats != NULL)
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
       stats = NULL;
     }
 }
diff --git a/src/transport/transport.h b/src/transport/transport.h
index acaa20a52..d66b87b35 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -30,9 +30,9 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 
-#define DEBUG_TRANSPORT GNUNET_NO
-#define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO
-#define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO
+#define DEBUG_TRANSPORT GNUNET_YES
+#define DEBUG_TRANSPORT_TIMEOUT GNUNET_YES
+#define DEBUG_TRANSPORT_DISCONNECT GNUNET_YES
 
 /**
  * For how long do we allow unused bandwidth
-- 
2.25.1