X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpeerinfo%2Ftest_peerinfo_api.c;h=a00f13f743a12f49be0dfeb36e338e7aea3430a1;hb=9e44a0d455ddf7d5f8e2a2a36776e6dfd627e265;hp=ad93f706d7327b90856edb735317a42c9ab55415;hpb=aec543b2999864b89edb9ffa1d45fbdbf187fb4c;p=oweals%2Fgnunet.git diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index ad93f706d..a00f13f74 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -4,7 +4,7 @@ GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your + by the Free Software Foundation; either version 3, or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but @@ -26,40 +26,36 @@ * TODO: * - test merging of HELLOs (add same peer twice...) */ - #include "platform.h" #include "gnunet_hello_lib.h" -#include "gnunet_getopt_lib.h" -#include "gnunet_os_lib.h" +#include "gnunet_util_lib.h" #include "gnunet_peerinfo_service.h" -#include "gnunet_program_lib.h" -#include "gnunet_time_lib.h" +#include "gnunet_testing_lib-new.h" #include "peerinfo.h" -static struct GNUNET_SCHEDULER_Handle *sched; - -static const struct GNUNET_CONFIGURATION_Handle *cfg; - static struct GNUNET_PEERINFO_IteratorContext *ic; static struct GNUNET_PEERINFO_Handle *h; static unsigned int retries; +static int global_ret; + + static int -check_it (void *cls, - const char *tname, - struct GNUNET_TIME_Absolute expiration, - const void *addr, uint16_t addrlen) +check_it (void *cls, const struct GNUNET_HELLO_Address *address, + struct GNUNET_TIME_Absolute expiration) { unsigned int *agc = cls; - if (addrlen > 0) - { - GNUNET_assert (0 == strcmp ("peerinfotest", tname)); - GNUNET_assert (0 == strncmp ("Address", addr, addrlen)); - (*agc) -= (1 << (addrlen - 1)); - } + if (address != NULL) + { + GNUNET_assert (0 == strcmp ("peerinfotest", address->transport_name)); + GNUNET_assert (0 == + strncmp ("Address", address->address, + address->address_length)); + (*agc) -= (1 << (address->address_length - 1)); + } return GNUNET_OK; } @@ -69,13 +65,18 @@ address_generator (void *cls, size_t max, void *buf) { size_t *agc = cls; size_t ret; + struct GNUNET_HELLO_Address address; if (0 == *agc) return 0; - ret = GNUNET_HELLO_add_address ("peerinfotest", - GNUNET_TIME_relative_to_absolute - (GNUNET_TIME_UNIT_HOURS), "Address", *agc, - buf, max); + memset (&address.peer, 0, sizeof (struct GNUNET_PeerIdentity)); + address.address = "Address"; + address.transport_name = "peerinfotest"; + address.address_length = *agc; + ret = + GNUNET_HELLO_add_address (&address, + GNUNET_TIME_relative_to_absolute + (GNUNET_TIME_UNIT_HOURS), buf, max); (*agc)--; return ret; } @@ -93,126 +94,80 @@ add_peer () memset (&pkey, 32, sizeof (pkey)); GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey); h2 = GNUNET_HELLO_create (&pkey, &address_generator, &agc); - GNUNET_PEERINFO_add_peer (h, h2); + GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL); GNUNET_free (h2); } static void -process (void *cls, - const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_HELLO_Message *hello, uint32_t trust) +process (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_HELLO_Message *hello, const char *err_msg) { - int *ok = cls; unsigned int agc; + if (err_msg != NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Error in communication with PEERINFO service\n")); + } + if (peer == NULL) + { + ic = NULL; + if ((3 == global_ret) && (retries < 50)) { - ic = NULL; - if ( (3 == *ok) && - (retries < 50) ) - { - /* try again */ - retries++; - add_peer (); - ic = GNUNET_PEERINFO_iterate (h, - NULL, - 0, - GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 15), - &process, cls); - return; - } - GNUNET_assert (peer == NULL); - GNUNET_assert (2 == *ok); - GNUNET_assert (trust == 0); - GNUNET_PEERINFO_disconnect (h); - h = NULL; - *ok = 0; + /* try again */ + retries++; + add_peer (); + ic = GNUNET_PEERINFO_iterate (h, NULL, + GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 15), &process, + cls); return; } + GNUNET_assert (peer == NULL); + GNUNET_assert (2 == global_ret); + GNUNET_PEERINFO_disconnect (h); + h = NULL; + global_ret = 0; + return; + } if (hello != NULL) - { - GNUNET_assert (3 == *ok); - agc = 3; - GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_it, &agc); - GNUNET_assert (agc == 0); - *ok = 2; - } + { + GNUNET_assert (3 == global_ret); + agc = 3; + GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_it, &agc); + GNUNET_assert (agc == 0); + global_ret = 2; + } } static void -run (void *cls, - struct GNUNET_SCHEDULER_Handle *s, - char *const *args, - const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *c) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { - sched = s; - cfg = c; - h = GNUNET_PEERINFO_connect (sched, cfg); + h = GNUNET_PEERINFO_connect (cfg); + GNUNET_assert (NULL != h); add_peer (); - ic = GNUNET_PEERINFO_iterate (h, - NULL, - 0, - GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 15), - &process, cls); -} - - -static int -check () -{ - int ok = 3; - pid_t pid; - char *const argv[] = { "test-peerinfo-api", - "-c", - "test_peerinfo_api_data.conf", -#if DEBUG_PEERINFO - "-L", "DEBUG", -#endif - NULL - }; - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo", - "gnunet-service-peerinfo", -#if DEBUG_PEERINFO - "-L", "DEBUG", -#endif - "-c", "test_peerinfo_api_data.conf", NULL); - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, - argv, "test-peerinfo-api", "nohelp", - options, &run, &ok); - if (0 != PLIBC_KILL (pid, SIGTERM)) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - ok = 1; - } - GNUNET_OS_process_wait(pid); - return ok; + ic = GNUNET_PEERINFO_iterate (h, NULL, + GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 15), &process, cls); } int main (int argc, char *argv[]) { - int ret = 0; - - GNUNET_log_setup ("test_peerinfo_api", -#if DEBUG_PEERINFO - "DEBUG", -#else - "WARNING", -#endif - NULL); - ret = check (); - GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-peerinfo"); - return ret; + global_ret = 3; + if (0 != GNUNET_TESTING_service_run ("test-gnunet-peerinfo", + "peerinfo", + "test_peerinfo_api_data.conf", + &run, NULL)) + return 1; + return global_ret; } /* end of test_peerinfo_api.c */