diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-03-18 13:11:36 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-03-18 13:11:36 +0000 |
commit | d0d39def77f1f81dd83823e0fe2cfe84a5393a74 (patch) | |
tree | 7c566f79daa839bc74569a415c1b0d2537263280 /src/testbed/gnunet-service-testbed.c | |
parent | 153c0ba219f50e851aaef92d0cef28f80a33763e (diff) | |
download | gnunet-d0d39def77f1f81dd83823e0fe2cfe84a5393a74.tar.gz gnunet-d0d39def77f1f81dd83823e0fe2cfe84a5393a74.zip |
expose Operation and associated closure in every event
Diffstat (limited to 'src/testbed/gnunet-service-testbed.c')
-rw-r--r-- | src/testbed/gnunet-service-testbed.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index eae4784b5..81c17012d 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c | |||
@@ -861,10 +861,10 @@ slave_event_callback (void *cls, | |||
861 | /* We currently only get here when working on RegisteredHostContexts and | 861 | /* We currently only get here when working on RegisteredHostContexts and |
862 | LCFContexts */ | 862 | LCFContexts */ |
863 | GNUNET_assert (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type); | 863 | GNUNET_assert (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type); |
864 | rhc = event->details.operation_finished.op_cls; | 864 | rhc = event->op_cls; |
865 | if (CLOSURE_TYPE_RHC == rhc->type) | 865 | if (CLOSURE_TYPE_RHC == rhc->type) |
866 | { | 866 | { |
867 | GNUNET_assert (rhc->sub_op == event->details.operation_finished.operation); | 867 | GNUNET_assert (rhc->sub_op == event->op); |
868 | switch (rhc->state) | 868 | switch (rhc->state) |
869 | { | 869 | { |
870 | case RHC_GET_CFG: | 870 | case RHC_GET_CFG: |
@@ -889,10 +889,10 @@ slave_event_callback (void *cls, | |||
889 | } | 889 | } |
890 | return; | 890 | return; |
891 | } | 891 | } |
892 | lcf = event->details.operation_finished.op_cls; | 892 | lcf = event->op_cls; |
893 | if (CLOSURE_TYPE_LCF == lcf->type) | 893 | if (CLOSURE_TYPE_LCF == lcf->type) |
894 | { | 894 | { |
895 | GNUNET_assert (lcf->op == event->details.operation_finished.operation); | 895 | GNUNET_assert (lcf->op == event->op); |
896 | GNUNET_assert (FINISHED == lcf->state); | 896 | GNUNET_assert (FINISHED == lcf->state); |
897 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != lcf->timeout_task); | 897 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != lcf->timeout_task); |
898 | GNUNET_SCHEDULER_cancel (lcf->timeout_task); | 898 | GNUNET_SCHEDULER_cancel (lcf->timeout_task); |