diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-10-10 07:44:08 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-10-10 07:44:08 +0000 |
commit | 8635c294b21845dc7c283982a6a62943e3b3027a (patch) | |
tree | b5ff0b5090cc31e388e5251556703b4cfc3b2d96 /src/experimentation | |
parent | c4f0be1e98d0b287524aad328a28aad5fd370c32 (diff) | |
download | gnunet-8635c294b21845dc7c283982a6a62943e3b3027a.tar.gz gnunet-8635c294b21845dc7c283982a6a62943e3b3027a.zip |
fixes
Diffstat (limited to 'src/experimentation')
-rw-r--r-- | src/experimentation/gnunet-daemon-experimentation_experiments.c | 1 | ||||
-rw-r--r-- | src/experimentation/gnunet-daemon-experimentation_nodes.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c index 928502cf5..7d2bb181a 100644 --- a/src/experimentation/gnunet-daemon-experimentation_experiments.c +++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c | |||
@@ -434,6 +434,7 @@ GED_experiments_start () | |||
434 | "ISSUERS", | 434 | "ISSUERS", |
435 | _("Invalid value for public key\n")); | 435 | _("Invalid value for public key\n")); |
436 | GED_experiments_stop (); | 436 | GED_experiments_stop (); |
437 | GNUNET_free (issuers); | ||
437 | return GNUNET_SYSERR; | 438 | return GNUNET_SYSERR; |
438 | } | 439 | } |
439 | i = GNUNET_new (struct Issuer); | 440 | i = GNUNET_new (struct Issuer); |
diff --git a/src/experimentation/gnunet-daemon-experimentation_nodes.c b/src/experimentation/gnunet-daemon-experimentation_nodes.c index f78569146..73fc48bba 100644 --- a/src/experimentation/gnunet-daemon-experimentation_nodes.c +++ b/src/experimentation/gnunet-daemon-experimentation_nodes.c | |||
@@ -499,7 +499,7 @@ handle_request (const struct GNUNET_PeerIdentity *peer, | |||
499 | } | 499 | } |
500 | else if (NULL != (n = GNUNET_CONTAINER_multipeermap_get (nodes_requested, peer))) | 500 | else if (NULL != (n = GNUNET_CONTAINER_multipeermap_get (nodes_requested, peer))) |
501 | { | 501 | { |
502 | GNUNET_CONTAINER_multipeermap_remove (nodes_requested, peer, n); | 502 | GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multipeermap_remove (nodes_requested, peer, n)); |
503 | if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task) | 503 | if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task) |
504 | { | 504 | { |
505 | GNUNET_SCHEDULER_cancel (n->timeout_task); | 505 | GNUNET_SCHEDULER_cancel (n->timeout_task); |
@@ -607,7 +607,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer, | |||
607 | { | 607 | { |
608 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s from %s peer `%s'\n", | 608 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s from %s peer `%s'\n", |
609 | "RESPONSE", "requested", GNUNET_i2s (peer)); | 609 | "RESPONSE", "requested", GNUNET_i2s (peer)); |
610 | GNUNET_CONTAINER_multipeermap_remove (nodes_requested, peer, n); | 610 | GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multipeermap_remove (nodes_requested, peer, n)); |
611 | if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task) | 611 | if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task) |
612 | { | 612 | { |
613 | GNUNET_SCHEDULER_cancel (n->timeout_task); | 613 | GNUNET_SCHEDULER_cancel (n->timeout_task); |