aboutsummaryrefslogtreecommitdiff
path: root/src/dv
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-07-24 12:14:20 +0000
committerChristian Grothoff <christian@grothoff.org>2013-07-24 12:14:20 +0000
commitf012334bce44cd551002318afe469d1b50e49bfc (patch)
tree6309f1efbefa06d4eef190efb33dd24e8a8a8d95 /src/dv
parent23978c444c61bbf4c36eb99b79b7a0624ed6e8d5 (diff)
downloadgnunet-f012334bce44cd551002318afe469d1b50e49bfc.tar.gz
gnunet-f012334bce44cd551002318afe469d1b50e49bfc.zip
-do NOT cancel here
Diffstat (limited to 'src/dv')
-rw-r--r--src/dv/gnunet-service-dv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index 5cc09df61..e9e6f2474 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -1,4 +1,4 @@
1/* 17/*
2 This file is part of GNUnet. 2 This file is part of GNUnet.
3 (C) 2013 Christian Grothoff (and other contributing authors) 3 (C) 2013 Christian Grothoff (and other contributing authors)
4 4
@@ -1325,7 +1325,6 @@ handle_set_union_result (void *cls,
1325 case GNUNET_SET_STATUS_FAILURE: 1325 case GNUNET_SET_STATUS_FAILURE:
1326 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1326 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1327 "Failed to establish DV union, will try again later\n"); 1327 "Failed to establish DV union, will try again later\n");
1328 GNUNET_SET_operation_cancel (neighbor->set_op); /* FIXME: needed? */
1329 neighbor->set_op = NULL; 1328 neighbor->set_op = NULL;
1330 if (NULL != neighbor->neighbor_table_consensus) 1329 if (NULL != neighbor->neighbor_table_consensus)
1331 { 1330 {
@@ -1371,7 +1370,6 @@ handle_set_union_result (void *cls,
1371 break; 1370 break;
1372 case GNUNET_SET_STATUS_DONE: 1371 case GNUNET_SET_STATUS_DONE:
1373 /* operation done, schedule next run! */ 1372 /* operation done, schedule next run! */
1374 GNUNET_SET_operation_cancel (neighbor->set_op); /* FIXME: needed? */
1375 neighbor->set_op = NULL; 1373 neighbor->set_op = NULL;
1376 if (1 == GNUNET_CRYPTO_hash_cmp (&neighbor->peer.hashPubKey, 1374 if (1 == GNUNET_CRYPTO_hash_cmp (&neighbor->peer.hashPubKey,
1377 &my_identity.hashPubKey)) 1375 &my_identity.hashPubKey))