diff options
author | Florian Dold <florian.dold@gmail.com> | 2013-03-21 01:27:31 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2013-03-21 01:27:31 +0000 |
commit | e2810ebf1332655fbe4b881b16d2cac1228d417a (patch) | |
tree | d6dac0918678ca7cbb2bf1d4944cc3d81a9e211e /src/consensus | |
parent | f69659c664077034fcf135acb49b6e680937af1d (diff) | |
download | gnunet-e2810ebf1332655fbe4b881b16d2cac1228d417a.tar.gz gnunet-e2810ebf1332655fbe4b881b16d2cac1228d417a.zip |
fix
Diffstat (limited to 'src/consensus')
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 479e7ebdd..8d39eb71b 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -1095,7 +1095,7 @@ handle_p2p_ibf (struct ConsensusPeerInformation *cpi, const struct DifferenceDig | |||
1095 | cpi->ibf_bucket_counter = 0; | 1095 | cpi->ibf_bucket_counter = 0; |
1096 | if (NULL != cpi->ibf) | 1096 | if (NULL != cpi->ibf) |
1097 | { | 1097 | { |
1098 | GNUNET_free (cpi->ibf); | 1098 | ibf_destroy (cpi->ibf); |
1099 | cpi->ibf = NULL; | 1099 | cpi->ibf = NULL; |
1100 | } | 1100 | } |
1101 | break; | 1101 | break; |
@@ -1843,7 +1843,6 @@ open_cb (void *cls, struct GNUNET_STREAM_Socket *socket) | |||
1843 | struct ConsensusHello *hello; | 1843 | struct ConsensusHello *hello; |
1844 | 1844 | ||
1845 | cpi = cls; | 1845 | cpi = cls; |
1846 | cpi->wh = NULL; | ||
1847 | hello = GNUNET_malloc (sizeof *hello); | 1846 | hello = GNUNET_malloc (sizeof *hello); |
1848 | hello->header.size = htons (sizeof *hello); | 1847 | hello->header.size = htons (sizeof *hello); |
1849 | hello->header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_HELLO); | 1848 | hello->header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_HELLO); |
@@ -2623,8 +2622,11 @@ static void | |||
2623 | disconnect_core (void *cls, | 2622 | disconnect_core (void *cls, |
2624 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 2623 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
2625 | { | 2624 | { |
2626 | GNUNET_CORE_disconnect (core); | 2625 | if (core != NULL) |
2627 | core = NULL; | 2626 | { |
2627 | GNUNET_CORE_disconnect (core); | ||
2628 | core = NULL; | ||
2629 | } | ||
2628 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "disconnected from core\n"); | 2630 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "disconnected from core\n"); |
2629 | } | 2631 | } |
2630 | 2632 | ||
@@ -2667,13 +2669,13 @@ shutdown_task (void *cls, | |||
2667 | { | 2669 | { |
2668 | struct IncomingSocket *socket; | 2670 | struct IncomingSocket *socket; |
2669 | socket = incoming_sockets_head; | 2671 | socket = incoming_sockets_head; |
2672 | if (NULL != socket->rh) | ||
2673 | { | ||
2674 | GNUNET_STREAM_read_cancel (socket->rh); | ||
2675 | socket->rh = NULL; | ||
2676 | } | ||
2670 | if (NULL == socket->cpi) | 2677 | if (NULL == socket->cpi) |
2671 | { | 2678 | { |
2672 | if (NULL != socket->rh) | ||
2673 | { | ||
2674 | GNUNET_STREAM_read_cancel (socket->rh); | ||
2675 | socket->rh = NULL; | ||
2676 | } | ||
2677 | GNUNET_STREAM_close (socket->socket); | 2679 | GNUNET_STREAM_close (socket->socket); |
2678 | socket->socket = NULL; | 2680 | socket->socket = NULL; |
2679 | if (NULL != socket->mst) | 2681 | if (NULL != socket->mst) |