diff options
Diffstat (limited to 'src/testbed/testbed_api_cmd_netjail_stop_testbed.c')
-rw-r--r-- | src/testbed/testbed_api_cmd_netjail_stop_testbed.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/testbed/testbed_api_cmd_netjail_stop_testbed.c b/src/testbed/testbed_api_cmd_netjail_stop_testbed.c index 9a9d489a7..c74c1e94f 100644 --- a/src/testbed/testbed_api_cmd_netjail_stop_testbed.c +++ b/src/testbed/testbed_api_cmd_netjail_stop_testbed.c | |||
@@ -53,8 +53,8 @@ struct StopHelperState | |||
53 | * @param cmd current CMD being cleaned up. | 53 | * @param cmd current CMD being cleaned up. |
54 | */ | 54 | */ |
55 | static void | 55 | static void |
56 | stop_testbed_cleanup (void *cls, | 56 | stop_testing_system_cleanup (void *cls, |
57 | const struct GNUNET_TESTING_Command *cmd) | 57 | const struct GNUNET_TESTING_Command *cmd) |
58 | { | 58 | { |
59 | 59 | ||
60 | } | 60 | } |
@@ -70,10 +70,10 @@ stop_testbed_cleanup (void *cls, | |||
70 | * @return #GNUNET_OK on success. | 70 | * @return #GNUNET_OK on success. |
71 | */ | 71 | */ |
72 | static int | 72 | static int |
73 | stop_testbed_traits (void *cls, | 73 | stop_testing_system_traits (void *cls, |
74 | const void **ret, | 74 | const void **ret, |
75 | const char *trait, | 75 | const char *trait, |
76 | unsigned int index) | 76 | unsigned int index) |
77 | { | 77 | { |
78 | return GNUNET_OK; | 78 | return GNUNET_OK; |
79 | } | 79 | } |
@@ -87,9 +87,9 @@ stop_testbed_traits (void *cls, | |||
87 | * @param is interpreter state. | 87 | * @param is interpreter state. |
88 | */ | 88 | */ |
89 | static void | 89 | static void |
90 | stop_testbed_run (void *cls, | 90 | stop_testing_system_run (void *cls, |
91 | const struct GNUNET_TESTING_Command *cmd, | 91 | const struct GNUNET_TESTING_Command *cmd, |
92 | struct GNUNET_TESTING_Interpreter *is) | 92 | struct GNUNET_TESTING_Interpreter *is) |
93 | { | 93 | { |
94 | struct StopHelperState *shs = cls; | 94 | struct StopHelperState *shs = cls; |
95 | struct GNUNET_HELPER_Handle **helper; | 95 | struct GNUNET_HELPER_Handle **helper; |
@@ -97,7 +97,7 @@ stop_testbed_run (void *cls, | |||
97 | 97 | ||
98 | start_helper_cmd = GNUNET_TESTING_interpreter_lookup_command ( | 98 | start_helper_cmd = GNUNET_TESTING_interpreter_lookup_command ( |
99 | shs->helper_start_label); | 99 | shs->helper_start_label); |
100 | GNUNET_TESTBED_get_trait_helper_handles (start_helper_cmd, | 100 | GNUNET_TESTING_get_trait_helper_handles (start_helper_cmd, |
101 | &helper); | 101 | &helper); |
102 | 102 | ||
103 | for (int i = 1; i <= atoi (shs->global_n); i++) { | 103 | for (int i = 1; i <= atoi (shs->global_n); i++) { |
@@ -118,11 +118,11 @@ stop_testbed_run (void *cls, | |||
118 | * @return command. | 118 | * @return command. |
119 | */ | 119 | */ |
120 | struct GNUNET_TESTING_Command | 120 | struct GNUNET_TESTING_Command |
121 | GNUNET_TESTBED_cmd_stop_testbed (const char *label, | 121 | GNUNET_TESTING_cmd_stop_testing_system (const char *label, |
122 | const char *helper_start_label, | 122 | const char *helper_start_label, |
123 | char *local_m, | 123 | char *local_m, |
124 | char *global_n | 124 | char *global_n |
125 | ) | 125 | ) |
126 | { | 126 | { |
127 | struct StopHelperState *shs; | 127 | struct StopHelperState *shs; |
128 | 128 | ||
@@ -134,9 +134,9 @@ GNUNET_TESTBED_cmd_stop_testbed (const char *label, | |||
134 | struct GNUNET_TESTING_Command cmd = { | 134 | struct GNUNET_TESTING_Command cmd = { |
135 | .cls = shs, | 135 | .cls = shs, |
136 | .label = label, | 136 | .label = label, |
137 | .run = &stop_testbed_run, | 137 | .run = &stop_testing_system_run, |
138 | .cleanup = &stop_testbed_cleanup, | 138 | .cleanup = &stop_testing_system_cleanup, |
139 | .traits = &stop_testbed_traits | 139 | .traits = &stop_testing_system_traits |
140 | }; | 140 | }; |
141 | 141 | ||
142 | return cmd; | 142 | return cmd; |