[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26074 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26074 - gnunet/src/testbed |
Date: |
Tue, 12 Feb 2013 11:05:57 +0100 |
Author: harsha
Date: 2013-02-12 11:05:57 +0100 (Tue, 12 Feb 2013)
New Revision: 26074
Modified:
gnunet/src/testbed/gnunet-service-testbed_cache.c
Log:
- fix
Modified: gnunet/src/testbed/gnunet-service-testbed_cache.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_cache.c 2013-02-12 10:05:40 UTC
(rev 26073)
+++ gnunet/src/testbed/gnunet-service-testbed_cache.c 2013-02-12 10:05:57 UTC
(rev 26074)
@@ -352,12 +352,12 @@
GNUNET_TESTBED_operation_done (entry->transport_op_);
entry->transport_op_ = NULL;
}
- if (NULL != entry->core_handle)
+ if (NULL != entry->core_op)
{
- GNUNET_assert (NULL != entry->core_op);
GNUNET_TESTBED_operation_done (entry->core_op);
entry->core_op = NULL;
}
+ GNUNET_assert (NULL == entry->core_handle);
if (NULL != entry->cfg)
{
GNUNET_CONFIGURATION_destroy (entry->cfg);
@@ -669,16 +669,16 @@
GNUNET_assert (NULL != entry);
LOG_DEBUG ("Opening a CORE connection to peer %u\n", entry->peer_id);
- /* void?: We also get the handle when the connection to CORE is successful */
- (void) GNUNET_CORE_connect (entry->cfg, entry, /* closure */
- &core_startup_cb, /* core startup notify */
- &core_peer_connect_cb, /* peer connect notify
*/
- NULL, /* peer disconnect notify */
- NULL, /* inbound notify */
- GNUNET_NO, /* inbound header only? */
- NULL, /* outbound notify */
- GNUNET_NO, /* outbound header only? */
- no_handlers);
+ entry->core_handle =
+ GNUNET_CORE_connect (entry->cfg, entry, /* closure */
+ &core_startup_cb, /* core startup notify */
+ &core_peer_connect_cb, /* peer connect notify */
+ NULL, /* peer disconnect notify */
+ NULL, /* inbound notify */
+ GNUNET_NO, /* inbound header only? */
+ NULL, /* outbound notify */
+ GNUNET_NO, /* outbound header only? */
+ no_handlers);
}
@@ -824,8 +824,7 @@
GNUNET_break (0 == entry->demand);
LOG_DEBUG ("Clearing entry %u of %u\n", ++ncleared, cache_size);
GNUNET_CONTAINER_multihashmap_remove (cache, key, value);
- if (0 == entry->demand)
- close_handles (entry);
+ close_handles (entry);
GNUNET_free_non_null (entry->hello);
GNUNET_break (GNUNET_SCHEDULER_NO_TASK == entry->expire_task);
GNUNET_break (NULL == entry->transport_handle_);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26074 - gnunet/src/testbed,
gnunet <=