From ffa7a0ab292b190ed10cd54645593fe31c5796bc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Oct 2021 09:34:19 +0200 Subject: -fix FTBFS --- .../test_transport_plugin_cmd_simple_send.c | 7 ++-- .../test_transport_plugin_cmd_simple_send_v2.c | 7 ++-- .../test_transport_plugin_cmd_udp_backchannel.c | 7 ++-- src/transport/transport_api_cmd_connecting_peers.c | 18 +++++----- .../transport_api_cmd_connecting_peers_v2.c | 39 ++++++++++++---------- .../transport_api_cmd_connecting_peers_v3.c | 18 ++++++---- src/transport/transport_api_cmd_send_simple.c | 28 ++++++++-------- src/transport/transport_api_cmd_send_simple_v2.c | 28 ++++++++-------- src/transport/transport_api_cmd_start_peer.c | 23 ++++++------- src/transport/transport_api_cmd_start_peer_v2.c | 23 ++++++------- src/transport/transport_api_cmd_start_peer_v3.c | 23 ++++++------- src/transport/transport_api_cmd_stop_peer.c | 27 ++++++++------- 12 files changed, 129 insertions(+), 119 deletions(-) (limited to 'src') diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c index 07255a1a5..21167415d 100644 --- a/src/transport/test_transport_plugin_cmd_simple_send.c +++ b/src/transport/test_transport_plugin_cmd_simple_send.c @@ -183,9 +183,10 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip, write_message) }; - GNUNET_TESTING_run (NULL, - commands, - GNUNET_TIME_UNIT_FOREVER_REL); + GNUNET_TESTING_run (commands, + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, /* FIXME: will crash */ + NULL); } diff --git a/src/transport/test_transport_plugin_cmd_simple_send_v2.c b/src/transport/test_transport_plugin_cmd_simple_send_v2.c index c79b5c7e2..98e9d5fca 100644 --- a/src/transport/test_transport_plugin_cmd_simple_send_v2.c +++ b/src/transport/test_transport_plugin_cmd_simple_send_v2.c @@ -188,9 +188,10 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip, write_message) }; - GNUNET_TESTING_run (NULL, - commands, - GNUNET_TIME_UNIT_FOREVER_REL); + GNUNET_TESTING_run (commands, + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, /* FIXME: will crash */ + NULL); } diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/transport/test_transport_plugin_cmd_udp_backchannel.c index 90e474aea..6b0342e51 100644 --- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c +++ b/src/transport/test_transport_plugin_cmd_udp_backchannel.c @@ -192,9 +192,10 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip, write_message) }; - GNUNET_TESTING_run (NULL, - commands, - GNUNET_TIME_UNIT_FOREVER_REL); + GNUNET_TESTING_run (commands, + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, /* FIMXE: will crash */ + NULL); } diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c index 09ca9e54c..ddf1c3872 100644 --- a/src/transport/transport_api_cmd_connecting_peers.c +++ b/src/transport/transport_api_cmd_connecting_peers.c @@ -62,6 +62,8 @@ struct ConnectPeersState * */ struct GNUNET_PeerIdentity *id; + + struct GNUNET_TESTING_Interpreter *is; }; @@ -71,7 +73,6 @@ struct ConnectPeersState */ static void connect_peers_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct ConnectPeersState *cps = cls; @@ -96,7 +97,9 @@ connect_peers_run (void *cls, struct GNUNET_PeerIdentity *other = GNUNET_new (struct GNUNET_PeerIdentity); uint32_t num; - peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->start_peer_label); + cps->is = is; + peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + cps->start_peer_label); GNUNET_TRANSPORT_get_trait_application_handle (peer1_cmd, &ah); @@ -106,7 +109,8 @@ connect_peers_run (void *cls, GNUNET_TRANSPORT_get_trait_peer_id (peer1_cmd, &id); - system_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->create_label); + system_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + cps->create_label); GNUNET_TESTING_get_trait_test_system (system_cmd, &tl_system); @@ -116,8 +120,6 @@ connect_peers_run (void *cls, num = 2; - - // if (strstr (hello, "60002") != NULL) if (2 == num) { @@ -194,7 +196,8 @@ connect_peers_finish (void *cls, struct GNUNET_HashCode hc; int node_number; - peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->start_peer_label); + peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->is, + cps->start_peer_label); GNUNET_TRANSPORT_get_trait_connected_peers_map (peer1_cmd, &connected_peers_map); @@ -237,8 +240,7 @@ connect_peers_traits (void *cls, * */ static void -connect_peers_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +connect_peers_cleanup (void *cls) { struct ConnectPeersState *cps = cls; diff --git a/src/transport/transport_api_cmd_connecting_peers_v2.c b/src/transport/transport_api_cmd_connecting_peers_v2.c index 0d286b714..8ef556946 100644 --- a/src/transport/transport_api_cmd_connecting_peers_v2.c +++ b/src/transport/transport_api_cmd_connecting_peers_v2.c @@ -64,6 +64,8 @@ struct ConnectPeersState * */ struct GNUNET_PeerIdentity *id; + + struct GNUNET_TESTING_Interpreter *is; }; @@ -73,7 +75,6 @@ struct ConnectPeersState */ static void connect_peers_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct ConnectPeersState *cps = cls; @@ -91,11 +92,14 @@ connect_peers_run (void *cls, struct GNUNET_PeerIdentity *other = GNUNET_new (struct GNUNET_PeerIdentity); uint32_t num; - peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->start_peer_label); + cps->is = is; + peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + cps->start_peer_label); GNUNET_TRANSPORT_get_trait_application_handle_v2 (peer1_cmd, &ah); - system_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->create_label); + system_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + cps->create_label); GNUNET_TESTING_get_trait_test_system (system_cmd, &tl_system); @@ -155,7 +159,8 @@ connect_peers_finish (void *cls, struct GNUNET_HashCode hc; int node_number; - peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->start_peer_label); + peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->is, + cps->start_peer_label); GNUNET_TRANSPORT_get_trait_connected_peers_map_v2 (peer1_cmd, &connected_peers_map); @@ -198,8 +203,7 @@ connect_peers_traits (void *cls, * */ static void -connect_peers_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +connect_peers_cleanup (void *cls) { struct ConnectPeersState *cps = cls; @@ -228,15 +232,16 @@ GNUNET_TRANSPORT_cmd_connect_peers_v2 (const char *label, cps->num = num; cps->create_label = create_label; - - struct GNUNET_TESTING_Command cmd = { - .cls = cps, - .label = label, - .run = &connect_peers_run, - .finish = &connect_peers_finish, - .cleanup = &connect_peers_cleanup, - .traits = &connect_peers_traits - }; - - return cmd; + { + struct GNUNET_TESTING_Command cmd = { + .cls = cps, + .label = label, + .run = &connect_peers_run, + .finish = &connect_peers_finish, + .cleanup = &connect_peers_cleanup, + .traits = &connect_peers_traits + }; + + return cmd; + } } diff --git a/src/transport/transport_api_cmd_connecting_peers_v3.c b/src/transport/transport_api_cmd_connecting_peers_v3.c index e90781637..a73d81064 100644 --- a/src/transport/transport_api_cmd_connecting_peers_v3.c +++ b/src/transport/transport_api_cmd_connecting_peers_v3.c @@ -94,6 +94,8 @@ struct ConnectPeersState */ struct GNUNET_TESTING_NodeConnection *node_connections_head; + struct GNUNET_TESTING_Interpreter *is; + /** * Number of connections. */ @@ -264,6 +266,7 @@ calculate_num (struct GNUNET_TESTING_NodeConnection *node_connection, return num; } + static char * get_address (struct GNUNET_TESTING_NodeConnection *connection, char *prefix) @@ -323,7 +326,6 @@ get_address (struct GNUNET_TESTING_NodeConnection *connection, */ static void connect_peers_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct ConnectPeersState *cps = cls; @@ -341,11 +343,14 @@ connect_peers_run (void *cls, struct GNUNET_TESTING_ADDRESS_PREFIX *pos_prefix; unsigned int con_num = 0; - peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->start_peer_label); + cps->is = is; + peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + cps->start_peer_label); GNUNET_TRANSPORT_get_trait_application_handle_v2 (peer1_cmd, &ah); - system_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->create_label); + system_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + cps->create_label); GNUNET_TESTING_get_trait_test_system (system_cmd, &tl_system); @@ -410,7 +415,8 @@ connect_peers_finish (void *cls, struct GNUNET_TESTING_NodeConnection *pos_connection; unsigned int num; - peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->start_peer_label); + peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->is, + cps->start_peer_label); GNUNET_TRANSPORT_get_trait_connected_peers_map_v2 (peer1_cmd, &connected_peers_map); @@ -430,7 +436,6 @@ connect_peers_finish (void *cls, } - if (cps->con_num == con_num) { cont (cont_cls); @@ -461,8 +466,7 @@ connect_peers_traits (void *cls, * */ static void -connect_peers_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +connect_peers_cleanup (void *cls) { struct ConnectPeersState *cps = cls; diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/transport/transport_api_cmd_send_simple.c index f9e515c0f..1599dfe97 100644 --- a/src/transport/transport_api_cmd_send_simple.c +++ b/src/transport/transport_api_cmd_send_simple.c @@ -80,8 +80,7 @@ send_simple_traits (void *cls, * */ static void -send_simple_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +send_simple_cleanup (void *cls) { struct SendSimpleState *sss = cls; @@ -95,7 +94,6 @@ send_simple_cleanup (void *cls, */ static void send_simple_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct SendSimpleState *sss = cls; @@ -108,7 +106,8 @@ send_simple_run (void *cls, struct GNUNET_HashCode hc; int node_number; - peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (sss->start_peer_label); + peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + sss->start_peer_label); GNUNET_TRANSPORT_get_trait_connected_peers_map (peer1_cmd, &connected_peers_map); @@ -159,14 +158,15 @@ GNUNET_TRANSPORT_cmd_send_simple (const char *label, sss->n = n; sss->num = num; sss->start_peer_label = start_peer_label; - - struct GNUNET_TESTING_Command cmd = { - .cls = sss, - .label = label, - .run = &send_simple_run, - .cleanup = &send_simple_cleanup, - .traits = &send_simple_traits - }; - - return cmd; + { + struct GNUNET_TESTING_Command cmd = { + .cls = sss, + .label = label, + .run = &send_simple_run, + .cleanup = &send_simple_cleanup, + .traits = &send_simple_traits + }; + + return cmd; + } } diff --git a/src/transport/transport_api_cmd_send_simple_v2.c b/src/transport/transport_api_cmd_send_simple_v2.c index d43c0b425..8d65eb684 100644 --- a/src/transport/transport_api_cmd_send_simple_v2.c +++ b/src/transport/transport_api_cmd_send_simple_v2.c @@ -68,8 +68,7 @@ send_simple_traits (void *cls, * */ static void -send_simple_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +send_simple_cleanup (void *cls) { struct SendSimpleState *sss = cls; @@ -83,7 +82,6 @@ send_simple_cleanup (void *cls, */ static void send_simple_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct SendSimpleState *sss = cls; @@ -96,7 +94,8 @@ send_simple_run (void *cls, struct GNUNET_HashCode hc; int node_number; - peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (sss->start_peer_label); + peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + sss->start_peer_label); GNUNET_TRANSPORT_get_trait_connected_peers_map (peer1_cmd, &connected_peers_map); @@ -143,14 +142,15 @@ GNUNET_TRANSPORT_cmd_send_simple_v2 (const char *label, sss = GNUNET_new (struct SendSimpleState); sss->num = num; sss->start_peer_label = start_peer_label; - - struct GNUNET_TESTING_Command cmd = { - .cls = sss, - .label = label, - .run = &send_simple_run, - .cleanup = &send_simple_cleanup, - .traits = &send_simple_traits - }; - - return cmd; + { + struct GNUNET_TESTING_Command cmd = { + .cls = sss, + .label = label, + .run = &send_simple_run, + .cleanup = &send_simple_cleanup, + .traits = &send_simple_traits + }; + + return cmd; + } } diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c index f4e92944b..8a53ed22c 100644 --- a/src/transport/transport_api_cmd_start_peer.c +++ b/src/transport/transport_api_cmd_start_peer.c @@ -177,7 +177,6 @@ notify_connect (void *cls, */ static void start_peer_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct StartPeerState *sps = cls; @@ -195,7 +194,7 @@ start_peer_run (void *cls, LOG (GNUNET_ERROR_TYPE_ERROR, "File not found: `%s'\n", sps->cfgname); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -232,7 +231,8 @@ start_peer_run (void *cls, "UNIXPATH", communicator_unix_path); - system_cmd = GNUNET_TESTING_interpreter_lookup_command (sps->system_label); + system_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + sps->system_label); GNUNET_TESTING_get_trait_test_system (system_cmd, &tl_system); @@ -246,7 +246,7 @@ start_peer_run (void *cls, "Testing library failed to create unique configuration based on `%s'\n", sps->cfgname); GNUNET_CONFIGURATION_destroy (sps->cfg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -262,7 +262,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -272,7 +272,7 @@ start_peer_run (void *cls, "Testing library failed to create unique configuration based on `%s'\n", sps->cfgname); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -291,7 +291,7 @@ start_peer_run (void *cls, "Testing library failed to obtain peer identity for peer %u\n", sps->no); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } LOG (GNUNET_ERROR_TYPE_DEBUG, @@ -312,7 +312,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -324,7 +324,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -336,7 +336,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps); @@ -348,8 +348,7 @@ start_peer_run (void *cls, * */ static void -start_peer_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +start_peer_cleanup (void *cls) { struct StartPeerState *sps = cls; diff --git a/src/transport/transport_api_cmd_start_peer_v2.c b/src/transport/transport_api_cmd_start_peer_v2.c index 0e39bd915..2ab58574a 100644 --- a/src/transport/transport_api_cmd_start_peer_v2.c +++ b/src/transport/transport_api_cmd_start_peer_v2.c @@ -177,7 +177,6 @@ notify_connect (void *cls, */ static void start_peer_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct StartPeerState_v2 *sps = cls; @@ -195,7 +194,7 @@ start_peer_run (void *cls, LOG (GNUNET_ERROR_TYPE_ERROR, "File not found: `%s'\n", sps->cfgname); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -232,7 +231,8 @@ start_peer_run (void *cls, "UNIXPATH", communicator_unix_path); - system_cmd = GNUNET_TESTING_interpreter_lookup_command (sps->system_label); + system_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + sps->system_label); GNUNET_TESTING_get_trait_test_system (system_cmd, &tl_system); @@ -246,7 +246,7 @@ start_peer_run (void *cls, "Testing library failed to create unique configuration based on `%s'\n", sps->cfgname); GNUNET_CONFIGURATION_destroy (sps->cfg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -262,7 +262,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -272,7 +272,7 @@ start_peer_run (void *cls, "Testing library failed to create unique configuration based on `%s'\n", sps->cfgname); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -291,7 +291,7 @@ start_peer_run (void *cls, "Testing library failed to obtain peer identity for peer %u\n", sps->no); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } LOG (GNUNET_ERROR_TYPE_DEBUG, @@ -312,7 +312,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -324,7 +324,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -336,7 +336,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps); @@ -348,8 +348,7 @@ start_peer_run (void *cls, * */ static void -start_peer_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +start_peer_cleanup (void *cls) { struct StartPeerState_v2 *sps = cls; diff --git a/src/transport/transport_api_cmd_start_peer_v3.c b/src/transport/transport_api_cmd_start_peer_v3.c index b5cefecc8..fa6300ef5 100644 --- a/src/transport/transport_api_cmd_start_peer_v3.c +++ b/src/transport/transport_api_cmd_start_peer_v3.c @@ -175,7 +175,6 @@ notify_connect (void *cls, */ static void start_peer_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct StartPeerState_v2 *sps = cls; @@ -194,7 +193,7 @@ start_peer_run (void *cls, LOG (GNUNET_ERROR_TYPE_ERROR, "File not found: `%s'\n", sps->cfgname); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -244,7 +243,8 @@ start_peer_run (void *cls, "UNIXPATH", udp_communicator_unix_path); - system_cmd = GNUNET_TESTING_interpreter_lookup_command (sps->system_label); + system_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + sps->system_label); GNUNET_TESTING_get_trait_test_system (system_cmd, &tl_system); @@ -258,7 +258,7 @@ start_peer_run (void *cls, "Testing library failed to create unique configuration based on `%s'\n", sps->cfgname); GNUNET_CONFIGURATION_destroy (sps->cfg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -274,7 +274,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -284,7 +284,7 @@ start_peer_run (void *cls, "Testing library failed to create unique configuration based on `%s'\n", sps->cfgname); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -303,7 +303,7 @@ start_peer_run (void *cls, "Testing library failed to obtain peer identity for peer %u\n", sps->no); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } LOG (GNUNET_ERROR_TYPE_DEBUG, @@ -324,7 +324,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -336,7 +336,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } @@ -348,7 +348,7 @@ start_peer_run (void *cls, sps->cfgname, emsg); GNUNET_free (emsg); - GNUNET_TESTING_interpreter_fail (); + GNUNET_TESTING_interpreter_fail (is); return; } sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps); @@ -360,8 +360,7 @@ start_peer_run (void *cls, * */ static void -start_peer_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +start_peer_cleanup (void *cls) { struct StartPeerState_v2 *sps = cls; diff --git a/src/transport/transport_api_cmd_stop_peer.c b/src/transport/transport_api_cmd_stop_peer.c index 4d7228378..dcb982a65 100644 --- a/src/transport/transport_api_cmd_stop_peer.c +++ b/src/transport/transport_api_cmd_stop_peer.c @@ -54,14 +54,14 @@ struct StopPeerState */ static void stop_peer_run (void *cls, - const struct GNUNET_TESTING_Command *cmd, struct GNUNET_TESTING_Interpreter *is) { struct StopPeerState *stop_ps = cls; struct StartPeerState *sps; const struct GNUNET_TESTING_Command *start_cmd; - start_cmd = GNUNET_TESTING_interpreter_lookup_command (stop_ps->start_label); + start_cmd = GNUNET_TESTING_interpreter_lookup_command (is, + stop_ps->start_label); GNUNET_TRANSPORT_get_trait_state (start_cmd, &sps); @@ -112,8 +112,7 @@ stop_peer_run (void *cls, * */ static void -stop_peer_cleanup (void *cls, - const struct GNUNET_TESTING_Command *cmd) +stop_peer_cleanup (void *cls) { struct StopPeerState *sps = cls; @@ -150,14 +149,14 @@ GNUNET_TRANSPORT_cmd_stop_peer (const char *label, sps = GNUNET_new (struct StopPeerState); sps->start_label = start_label; - - struct GNUNET_TESTING_Command cmd = { - .cls = sps, - .label = label, - .run = &stop_peer_run, - .cleanup = &stop_peer_cleanup, - .traits = &stop_peer_traits - }; - - return cmd; + { + struct GNUNET_TESTING_Command cmd = { + .cls = sps, + .label = label, + .run = &stop_peer_run, + .cleanup = &stop_peer_cleanup, + .traits = &stop_peer_traits + }; + return cmd; + } } -- cgit v1.2.3