aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJulius Bünger <buenger@mytum.de>2015-01-28 13:39:47 +0000
committerJulius Bünger <buenger@mytum.de>2015-01-28 13:39:47 +0000
commit51ceab571cf7c3810c5c75c03c815d44f9e78f02 (patch)
treefcdb1d97ed41a90822b70ff2f15afb4164693d5c /src
parent00b25f242460ac2c4777ab75a176ebac13e357fc (diff)
downloadgnunet-51ceab571cf7c3810c5c75c03c815d44f9e78f02.tar.gz
gnunet-51ceab571cf7c3810c5c75c03c815d44f9e78f02.zip
fixed wrong cancellation
Diffstat (limited to 'src')
-rw-r--r--src/rps/gnunet-service-rps.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 4020118c9..f8b2e6f22 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -509,6 +509,8 @@ peer_is_live (void *cls, size_t size, void *buf)
509 struct GNUNET_PeerIdentity *peer; 509 struct GNUNET_PeerIdentity *peer;
510 struct PeerContext *peer_ctx; 510 struct PeerContext *peer_ctx;
511 511
512 // TODO check
513
512 peer = (struct GNUNET_PeerIdentity *) cls; 514 peer = (struct GNUNET_PeerIdentity *) cls;
513 peer_ctx = get_peer_ctx (peer_map, peer); 515 peer_ctx = get_peer_ctx (peer_map, peer);
514 peer_ctx->peer_flags |= LIVING; 516 peer_ctx->peer_flags |= LIVING;
@@ -526,7 +528,11 @@ peer_is_live (void *cls, size_t size, void *buf)
526 528
527 GNUNET_free (peer); 529 GNUNET_free (peer);
528 530
529 buf = NULL; 531 //if (NULL != peer_ctx->is_live_task)
532 //{
533 // GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
534 // peer_ctx->is_live_task = NULL; // needed?
535 //}
530 return 0; 536 return 0;
531} 537}
532 538
@@ -1379,7 +1385,10 @@ peer_remove_cb (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
1379 GNUNET_MQ_destroy (peer_ctx->mq); 1385 GNUNET_MQ_destroy (peer_ctx->mq);
1380 1386
1381 if ( NULL != peer_ctx->is_live_task) 1387 if ( NULL != peer_ctx->is_live_task)
1388 {
1382 GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task); 1389 GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
1390 peer_ctx->is_live_task = NULL;
1391 }
1383 1392
1384 if ( NULL != peer_ctx->send_channel) 1393 if ( NULL != peer_ctx->send_channel)
1385 GNUNET_CADET_channel_destroy (peer_ctx->send_channel); 1394 GNUNET_CADET_channel_destroy (peer_ctx->send_channel);