[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26527 - gnunet/src/consensus
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26527 - gnunet/src/consensus |
Date: |
Thu, 21 Mar 2013 02:27:31 +0100 |
Author: dold
Date: 2013-03-21 02:27:31 +0100 (Thu, 21 Mar 2013)
New Revision: 26527
Modified:
gnunet/src/consensus/gnunet-service-consensus.c
Log:
fix
Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c 2013-03-21 01:06:40 UTC
(rev 26526)
+++ gnunet/src/consensus/gnunet-service-consensus.c 2013-03-21 01:27:31 UTC
(rev 26527)
@@ -1095,7 +1095,7 @@
cpi->ibf_bucket_counter = 0;
if (NULL != cpi->ibf)
{
- GNUNET_free (cpi->ibf);
+ ibf_destroy (cpi->ibf);
cpi->ibf = NULL;
}
break;
@@ -1843,7 +1843,6 @@
struct ConsensusHello *hello;
cpi = cls;
- cpi->wh = NULL;
hello = GNUNET_malloc (sizeof *hello);
hello->header.size = htons (sizeof *hello);
hello->header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_HELLO);
@@ -2623,8 +2622,11 @@
disconnect_core (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_CORE_disconnect (core);
- core = NULL;
+ if (core != NULL)
+ {
+ GNUNET_CORE_disconnect (core);
+ core = NULL;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "disconnected from core\n");
}
@@ -2667,13 +2669,13 @@
{
struct IncomingSocket *socket;
socket = incoming_sockets_head;
+ if (NULL != socket->rh)
+ {
+ GNUNET_STREAM_read_cancel (socket->rh);
+ socket->rh = NULL;
+ }
if (NULL == socket->cpi)
{
- if (NULL != socket->rh)
- {
- GNUNET_STREAM_read_cancel (socket->rh);
- socket->rh = NULL;
- }
GNUNET_STREAM_close (socket->socket);
socket->socket = NULL;
if (NULL != socket->mst)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26527 - gnunet/src/consensus,
gnunet <=