diff options
Diffstat (limited to 'src/testing/testing_api_cmd_local_test_finished.c')
-rw-r--r-- | src/testing/testing_api_cmd_local_test_finished.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/testing/testing_api_cmd_local_test_finished.c b/src/testing/testing_api_cmd_local_test_finished.c index 383de4c10..da4aff80f 100644 --- a/src/testing/testing_api_cmd_local_test_finished.c +++ b/src/testing/testing_api_cmd_local_test_finished.c | |||
@@ -19,7 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing_api_cmd_block_until_all_peers_started.c | 22 | * @file testing_api_cmd_local_test_finished.c |
23 | * @brief cmd to block the interpreter loop until all peers started. | 23 | * @brief cmd to block the interpreter loop until all peers started. |
24 | * @author t3sserakt | 24 | * @author t3sserakt |
25 | */ | 25 | */ |
@@ -58,13 +58,13 @@ struct LocalFinishedState | |||
58 | * Trait function of this cmd does nothing. | 58 | * Trait function of this cmd does nothing. |
59 | * | 59 | * |
60 | */ | 60 | */ |
61 | static int | 61 | static enum GNUNET_GenericReturnValue |
62 | local_test_finished_traits (void *cls, | 62 | local_test_finished_traits (void *cls, |
63 | const void **ret, | 63 | const void **ret, |
64 | const char *trait, | 64 | const char *trait, |
65 | unsigned int index) | 65 | unsigned int index) |
66 | { | 66 | { |
67 | return GNUNET_OK; | 67 | return GNUNET_NO; |
68 | } | 68 | } |
69 | 69 | ||
70 | 70 | ||
@@ -73,8 +73,7 @@ local_test_finished_traits (void *cls, | |||
73 | * | 73 | * |
74 | */ | 74 | */ |
75 | static void | 75 | static void |
76 | local_test_finished_cleanup (void *cls, | 76 | local_test_finished_cleanup (void *cls) |
77 | const struct GNUNET_TESTING_Command *cmd) | ||
78 | { | 77 | { |
79 | struct LocalFinishedState *lfs = cls; | 78 | struct LocalFinishedState *lfs = cls; |
80 | 79 | ||
@@ -89,11 +88,9 @@ local_test_finished_cleanup (void *cls, | |||
89 | */ | 88 | */ |
90 | static void | 89 | static void |
91 | local_test_finished_run (void *cls, | 90 | local_test_finished_run (void *cls, |
92 | const struct GNUNET_TESTING_Command *cmd, | ||
93 | struct GNUNET_TESTING_Interpreter *is) | 91 | struct GNUNET_TESTING_Interpreter *is) |
94 | { | 92 | { |
95 | struct LocalFinishedState *lfs = cls; | 93 | struct LocalFinishedState *lfs = cls; |
96 | |||
97 | struct GNUNET_CMDS_LOCAL_FINISHED *reply; | 94 | struct GNUNET_CMDS_LOCAL_FINISHED *reply; |
98 | size_t msg_length; | 95 | size_t msg_length; |
99 | 96 | ||
@@ -102,15 +99,18 @@ local_test_finished_run (void *cls, | |||
102 | reply->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED); | 99 | reply->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED); |
103 | reply->header.size = htons ((uint16_t) msg_length); | 100 | reply->header.size = htons ((uint16_t) msg_length); |
104 | lfs->reply = reply; | 101 | lfs->reply = reply; |
105 | lfs->write_message ((struct GNUNET_MessageHeader *) reply, msg_length); | 102 | lfs->write_message ((struct GNUNET_MessageHeader *) reply, |
103 | msg_length); | ||
106 | } | 104 | } |
107 | 105 | ||
108 | 106 | ||
109 | /** | 107 | /** |
110 | * This finish function will stop the local loop without shutting down the scheduler, because we do not call the continuation, which is the interpreter_next method. | 108 | * This finish function will stop the local loop without shutting down the |
109 | * scheduler, because we do not call the continuation, which is the | ||
110 | * interpreter_next method. | ||
111 | * | 111 | * |
112 | */ | 112 | */ |
113 | static int | 113 | static enum GNUNET_GenericReturnValue |
114 | local_test_finished_finish (void *cls, | 114 | local_test_finished_finish (void *cls, |
115 | GNUNET_SCHEDULER_TaskCallback cont, | 115 | GNUNET_SCHEDULER_TaskCallback cont, |
116 | void *cont_cls) | 116 | void *cont_cls) |
@@ -129,23 +129,24 @@ local_test_finished_finish (void *cls, | |||
129 | * @return command. | 129 | * @return command. |
130 | */ | 130 | */ |
131 | struct GNUNET_TESTING_Command | 131 | struct GNUNET_TESTING_Command |
132 | GNUNET_TESTING_cmd_local_test_finished (const char *label, | 132 | GNUNET_TESTING_cmd_local_test_finished ( |
133 | TESTING_CMD_HELPER_write_cb | 133 | const char *label, |
134 | write_message) | 134 | TESTING_CMD_HELPER_write_cb write_message) |
135 | { | 135 | { |
136 | struct LocalFinishedState *lfs; | 136 | struct LocalFinishedState *lfs; |
137 | 137 | ||
138 | lfs = GNUNET_new (struct LocalFinishedState); | 138 | lfs = GNUNET_new (struct LocalFinishedState); |
139 | lfs->write_message = write_message; | 139 | lfs->write_message = write_message; |
140 | 140 | { | |
141 | struct GNUNET_TESTING_Command cmd = { | 141 | struct GNUNET_TESTING_Command cmd = { |
142 | .cls = lfs, | 142 | .cls = lfs, |
143 | .label = label, | 143 | .label = label, |
144 | .run = &local_test_finished_run, | 144 | .run = &local_test_finished_run, |
145 | .finish = &local_test_finished_finish, | 145 | .finish = &local_test_finished_finish, |
146 | .cleanup = &local_test_finished_cleanup, | 146 | .cleanup = &local_test_finished_cleanup, |
147 | .traits = &local_test_finished_traits | 147 | .traits = &local_test_finished_traits |
148 | }; | 148 | }; |
149 | 149 | ||
150 | return cmd; | 150 | return cmd; |
151 | } | ||
151 | } | 152 | } |