-fixing crash, notes

2 files changed, 17 insertions, 6 deletions

diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index b0f0d215a..f5dd1f585 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -25,7 +25,14 @@
  * @author Christian Grothoff
  *
  * TODO:
+ * - need some logging
+ * - need some statistics
+ * - test
+ *
+ * Code cleanup:
  * - factor out crc computations from DNS/EXIT/VPN into shared library?
+ *
+ * Design:
  * - which code should advertise services? the service model is right
  *   now a bit odd, especially as this code DOES the exit and knows
  *   the DNS "name", but OTOH this is clearly NOT the place to advertise
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 3e8178560..7219471bf 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -28,6 +28,8 @@
  *
  * TODO:
  * Basics:
+ * - need some logging
+ * - need some statistics
  * - test!
  * - better message queue management (bounded state, drop oldest/RED?)
  * - actually destroy "stale" tunnels once we have too many!
@@ -2086,12 +2088,14 @@ cleanup_destination_client (void *cls,
 static void
 client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
 {
-  GNUNET_CONTAINER_multihashmap_iterate (tunnel_map,
-                                         &cleanup_tunnel_client,
-                                         client);
-  GNUNET_CONTAINER_multihashmap_iterate (destination_map,
-                                         &cleanup_destination_client,
-                                         client);
+  if (NULL != tunnel_map)
+    GNUNET_CONTAINER_multihashmap_iterate (tunnel_map,
+                                           &cleanup_tunnel_client,
+                                           client);
+  if (NULL != destination_map)
+    GNUNET_CONTAINER_multihashmap_iterate (destination_map,
+                                           &cleanup_destination_client,
+                                           client);
 }