diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-22 21:02:28 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-22 21:02:28 +0000 |
commit | 50d2b91a6e689d617813aaeefe170465075bae42 (patch) | |
tree | cfa52b84c124afa1c1cca49083fc6a15d7964f96 | |
parent | 8152cea349f1bbd9fb060688fcb079e51bfb2eda (diff) | |
download | gnunet-50d2b91a6e689d617813aaeefe170465075bae42.tar.gz gnunet-50d2b91a6e689d617813aaeefe170465075bae42.zip |
clarifications on r13759
-rw-r--r-- | src/core/core_api.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c index cae269290..3b7e954ce 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -479,8 +479,6 @@ reconnect_later (struct GNUNET_CORE_Handle *h) | |||
479 | { | 479 | { |
480 | GNUNET_CLIENT_disconnect (h->client, GNUNET_NO); | 480 | GNUNET_CLIENT_disconnect (h->client, GNUNET_NO); |
481 | h->client = NULL; | 481 | h->client = NULL; |
482 | /* FIXME: is this right? GNUNET_CLIENT_disconnect frees all outstanding transmission handles, so h->cth is invalid! */ | ||
483 | /* Otherwise a subsequent call to GNUNET_CORE_disconnect tries to cancel this task!!! */ | ||
484 | h->cth = NULL; | 482 | h->cth = NULL; |
485 | GNUNET_CONTAINER_multihashmap_iterate (h->peers, | 483 | GNUNET_CONTAINER_multihashmap_iterate (h->peers, |
486 | &disconnect_and_free_peer_entry, | 484 | &disconnect_and_free_peer_entry, |
@@ -1133,10 +1131,10 @@ main_notify_handler (void *cls, | |||
1133 | "Received notification about transmission readiness to `%s'.\n", | 1131 | "Received notification about transmission readiness to `%s'.\n", |
1134 | GNUNET_i2s (&smr->peer)); | 1132 | GNUNET_i2s (&smr->peer)); |
1135 | #endif | 1133 | #endif |
1136 | /* FIXME: pr->pending_head is sometimes NULL here... Safe to just return? Or does this indicate something is out of sync somewhere else? */ | ||
1137 | if (pr->pending_head == NULL) | 1134 | if (pr->pending_head == NULL) |
1138 | { | 1135 | { |
1139 | GNUNET_break (0); | 1136 | /* request must have been cancelled between the origional request |
1137 | and the response from core, ignore core's readiness */ | ||
1140 | return; | 1138 | return; |
1141 | } | 1139 | } |
1142 | 1140 | ||