From: Christian Grothoff Date: Fri, 29 Jul 2016 19:18:54 +0000 (+0000) Subject: convert tests to new transport API X-Git-Tag: initial-import-from-subversion-38251~473 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=905713e8a7392c78dbd3ef89e40b5c6281afd4c5;p=oweals%2Fgnunet.git convert tests to new transport API --- diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index 57fc54f4a..31ce5bf62 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am @@ -59,15 +59,20 @@ check_PROGRAMS = \ test_gnunet_daemon_hostlist \ test_gnunet_daemon_hostlist_reconnect \ test_gnunet_daemon_hostlist_learning +else +if HAVE_LIBCURL +check_PROGRAMS = \ + test_gnunet_daemon_hostlist \ + test_gnunet_daemon_hostlist_reconnect \ + test_gnunet_daemon_hostlist_learning +endif +endif if HAVE_MHD if ENABLE_TEST_RUN AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ - test_gnunet_daemon_hostlist \ - test_gnunet_daemon_hostlist_reconnect \ - test_gnunet_daemon_hostlist_learning -endif + $(check_PROGRAMS) endif endif diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index 6a5850c4d..9a1e6d3d7 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - Copyright (C) 2009 GNUnet e.V. + Copyright (C) 2009, 2016 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -26,6 +26,7 @@ #include "gnunet_util_lib.h" #include "gnunet_arm_service.h" #include "gnunet_transport_service.h" +#include "gnunet_transport_core_service.h" /** @@ -40,7 +41,7 @@ static struct GNUNET_SCHEDULER_Task *timeout_task; struct PeerContext { struct GNUNET_CONFIGURATION_Handle *cfg; - struct GNUNET_TRANSPORT_Handle *th; + struct GNUNET_TRANSPORT_CoreHandle *th; struct GNUNET_MessageHeader *hello; struct GNUNET_TRANSPORT_GetHelloHandle *ghh; struct GNUNET_OS_Process *arm_proc; @@ -54,29 +55,30 @@ static struct PeerContext p2; static void clean_up (void *cls) { - if (p1.th != NULL) + if (NULL != p1.th) { - if (p1.ghh != NULL) + if (NULL != p1.ghh) { GNUNET_TRANSPORT_get_hello_cancel (p1.ghh); p1.ghh = NULL; } - GNUNET_TRANSPORT_disconnect (p1.th); + GNUNET_TRANSPORT_core_disconnect (p1.th); p1.th = NULL; } - if (p2.th != NULL) + if (NULL != p2.th) { - if (p2.ghh != NULL) + if (NULL != p2.ghh) { GNUNET_TRANSPORT_get_hello_cancel (p2.ghh); p2.ghh = NULL; } - GNUNET_TRANSPORT_disconnect (p2.th); + GNUNET_TRANSPORT_core_disconnect (p2.th); p2.th = NULL; } GNUNET_SCHEDULER_shutdown (); } + /** * Timeout, give up. */ @@ -96,24 +98,24 @@ timeout_error (void *cls) * * @param cls closure * @param peer the peer that connected - * @param latency current latency of the connection - * @param distance in overlay hops, as given by transport plugin + * @param mq message queue to send messages to the peer */ -static void +static void * notify_connect (void *cls, - const struct GNUNET_PeerIdentity *peer) + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_MQ_Handle *mq) { - if (peer == NULL) - return; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected, shutting down.\n"); ok = 0; - if (timeout_task != NULL) + if (NULL != timeout_task) { GNUNET_SCHEDULER_cancel (timeout_task); timeout_task = NULL; } - GNUNET_SCHEDULER_add_now (&clean_up, NULL); + GNUNET_SCHEDULER_add_now (&clean_up, + NULL); + return NULL; } @@ -131,23 +133,38 @@ process_hello (void *cls, static void -setup_peer (struct PeerContext *p, const char *cfgname) +setup_peer (struct PeerContext *p, + const char *cfgname) { char *binary; binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); p->cfg = GNUNET_CONFIGURATION_create (); p->arm_proc = - GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, - NULL, NULL, NULL, + GNUNET_OS_start_process (GNUNET_YES, + GNUNET_OS_INHERIT_STD_OUT_AND_ERR, + NULL, + NULL, + NULL, binary, "gnunet-service-arm", - "-c", cfgname, NULL); - GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); - p->th = - GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, ¬ify_connect, NULL); + "-c", + cfgname, + NULL); + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_load (p->cfg, + cfgname)); + p->th = GNUNET_TRANSPORT_core_connect (p->cfg, + NULL, + NULL, + p, + ¬ify_connect, + NULL, + NULL); GNUNET_assert (p->th != NULL); - p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg, &process_hello, p); + p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg, + &process_hello, + p); GNUNET_free (binary); } @@ -157,12 +174,18 @@ waitpid_task (void *cls) { struct PeerContext *p = cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n"); - if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Killing ARM process.\n"); + if (0 != GNUNET_OS_process_kill (p->arm_proc, + GNUNET_TERM_SIG)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "kill"); + if (GNUNET_OK != + GNUNET_OS_process_wait (p->arm_proc)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "waitpid"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; @@ -176,7 +199,8 @@ stop_arm (struct PeerContext *p) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking ARM to stop core service\n"); GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &waitpid_task, p); + &waitpid_task, + p); } @@ -204,15 +228,18 @@ run (void *cls, NULL); GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); - setup_peer (&p1, "test_gnunet_daemon_hostlist_peer1.conf"); - setup_peer (&p2, "test_gnunet_daemon_hostlist_peer2.conf"); + setup_peer (&p1, + "test_gnunet_daemon_hostlist_peer1.conf"); + setup_peer (&p2, + "test_gnunet_daemon_hostlist_peer2.conf"); } static int check () { - char *const argv[] = { "test-gnunet-daemon-hostlist", + char *const argv[] = { + "test-gnunet-daemon-hostlist", "-c", "test_gnunet_daemon_hostlist_data.conf", NULL }; @@ -220,8 +247,12 @@ check () GNUNET_GETOPT_OPTION_END }; ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-gnunet-daemon-hostlist", "nohelp", options, &run, + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, + "test-gnunet-daemon-hostlist", + "nohelp", + options, + &run, &ok); return ok; } diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index 30f26717f..e0c193ed3 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - Copyright (C) 2010 GNUnet e.V. + Copyright (C) 2010, 2016 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -19,14 +19,14 @@ */ /** * @file hostlist/test_gnunet_daemon_hostlist_reconnect.c - * @brief test for gnunet_daemon_hostslist.c; tries to re-start the peers + * @brief test for gnunet-daemon-hostslist.c; tries to re-start the peers * and connect a second time * @author Christian Grothoff */ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_arm_service.h" -#include "gnunet_transport_service.h" +#include "gnunet_transport_core_service.h" /** * How long until we give up on transmitting the message? @@ -35,12 +35,12 @@ static int ok; -static struct GNUNET_SCHEDULER_Task * timeout_task; +static struct GNUNET_SCHEDULER_Task *timeout_task; struct PeerContext { struct GNUNET_CONFIGURATION_Handle *cfg; - struct GNUNET_TRANSPORT_Handle *th; + struct GNUNET_TRANSPORT_CoreHandle *th; struct GNUNET_MessageHeader *hello; struct GNUNET_TRANSPORT_GetHelloHandle *ghh; struct GNUNET_OS_Process *arm_proc; @@ -70,19 +70,19 @@ timeout_error (void *cls) * * @param cls closure * @param peer the peer that connected - * @param latency current latency of the connection - * @param distance in overlay hops, as given by transport plugin + * @param mq message queue to send to @a peer + * @return NULL */ static void notify_connect (void *cls, - const struct GNUNET_PeerIdentity *peer) + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_MQ_Handle *mq) { - if (peer == NULL) - return; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected, shutting down.\n"); ok = 0; GNUNET_SCHEDULER_shutdown (); + return NULL; } @@ -100,23 +100,38 @@ process_hello (void *cls, static void -setup_peer (struct PeerContext *p, const char *cfgname) +setup_peer (struct PeerContext *p, + const char *cfgname) { char *binary; binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); p->cfg = GNUNET_CONFIGURATION_create (); p->arm_proc = - GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, - NULL, NULL, NULL, + GNUNET_OS_start_process (GNUNET_YES, + GNUNET_OS_INHERIT_STD_OUT_AND_ERR, + NULL, + NULL, + NULL, binary, "gnunet-service-arm", - "-c", cfgname, NULL); - GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); - p->th = - GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, ¬ify_connect, NULL); - GNUNET_assert (p->th != NULL); - p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg, &process_hello, p); + "-c", + cfgname, + NULL); + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_load (p->cfg, + cfgname)); + p->th = GNUNET_TRANSPORT_core_connect (p->cfg, + NULL, + NULL, + p, + ¬ify_connect, + NULL, + NULL); + GNUNET_assert (NULL != p->th); + p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg, + &process_hello, + p); GNUNET_free (binary); } @@ -126,12 +141,18 @@ waitpid_task (void *cls) { struct PeerContext *p = cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n"); - if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Killing ARM process.\n"); + if (0 != GNUNET_OS_process_kill (p->arm_proc, + GNUNET_TERM_SIG)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "kill"); + if (GNUNET_OK != + GNUNET_OS_process_wait (p->arm_proc)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "waitpid"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; @@ -142,9 +163,11 @@ waitpid_task (void *cls) static void stop_arm (struct PeerContext *p) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking ARM to stop core service\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Asking ARM to stop core service\n"); GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &waitpid_task, p); + &waitpid_task, + p); } @@ -164,9 +187,9 @@ shutdown_task (void *cls) GNUNET_TRANSPORT_get_hello_cancel (p1.ghh); p1.ghh = NULL; } - if (p1.th != NULL) + if (NULL != p1.th) { - GNUNET_TRANSPORT_disconnect (p1.th); + GNUNET_TRANSPORT_core_disconnect (p1.th); p1.th = NULL; } if (NULL != p2.ghh) @@ -174,9 +197,9 @@ shutdown_task (void *cls) GNUNET_TRANSPORT_get_hello_cancel (p2.ghh); p2.ghh = NULL; } - if (p2.th != NULL) + if (NULL != p2.th) { - GNUNET_TRANSPORT_disconnect (p2.th); + GNUNET_TRANSPORT_core_disconnect (p2.th); p2.th = NULL; } stop_arm (&p1); @@ -185,22 +208,28 @@ shutdown_task (void *cls) static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { GNUNET_assert (ok == 1); ok++; timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, - &timeout_error, NULL); + &timeout_error, + NULL); GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); - setup_peer (&p1, "test_gnunet_daemon_hostlist_peer1.conf"); - setup_peer (&p2, "test_gnunet_daemon_hostlist_peer2.conf"); + setup_peer (&p1, + "test_gnunet_daemon_hostlist_peer1.conf"); + setup_peer (&p2, + "test_gnunet_daemon_hostlist_peer2.conf"); } int -main (int argcx, char *argvx[]) +main (int argcx, + char *argvx[]) { static char *const argv[] = { "test-gnunet-daemon-hostlist", @@ -218,18 +247,28 @@ main (int argcx, char *argvx[]) "WARNING", NULL); ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-gnunet-daemon-hostlist", "nohelp", options, &run, + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, + "test-gnunet-daemon-hostlist", + "nohelp", + options, + &run, &ok); if (0 == ok) { FPRINTF (stderr, "%s", "."); /* now do it again */ ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-gnunet-daemon-hostlist", "nohelp", options, &run, + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, + "test-gnunet-daemon-hostlist", + "nohelp", + options, + &run, &ok); - FPRINTF (stderr, "%s", ".\n"); + FPRINTF (stderr, + "%s", + ".\n"); } GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1"); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");