diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-11-19 12:20:02 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-11-19 12:20:02 +0000 |
commit | c357ec97367708d372a3b8590241a751e7d40a88 (patch) | |
tree | 46bcd293c2292ba5753159b29c46f596cdb2d1a4 | |
parent | 0e64a85a1c24499ee1bf4363cdaf882bdff1df0f (diff) | |
download | gnunet-c357ec97367708d372a3b8590241a751e7d40a88.tar.gz gnunet-c357ec97367708d372a3b8590241a751e7d40a88.zip |
Fix missing notify_cancel in dht service, dhtlog_dummy bad init return
-rw-r--r-- | src/dht/dhtlog.c | 2 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht.c | 3 | ||||
-rw-r--r-- | src/dht/plugin_dhtlog_dummy.c | 2 |
3 files changed, 5 insertions, 2 deletions
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) | |||
70 | 70 | ||
71 | api = plugin->dhtlog_api; | 71 | api = plugin->dhtlog_api; |
72 | GNUNET_free (plugin_name); | 72 | GNUNET_free (plugin_name); |
73 | GNUNET_free(plugin); | 73 | GNUNET_free (plugin); |
74 | return api; | 74 | return api; |
75 | } | 75 | } |
76 | 76 | ||
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, | |||
3799 | 3799 | ||
3800 | if (found != NULL) | 3800 | if (found != NULL) |
3801 | { | 3801 | { |
3802 | if (found->transmit_handle != NULL) | ||
3803 | GNUNET_CONNECTION_notify_transmit_ready_cancel(found->transmit_handle); | ||
3804 | |||
3802 | while(NULL != (reply = found->pending_head)) | 3805 | while(NULL != (reply = found->pending_head)) |
3803 | { | 3806 | { |
3804 | GNUNET_CONTAINER_DLL_remove(found->pending_head, found->pending_tail, reply); | 3807 | 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) | |||
304 | plugin->dhtlog_api->insert_topology = &add_topology; | 304 | plugin->dhtlog_api->insert_topology = &add_topology; |
305 | plugin->dhtlog_api->update_topology = &update_topology; | 305 | plugin->dhtlog_api->update_topology = &update_topology; |
306 | plugin->dhtlog_api->insert_extended_topology = &add_extended_topology; | 306 | plugin->dhtlog_api->insert_extended_topology = &add_extended_topology; |
307 | return NULL; | 307 | return plugin; |
308 | } | 308 | } |
309 | 309 | ||
310 | /** | 310 | /** |