From c0b81510ffe194dc662c3a6267d5e66a69873c4b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 9 Jul 2016 22:34:49 +0000 Subject: -start to refactor testcases for sanity --- .../test_transport_api_manipulation_cfg.c | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/transport/test_transport_api_manipulation_cfg.c') diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c index fe3d31f7b..a6dc08429 100644 --- a/src/transport/test_transport_api_manipulation_cfg.c +++ b/src/transport/test_transport_api_manipulation_cfg.c @@ -71,15 +71,15 @@ static struct GNUNET_SCHEDULER_Task * die_task; static struct GNUNET_SCHEDULER_Task * send_task; -static struct PeerContext *p1; +static struct GNUNET_TRANSPORT_TESTING_PeerContext *p1; -static struct PeerContext *p2; +static struct GNUNET_TRANSPORT_TESTING_PeerContext *p2; static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc; static struct GNUNET_TRANSPORT_TransmitHandle *th; -static struct GNUNET_TRANSPORT_TESTING_handle *tth; +static struct GNUNET_TRANSPORT_TESTING_Handle *tth; static char *cfg_file_p1; @@ -103,8 +103,8 @@ end () GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); th = NULL; - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); + GNUNET_TRANSPORT_TESTING_stop_peer (p1); + GNUNET_TRANSPORT_TESTING_stop_peer (p2); } @@ -122,7 +122,7 @@ end_badly (void *cls) if (cc != NULL) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n")); - GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); + GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc); cc = NULL; } @@ -149,11 +149,11 @@ end_badly (void *cls) th = NULL; if (p1 != NULL) - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); + GNUNET_TRANSPORT_TESTING_stop_peer (p1); else GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 1 was not started\n")); if (p2 != NULL) - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); + GNUNET_TRANSPORT_TESTING_stop_peer (p2); else GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 2 was not started\n")); @@ -164,7 +164,7 @@ end_badly (void *cls) static size_t notify_request_ready (void *cls, size_t size, void *buf) { - struct PeerContext *p = cls; + struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; struct GNUNET_MessageHeader *hdr; th = NULL; @@ -225,7 +225,7 @@ sendtask_request_task (void *cls) static size_t notify_response_ready (void *cls, size_t size, void *buf) { - struct PeerContext *p = cls; + struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; struct GNUNET_MessageHeader *hdr; th = NULL; @@ -296,8 +296,8 @@ static void notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message) { - struct PeerContext *p = cls; - struct PeerContext *t = NULL; + struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; + struct GNUNET_TRANSPORT_TESTING_PeerContext *t = NULL; struct GNUNET_TIME_Relative duration; if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) @@ -369,8 +369,8 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) static int c; c++; - struct PeerContext *p = cls; - struct PeerContext *t = NULL; + struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; + struct GNUNET_TRANSPORT_TESTING_PeerContext *t = NULL; if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) t = p1; @@ -390,7 +390,7 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) static void notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) { - struct PeerContext *p = cls; + struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -406,7 +406,7 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) static void -testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) +testing_connect_cb (void *cls) { cc = NULL; char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); @@ -421,7 +421,7 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) static void -start_cb (struct PeerContext *p, void *cls) +start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p, void *cls) { static int started; started++; @@ -440,7 +440,7 @@ start_cb (struct PeerContext *p, void *cls) p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id)); GNUNET_free (sender_c); - cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, + cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL); } @@ -503,18 +503,18 @@ main (int argc, char *argv[]) { int ret; - GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); - GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); - GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source, - &test_plugin); + test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv[0]); + test_source = GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__); + test_plugin = GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], + test_source); GNUNET_log_setup (test_name, "WARNING", NULL); tth = GNUNET_TRANSPORT_TESTING_init (); - GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); - GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); + cfg_file_p1 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 1); + cfg_file_p2 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 2); ret = check (); -- cgit v1.2.3