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 | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c index 6829daf84..476fbdf4f 100644 --- a/src/transport/test_transport_plugin_cmd_simple_send.c +++ b/src/transport/test_transport_plugin_cmd_simple_send.c | |||
@@ -164,19 +164,20 @@ handle_result (void *cls, | |||
164 | * | 164 | * |
165 | */ | 165 | */ |
166 | static void * | 166 | static void * |
167 | notify_connect (void *cls, | 167 | notify_connect (struct GNUNET_TESTING_Interpreter *is, |
168 | const struct GNUNET_PeerIdentity *peer, | 168 | const struct GNUNET_PeerIdentity *peer) |
169 | struct GNUNET_MQ_Handle *mq) | ||
170 | { | 169 | { |
171 | struct ConnectPeersState *cps; | 170 | struct ConnectPeersState *cps; |
171 | const struct GNUNET_TESTING_Command *cmd; | ||
172 | 172 | ||
173 | GNUNET_TRANSPORT_get_trait_connect_peer_state (&connect_peers, | 173 | cmd = GNUNET_TESTING_interpreter_lookup_command (is, |
174 | "connect-peers"); | ||
175 | GNUNET_TRANSPORT_get_trait_connect_peer_state (cmd, | ||
174 | &cps); | 176 | &cps); |
175 | void *ret = NULL; | 177 | void *ret = NULL; |
176 | 178 | ||
177 | cps->notify_connect (cps, | 179 | cps->notify_connect (is, |
178 | peer, | 180 | peer); |
179 | mq); | ||
180 | return ret; | 181 | return ret; |
181 | } | 182 | } |
182 | 183 | ||
@@ -246,7 +247,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip, | |||
246 | else | 247 | else |
247 | num = (n_int - 1) * local_m_int + m_int + topology->nodes_x; | 248 | num = (n_int - 1) * local_m_int + m_int + topology->nodes_x; |
248 | 249 | ||
249 | block_send = GNUNET_TESTING_cmd_block_until_external_trigger ("block"); | 250 | block_send = GNUNET_TESTING_cmd_block_until_external_trigger ( |
251 | "block"); | ||
250 | block_receive = GNUNET_TESTING_cmd_block_until_external_trigger ( | 252 | block_receive = GNUNET_TESTING_cmd_block_until_external_trigger ( |
251 | "block-receive"); | 253 | "block-receive"); |
252 | connect_peers = GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers", | 254 | connect_peers = GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers", |
@@ -262,11 +264,11 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip, | |||
262 | GNUNET_asprintf (&ts->cfgname, | 264 | GNUNET_asprintf (&ts->cfgname, |
263 | "test_transport_api2_tcp_node1.conf"); | 265 | "test_transport_api2_tcp_node1.conf"); |
264 | 266 | ||
265 | LOG (GNUNET_ERROR_TYPE_ERROR, | 267 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
266 | "plugin cfgname: %s\n", | 268 | "plugin cfgname: %s\n", |
267 | ts->cfgname); | 269 | ts->cfgname); |
268 | 270 | ||
269 | LOG (GNUNET_ERROR_TYPE_ERROR, | 271 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
270 | "node ip: %s\n", | 272 | "node ip: %s\n", |
271 | node_ip); | 273 | node_ip); |
272 | 274 | ||