diff options
Diffstat (limited to 'src/testing/testing_api_cmd_netjail_stop_testsystem_v2.c')
-rw-r--r-- | src/testing/testing_api_cmd_netjail_stop_testsystem_v2.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/testing/testing_api_cmd_netjail_stop_testsystem_v2.c b/src/testing/testing_api_cmd_netjail_stop_testsystem_v2.c index 8eccc5764..65eb85d9a 100644 --- a/src/testing/testing_api_cmd_netjail_stop_testsystem_v2.c +++ b/src/testing/testing_api_cmd_netjail_stop_testsystem_v2.c | |||
@@ -52,11 +52,9 @@ struct StopHelperState | |||
52 | * Code to clean up resource this cmd used. | 52 | * Code to clean up resource this cmd used. |
53 | * | 53 | * |
54 | * @param cls closure | 54 | * @param cls closure |
55 | * @param cmd current CMD being cleaned up. | ||
56 | */ | 55 | */ |
57 | static void | 56 | static void |
58 | stop_testing_system_cleanup (void *cls, | 57 | stop_testing_system_cleanup (void *cls) |
59 | const struct GNUNET_TESTING_Command *cmd) | ||
60 | { | 58 | { |
61 | 59 | ||
62 | } | 60 | } |
@@ -66,13 +64,13 @@ stop_testing_system_cleanup (void *cls, | |||
66 | * Trait function of this cmd does nothing. | 64 | * Trait function of this cmd does nothing. |
67 | * | 65 | * |
68 | */ | 66 | */ |
69 | static int | 67 | static enum GNUNET_GenericReturnValue |
70 | stop_testing_system_traits (void *cls, | 68 | stop_testing_system_traits (void *cls, |
71 | const void **ret, | 69 | const void **ret, |
72 | const char *trait, | 70 | const char *trait, |
73 | unsigned int index) | 71 | unsigned int index) |
74 | { | 72 | { |
75 | return GNUNET_OK; | 73 | return GNUNET_NO; |
76 | } | 74 | } |
77 | 75 | ||
78 | 76 | ||
@@ -80,12 +78,10 @@ stop_testing_system_traits (void *cls, | |||
80 | * This function stops the helper process for each node. | 78 | * This function stops the helper process for each node. |
81 | * | 79 | * |
82 | * @param cls closure. | 80 | * @param cls closure. |
83 | * @param cmd CMD being run. | ||
84 | * @param is interpreter state. | 81 | * @param is interpreter state. |
85 | */ | 82 | */ |
86 | static void | 83 | static void |
87 | stop_testing_system_run (void *cls, | 84 | stop_testing_system_run (void *cls, |
88 | const struct GNUNET_TESTING_Command *cmd, | ||
89 | struct GNUNET_TESTING_Interpreter *is) | 85 | struct GNUNET_TESTING_Interpreter *is) |
90 | { | 86 | { |
91 | struct StopHelperState *shs = cls; | 87 | struct StopHelperState *shs = cls; |
@@ -93,6 +89,7 @@ stop_testing_system_run (void *cls, | |||
93 | const struct GNUNET_TESTING_Command *start_helper_cmd; | 89 | const struct GNUNET_TESTING_Command *start_helper_cmd; |
94 | 90 | ||
95 | start_helper_cmd = GNUNET_TESTING_interpreter_lookup_command ( | 91 | start_helper_cmd = GNUNET_TESTING_interpreter_lookup_command ( |
92 | is, | ||
96 | shs->helper_start_label); | 93 | shs->helper_start_label); |
97 | GNUNET_TESTING_get_trait_helper_handles (start_helper_cmd, | 94 | GNUNET_TESTING_get_trait_helper_handles (start_helper_cmd, |
98 | &helper); | 95 | &helper); |
@@ -130,14 +127,15 @@ GNUNET_TESTING_cmd_stop_testing_system_v2 (const char *label, | |||
130 | shs->helper_start_label = helper_start_label; | 127 | shs->helper_start_label = helper_start_label; |
131 | shs->local_m = topology->nodes_m; | 128 | shs->local_m = topology->nodes_m; |
132 | shs->global_n = topology->namespaces_n; | 129 | shs->global_n = topology->namespaces_n; |
133 | 130 | { | |
134 | struct GNUNET_TESTING_Command cmd = { | 131 | struct GNUNET_TESTING_Command cmd = { |
135 | .cls = shs, | 132 | .cls = shs, |
136 | .label = label, | 133 | .label = label, |
137 | .run = &stop_testing_system_run, | 134 | .run = &stop_testing_system_run, |
138 | .cleanup = &stop_testing_system_cleanup, | 135 | .cleanup = &stop_testing_system_cleanup, |
139 | .traits = &stop_testing_system_traits | 136 | .traits = &stop_testing_system_traits |
140 | }; | 137 | }; |
141 | 138 | ||
142 | return cmd; | 139 | return cmd; |
140 | } | ||
143 | } | 141 | } |