aboutsummaryrefslogtreecommitdiff
path: root/src/testing/testing_api_cmd_netjail_stop_testsystem.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing/testing_api_cmd_netjail_stop_testsystem.c')
-rw-r--r--src/testing/testing_api_cmd_netjail_stop_testsystem.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/testing/testing_api_cmd_netjail_stop_testsystem.c b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
index e37e955be..4b52878c4 100644
--- a/src/testing/testing_api_cmd_netjail_stop_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
@@ -25,6 +25,7 @@
25 */ 25 */
26#include "platform.h" 26#include "platform.h"
27#include "gnunet_testing_ng_lib.h" 27#include "gnunet_testing_ng_lib.h"
28#include "gnunet_testing_netjail_lib.h"
28#include "testing_cmds.h" 29#include "testing_cmds.h"
29 30
30 31
@@ -70,7 +71,6 @@ stop_testing_system_cleanup (void *cls)
70{ 71{
71 struct StopHelperState *shs = cls; 72 struct StopHelperState *shs = cls;
72 73
73 GNUNET_TESTING_free_topology (shs->topology);
74 GNUNET_free (shs); 74 GNUNET_free (shs);
75} 75}
76 76
@@ -124,19 +124,17 @@ stop_testing_system_run (void *cls,
124 * 124 *
125 * @param label name for command. 125 * @param label name for command.
126 * @param helper_start_label label of the cmd to start the test system. 126 * @param helper_start_label label of the cmd to start the test system.
127 * @param topology_config Configuration file for the test topology. 127 * @param topology The complete topology information.
128 * @return command. 128 * @return command.
129 */ 129 */
130struct GNUNET_TESTING_Command 130struct GNUNET_TESTING_Command
131GNUNET_TESTING_cmd_stop_testing_system (const char *label, 131GNUNET_TESTING_cmd_stop_testing_system (
132 const char *helper_start_label, 132 const char *label,
133 const char *topology_config) 133 const char *helper_start_label,
134 struct GNUNET_TESTING_NetjailTopology *topology)
134{ 135{
135 struct StopHelperState *shs; 136 struct StopHelperState *shs;
136 137
137 struct GNUNET_TESTING_NetjailTopology *topology =
138 GNUNET_TESTING_get_topo_from_file (topology_config);
139
140 shs = GNUNET_new (struct StopHelperState); 138 shs = GNUNET_new (struct StopHelperState);
141 shs->helper_start_label = helper_start_label; 139 shs->helper_start_label = helper_start_label;
142 shs->local_m = topology->nodes_m; 140 shs->local_m = topology->nodes_m;