diff options
Diffstat (limited to 'src/transport/plugin_cmd_simple_send.c')
-rw-r--r-- | src/transport/plugin_cmd_simple_send.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/transport/plugin_cmd_simple_send.c b/src/transport/plugin_cmd_simple_send.c index 62bb7544b..e2407c8c0 100644 --- a/src/transport/plugin_cmd_simple_send.c +++ b/src/transport/plugin_cmd_simple_send.c | |||
@@ -30,6 +30,7 @@ | |||
30 | // #include "gnunet_transport_service.h" | 30 | // #include "gnunet_transport_service.h" |
31 | #include "gnunet_testbed_ng_service.h" | 31 | #include "gnunet_testbed_ng_service.h" |
32 | #include "transport-testing2.h" | 32 | #include "transport-testing2.h" |
33 | #include "transport-testing-cmds.h" | ||
33 | 34 | ||
34 | /** | 35 | /** |
35 | * Generic logging shortcut | 36 | * Generic logging shortcut |
@@ -85,20 +86,25 @@ static void | |||
85 | start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip, | 86 | start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip, |
86 | char *node_ip, | 87 | char *node_ip, |
87 | char *m, | 88 | char *m, |
88 | char *n) | 89 | char *n, |
90 | char *local_m) | ||
89 | { | 91 | { |
90 | char *testdir; | 92 | char *testdir; |
91 | char *cfgname; | 93 | char *cfgname; |
92 | 94 | ||
93 | GNUNET_asprintf (&cfgname, | 95 | GNUNET_asprintf (&cfgname, |
94 | "%s%s.conf", | 96 | "%s%s.conf", |
95 | "test_transport_api2_tcp_peer", | 97 | "test_transport_api2_tcp_node", |
96 | n); | 98 | n); |
97 | 99 | ||
98 | LOG (GNUNET_ERROR_TYPE_ERROR, | 100 | LOG (GNUNET_ERROR_TYPE_ERROR, |
99 | "cfgname: %s\n", | 101 | "cfgname: %s\n", |
100 | cfgname); | 102 | cfgname); |
101 | 103 | ||
104 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
105 | "node ip: %s\n", | ||
106 | node_ip); | ||
107 | |||
102 | testdir = GNUNET_malloc (strlen (BASE_DIR) + strlen (m) + strlen (n) | 108 | testdir = GNUNET_malloc (strlen (BASE_DIR) + strlen (m) + strlen (n) |
103 | + 1); | 109 | + 1); |
104 | 110 | ||
@@ -125,6 +131,7 @@ start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip, | |||
125 | "system-create-1", | 131 | "system-create-1", |
126 | m, | 132 | m, |
127 | n, | 133 | n, |
134 | local_m, | ||
128 | handlers, | 135 | handlers, |
129 | cfgname), | 136 | cfgname), |
130 | GNUNET_TESTING_cmd_send_peer_ready ("send-peer-ready-1", | 137 | GNUNET_TESTING_cmd_send_peer_ready ("send-peer-ready-1", |
@@ -134,12 +141,12 @@ start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip, | |||
134 | GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers-1", | 141 | GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers-1", |
135 | "start-peer-1", | 142 | "start-peer-1", |
136 | "this is useless"), | 143 | "this is useless"), |
137 | /*GNUNET_TESTING_cmd_send_simple ("send-simple-1", | 144 | GNUNET_TRANSPORT_cmd_send_simple ("send-simple-1", |
138 | char *m, | 145 | m, |
139 | char *n, | 146 | n, |
140 | uint32_t num, | 147 | 0, |
141 | const char *peer1_label, | 148 | "start-peer-1", |
142 | const char *peer2_label),*/ | 149 | "this is useless"), |
143 | GNUNET_TESTING_cmd_local_test_finished ("local-test-finished-1", | 150 | GNUNET_TESTING_cmd_local_test_finished ("local-test-finished-1", |
144 | write_message) | 151 | write_message) |
145 | }; | 152 | }; |