aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/gnunet-service-testbed_links.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-10-10 20:36:11 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-10-10 20:36:11 +0000
commit9b254cc0bcac0e9a167008fea2270351c5f5e62a (patch)
tree68daaf7f0f40dbc7d12c46898659afcbfecade65 /src/testbed/gnunet-service-testbed_links.c
parent990ca23b4da56d67f093d0ad967731998d9851fb (diff)
downloadgnunet-9b254cc0bcac0e9a167008fea2270351c5f5e62a.tar.gz
gnunet-9b254cc0bcac0e9a167008fea2270351c5f5e62a.zip
- fix testbed crash when controller linking operations fail at controllers
Diffstat (limited to 'src/testbed/gnunet-service-testbed_links.c')
-rw-r--r--src/testbed/gnunet-service-testbed_links.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c
index 79166d438..766c47471 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -723,7 +723,8 @@ lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
723 lcfq = lcfq_head; 723 lcfq = lcfq_head;
724 GNUNET_assert (lcfq->lcf == lcf); 724 GNUNET_assert (lcfq->lcf == lcf);
725 GNUNET_SERVER_client_drop (lcf->client); 725 GNUNET_SERVER_client_drop (lcf->client);
726 GNUNET_TESTBED_operation_done (lcf->op); 726 if (NULL != lcf->op)
727 GNUNET_TESTBED_operation_done (lcf->op);
727 GNUNET_free (lcf); 728 GNUNET_free (lcf);
728 GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq); 729 GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);
729 GNUNET_free (lcfq); 730 GNUNET_free (lcfq);
@@ -745,8 +746,7 @@ slave_event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
745{ 746{
746 struct LCFContext *lcf; 747 struct LCFContext *lcf;
747 748
748 /* We currently only get here when working on RegisteredHostContexts and 749 /* We currently only get here when working on LCFContexts */
749 LCFContexts */
750 GNUNET_assert (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type); 750 GNUNET_assert (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
751 lcf = event->op_cls; 751 lcf = event->op_cls;
752 GNUNET_assert (lcf->op == event->op); 752 GNUNET_assert (lcf->op == event->op);