X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Ftest_ats_api_scheduling_add_address.c;h=21bf14102b998983229baf3c6ab4366c8f216372;hb=46a1afa089ec0cd8086f37afdb4ef5afe21b6330;hp=77f0c3a7ba4e97aaddafa3464cc706e7d54d518e;hpb=7e6034e0de1f0d3202774781cd502256acbaacd9;p=oweals%2Fgnunet.git diff --git a/src/ats/test_ats_api_scheduling_add_address.c b/src/ats/test_ats_api_scheduling_add_address.c index 77f0c3a7b..21bf14102 100644 --- a/src/ats/test_ats_api_scheduling_add_address.c +++ b/src/ats/test_ats_api_scheduling_add_address.c @@ -19,18 +19,20 @@ */ /** * @file ats/test_ats_api_scheduling_add_address.c - * @brief test adding addresses in automatic transport selection scheduling API + * @brief adding addresses with scheduling API * @author Christian Grothoff * @author Matthias Wachs */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" static GNUNET_SCHEDULER_TaskIdentifier die_task; +struct GNUNET_STATISTICS_Handle *stats; + /** * Scheduling handle */ @@ -51,49 +53,80 @@ static struct Test_Address test_addr; */ static struct PeerContext p; +/** + * HELLO address + */ +struct GNUNET_HELLO_Address test_hello_address; -static void -create_test_address (struct Test_Address *dest, char * plugin, void *session, void *addr, size_t addrlen) -{ - dest->plugin = GNUNET_strdup (plugin); - dest->session = session; - dest->addr = GNUNET_malloc (addrlen); - memcpy (dest->addr, addr, addrlen); - dest->addr_len = addrlen; -} +/** + * Session + */ +static void *test_session; -static void -free_test_address (struct Test_Address *dest) -{ - GNUNET_free (dest->plugin); - GNUNET_free (dest->addr); -} +/** + * Test ats info + */ +struct GNUNET_ATS_Information test_ats_info[2]; +/** + * Test ats count + */ +uint32_t test_ats_count; -static void -end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) + +static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); + +static int +stat_cb(void *cls, const char *subsystem, + const char *name, uint64_t value, + int is_persistent) { - die_task = GNUNET_SCHEDULER_NO_TASK; - if (sched_ats != NULL) - GNUNET_ATS_scheduling_done (sched_ats); - free_test_address (&test_addr); - ret = GNUNET_SYSERR; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n", + subsystem,name, value); + if (1 == value) + { + GNUNET_SCHEDULER_add_now (&end, NULL); + } + return GNUNET_OK; } static void -end () +end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n"); + if (die_task != GNUNET_SCHEDULER_NO_TASK) { GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_NO_TASK; } - GNUNET_ATS_scheduling_done (sched_ats); - sched_ats = NULL; + + if (NULL != sched_ats) + { + GNUNET_ATS_scheduling_done (sched_ats); + sched_ats = NULL; + } + + GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL); + if (NULL != stats) + { + GNUNET_STATISTICS_destroy (stats, GNUNET_NO); + stats = NULL; + } + free_test_address (&test_addr); + + ret = 0; +} + +static void +end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + die_task = GNUNET_SCHEDULER_NO_TASK; + end ( NULL, NULL); + ret = GNUNET_SYSERR; } static void @@ -104,45 +137,19 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, const struct GNUNET_ATS_Information *atsi, uint32_t ats_count) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", GNUNET_i2s_full(&address->peer)); - if (0 != memcmp (&address->peer, &p.id, sizeof (struct GNUNET_PeerIdentity))) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid peer id'\n"); - ret = 1; - } - else if (0 != strcmp (address->transport_name, test_addr.plugin)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid plugin'\n"); - ret = 1; - } - else if (address->address_length != test_addr.addr_len) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address length'\n"); - ret = 1; - } - else if (0 != memcmp (address->address, test_addr.plugin, address->address_length)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address'\n"); - ret = 1; - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for correct address `%s'\n", - GNUNET_i2s (&address->peer)); - ret = 0; - } - GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); - GNUNET_SCHEDULER_add_now (&end, NULL); } + static void run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) { - struct GNUNET_HELLO_Address hello_address; die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); + stats = GNUNET_STATISTICS_create ("ats", cfg); + GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL); + /* Connect to ATS scheduling */ sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL); @@ -150,39 +157,47 @@ run (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n"); ret = 1; - end (); + GNUNET_SCHEDULER_add_now (&end, NULL); return; } /* Set up peer */ - if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID, &p.id.hashPubKey)) + if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, &p.id.hashPubKey)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n"); ret = GNUNET_SYSERR; - end (); + GNUNET_SCHEDULER_add_now (&end, NULL); return; } - - GNUNET_assert (0 == strcmp (PEERID, GNUNET_i2s_full (&p.id))); + GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id))); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", GNUNET_i2s_full(&p.id)); - create_test_address (&test_addr, "test", &test_addr, "test", strlen ("test") + 1); - /* Adding address without session */ - hello_address.peer = p.id; - hello_address.transport_name = test_addr.plugin; - hello_address.address = test_addr.addr; - hello_address.address_length = test_addr.addr_len; - GNUNET_ATS_address_add (sched_ats, &hello_address, test_addr.session, NULL, 0); + /* Prepare ATS Information */ + test_ats_info[0].type = htonl (GNUNET_ATS_NETWORK_TYPE); + test_ats_info[0].value = htonl(GNUNET_ATS_NET_WAN); + test_ats_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE); + test_ats_info[1].value = htonl(1); + test_ats_count = 2; - GNUNET_ATS_suggest_address (sched_ats, &p.id); + /* Adding address without session */ + test_session = NULL; + create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1); + test_hello_address.peer = p.id; + test_hello_address.transport_name = test_addr.plugin; + test_hello_address.address = test_addr.addr; + test_hello_address.address_length = test_addr.addr_len; + + /* Adding address */ + GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, test_ats_count); } int main (int argc, char *argv[]) { + ret = 0; if (0 != GNUNET_TESTING_peer_run ("test_ats_api_scheduling_add_address", "test_ats_api.conf", &run, NULL))