diff options
Diffstat (limited to 'src/transport/test_transport_plugin_cmd_simple_send.c')
-rw-r--r-- | src/transport/test_transport_plugin_cmd_simple_send.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c index c374fc2d0..2c987e601 100644 --- a/src/transport/test_transport_plugin_cmd_simple_send.c +++ b/src/transport/test_transport_plugin_cmd_simple_send.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 "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
29 | #include "gnunet_transport_application_service.h" | 30 | #include "gnunet_transport_application_service.h" |
30 | #include "transport-testing2.h" | 31 | #include "transport-testing2.h" |
@@ -213,7 +214,9 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip, | |||
213 | char *node_ip, | 214 | char *node_ip, |
214 | char *m, | 215 | char *m, |
215 | char *n, | 216 | char *n, |
216 | char *local_m) | 217 | char *local_m, |
218 | char *topology_data, | ||
219 | unsigned int *read_file) | ||
217 | { | 220 | { |
218 | 221 | ||
219 | unsigned int n_int; | 222 | unsigned int n_int; |
@@ -221,8 +224,16 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip, | |||
221 | unsigned int local_m_int; | 224 | unsigned int local_m_int; |
222 | unsigned int num; | 225 | unsigned int num; |
223 | struct TestState *ts = GNUNET_new (struct TestState); | 226 | struct TestState *ts = GNUNET_new (struct TestState); |
224 | struct GNUNET_TESTING_NetjailTopology *topology = | 227 | struct GNUNET_TESTING_NetjailTopology *topology; |
225 | GNUNET_TESTING_get_topo_from_file (TOPOLOGY_CONFIG); | 228 | |
229 | if (GNUNET_YES == *read_file) | ||
230 | { | ||
231 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
232 | "read from file\n"); | ||
233 | topology = GNUNET_TESTING_get_topo_from_file (topology_data); | ||
234 | } | ||
235 | else | ||
236 | topology = GNUNET_TESTING_get_topo_from_string (topology_data); | ||
226 | 237 | ||
227 | ts->topology = topology; | 238 | ts->topology = topology; |
228 | 239 | ||