X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpeerinfo%2Ftest_peerinfo_api.c;h=e4eb7d4805de30a2a3adaa033679f46539ddc64e;hb=05b3870e5857f0f5e6d1f50bca6a941fe638701d;hp=e740f1fc912330d82f75d9695bc0b01481c1f664;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index e740f1fc9..e4eb7d480 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -45,18 +45,18 @@ static struct GNUNET_PEERINFO_Handle *h; static unsigned int retries; 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) + if (address != NULL) { - GNUNET_assert (0 == strcmp ("peerinfotest", tname)); - GNUNET_assert (0 == strncmp ("Address", addr, addrlen)); - (*agc) -= (1 << (addrlen - 1)); + 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; } @@ -67,13 +67,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; } @@ -91,15 +96,14 @@ 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, +process (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_HELLO_Message *hello, const char *err_msg) { int *ok = cls; @@ -119,11 +123,10 @@ process (void *cls, /* try again */ retries++; add_peer (); - ic = GNUNET_PEERINFO_iterate (h, - NULL, + ic = GNUNET_PEERINFO_iterate (h, NULL, GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 15), - &process, cls); + (GNUNET_TIME_UNIT_SECONDS, 15), &process, + cls); return; } GNUNET_assert (peer == NULL); @@ -145,16 +148,14 @@ process (void *cls, static void -run (void *cls, - char *const *args, - const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) +run (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *c) { cfg = c; h = GNUNET_PEERINFO_connect (cfg); GNUNET_assert (h != NULL); add_peer (); - ic = GNUNET_PEERINFO_iterate (h, - NULL, + ic = GNUNET_PEERINFO_iterate (h, NULL, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15), &process, cls); } @@ -177,15 +178,16 @@ check () struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; - proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo", - "gnunet-service-peerinfo", + proc = + GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-peerinfo", + "gnunet-service-peerinfo", #if DEBUG_PEERINFO - "-L", "DEBUG", + "-L", "DEBUG", #endif - "-c", "test_peerinfo_api_data.conf", NULL); + "-c", "test_peerinfo_api_data.conf", NULL); GNUNET_assert (NULL != proc); - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, - argv, "test-peerinfo-api", "nohelp", options, &run, &ok); + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, + "test-peerinfo-api", "nohelp", options, &run, &ok); if (0 != GNUNET_OS_process_kill (proc, SIGTERM)) { GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");