From: Nathan S. Evans <evans@in.tum.de>
Date: Fri, 19 Nov 2010 12:20:02 +0000 (+0000)
Subject: Fix missing notify_cancel in dht service, dhtlog_dummy bad init return
X-Git-Tag: initial-import-from-subversion-38251~19678
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c357ec97367708d372a3b8590241a751e7d40a88;p=oweals%2Fgnunet.git

Fix missing notify_cancel in dht service, dhtlog_dummy bad init return
---

diff --git a/src/dht/dhtlog.c b/src/dht/dhtlog.c
index 8feb3178d..7d66fb87c 100644
--- a/src/dht/dhtlog.c
+++ b/src/dht/dhtlog.c
@@ -70,7 +70,7 @@ GNUNET_DHTLOG_connect (const struct GNUNET_CONFIGURATION_Handle *c)
 
   api = plugin->dhtlog_api;
   GNUNET_free (plugin_name);
-  GNUNET_free(plugin);
+  GNUNET_free (plugin);
   return api;
 }
 
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 2e27ba55b..692a8feb1 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -3799,6 +3799,9 @@ static void handle_client_disconnect (void *cls,
 
   if (found != NULL)
     {
+      if (found->transmit_handle != NULL)
+        GNUNET_CONNECTION_notify_transmit_ready_cancel(found->transmit_handle);
+
       while(NULL != (reply = found->pending_head))
         {
           GNUNET_CONTAINER_DLL_remove(found->pending_head, found->pending_tail, reply);
diff --git a/src/dht/plugin_dhtlog_dummy.c b/src/dht/plugin_dhtlog_dummy.c
index 3f3cd8de1..96a29af89 100644
--- a/src/dht/plugin_dhtlog_dummy.c
+++ b/src/dht/plugin_dhtlog_dummy.c
@@ -304,7 +304,7 @@ libgnunet_plugin_dhtlog_dummy_init (void * cls)
   plugin->dhtlog_api->insert_topology = &add_topology;
   plugin->dhtlog_api->update_topology = &update_topology;
   plugin->dhtlog_api->insert_extended_topology = &add_extended_topology;
-  return NULL;
+  return plugin;
 }
 
 /**