X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Ftest_core_quota_compliance.c;h=4dee958f2db0d6586b2b2b7a4df99da0e9bcea1c;hb=7b00dd51218edbd9182caa664cfce185edc2cc45;hp=a0c456cef8282ecad10f4d81dd0ebb83cb2ea184;hpb=b2bdeca1c78a40abb2f2295c48a31f92e6e32ec0;p=oweals%2Fgnunet.git diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index a0c456cef..4dee958f2 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2009, 2010, 2015 GNUnet e.V. + Copyright (C) 2009, 2010, 2015, 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 @@ -20,6 +20,7 @@ /** * @file core/test_core_quota_compliance.c * @brief testcase for core_api.c focusing quota compliance on core level + * @author Christian Grothoff */ #include "platform.h" #include "gnunet_arm_service.h" @@ -27,6 +28,7 @@ #include "gnunet_util_lib.h" #include "gnunet_ats_service.h" #include "gnunet_transport_service.h" +#include "gnunet_transport_hello_service.h" #include "gnunet_statistics_service.h" @@ -52,7 +54,7 @@ #define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150) #define MTYPE 12345 -#define MESSAGESIZE 1024 +#define MESSAGESIZE (1024 - 8) #define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) static unsigned long long total_bytes_sent; @@ -69,12 +71,12 @@ struct PeerContext { struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CORE_Handle *ch; - struct GNUNET_CORE_TransmitHandle *nth; + struct GNUNET_MQ_Handle *mq; struct GNUNET_TRANSPORT_OfferHelloHandle *oh; struct GNUNET_PeerIdentity id; struct GNUNET_MessageHeader *hello; struct GNUNET_STATISTICS_Handle *stats; - struct GNUNET_TRANSPORT_GetHelloHandle *ghh; + struct GNUNET_TRANSPORT_HelloGetHandle *ghh; struct GNUNET_ATS_ConnectivityHandle *ats; struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh; int connect_status; @@ -105,26 +107,22 @@ static int running; struct TestMessage { struct GNUNET_MessageHeader header; - uint32_t num; + uint32_t num GNUNET_PACKED; + uint8_t pad[MESSAGESIZE]; }; static void terminate_peer (struct PeerContext *p) { - if (p->nth != NULL) - { - GNUNET_CORE_notify_transmit_ready_cancel (p->nth); - p->nth = NULL; - } if (NULL != p->ch) { - GNUNET_CORE_disconnect (p->ch); + GNUNET_CORE_disconnecT (p->ch); p->ch = NULL; } if (NULL != p->ghh) { - GNUNET_TRANSPORT_get_hello_cancel (p->ghh); + GNUNET_TRANSPORT_hello_get_cancel (p->ghh); p->ghh = NULL; } if (NULL != p->oh) @@ -156,9 +154,18 @@ terminate_peer (struct PeerContext *p) static void -terminate_task (void *cls) +shutdown_task (void *cls) { - err_task = NULL; + if (NULL != err_task) + { + GNUNET_SCHEDULER_cancel (err_task); + err_task = NULL; + } + if (NULL != measure_task) + { + GNUNET_SCHEDULER_cancel (measure_task); + measure_task = NULL; + } terminate_peer (&p1); terminate_peer (&p2); } @@ -169,15 +176,8 @@ terminate_task_error (void *cls) { err_task = NULL; GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Testcase failed!\n"); - terminate_peer (&p1); - terminate_peer (&p2); - //GNUNET_break (0); - if (NULL != measure_task) - { - GNUNET_SCHEDULER_cancel (measure_task); - measure_task = NULL; - } + "Testcase failed (timeout)!\n"); + GNUNET_SCHEDULER_shutdown (); ok = 42; } @@ -245,37 +245,63 @@ measurement_stop (void *cls) ok = 1; /* fail */ else ok = 0; /* pass */ - GNUNET_STATISTICS_get (p1.stats, "core", "# discarded CORE_SEND requests", - NULL, &print_stat, &p1); - - GNUNET_STATISTICS_get (p1.stats, "core", + GNUNET_STATISTICS_get (p1.stats, + "core", + "# discarded CORE_SEND requests", + NULL, + &print_stat, + &p1); + GNUNET_STATISTICS_get (p1.stats, + "core", "# discarded CORE_SEND request bytes", - NULL, &print_stat, &p1); - GNUNET_STATISTICS_get (p1.stats, "core", + NULL, + &print_stat, + &p1); + GNUNET_STATISTICS_get (p1.stats, + "core", "# discarded lower priority CORE_SEND requests", - NULL, &print_stat, NULL); - GNUNET_STATISTICS_get (p1.stats, "core", + NULL, + &print_stat, + NULL); + GNUNET_STATISTICS_get (p1.stats, + "core", "# discarded lower priority CORE_SEND request bytes", - NULL, &print_stat, &p1); - GNUNET_STATISTICS_get (p2.stats, "core", "# discarded CORE_SEND requests", - NULL, &print_stat, &p2); - - GNUNET_STATISTICS_get (p2.stats, "core", + NULL, + &print_stat, + &p1); + GNUNET_STATISTICS_get (p2.stats, + "core", + "# discarded CORE_SEND requests", + NULL, + &print_stat, + &p2); + + GNUNET_STATISTICS_get (p2.stats, + "core", "# discarded CORE_SEND request bytes", - NULL, &print_stat, &p2); - GNUNET_STATISTICS_get (p2.stats, "core", + NULL, + &print_stat, + &p2); + GNUNET_STATISTICS_get (p2.stats, + "core", "# discarded lower priority CORE_SEND requests", - NULL, &print_stat, &p2); - GNUNET_STATISTICS_get (p2.stats, "core", + NULL, + &print_stat, + &p2); + GNUNET_STATISTICS_get (p2.stats, + "core", "# discarded lower priority CORE_SEND request bytes", - NULL, &print_stat, &p2); + NULL, + &print_stat, + &p2); if (ok != 0) kind = GNUNET_ERROR_TYPE_ERROR; switch (test) { case SYMMETRIC: - GNUNET_log (kind, "Core quota compliance test with symmetric quotas: %s\n", + GNUNET_log (kind, + "Core quota compliance test with symmetric quotas: %s\n", (0 == ok) ? "PASSED" : "FAILED"); break; case ASYMMETRIC_SEND_LIMITED: @@ -289,118 +315,104 @@ measurement_stop (void *cls) (0 == ok) ? "PASSED" : "FAILED"); break; }; - GNUNET_log (kind, "Peer 1 send rate: %llu b/s (%llu bytes in %llu ms)\n", - throughput_out, total_bytes_sent, delta); - GNUNET_log (kind, "Peer 1 send quota: %llu b/s\n", current_quota_p1_out); - GNUNET_log (kind, "Peer 2 receive rate: %llu b/s (%llu bytes in %llu ms)\n", - throughput_in, total_bytes_recv, delta); - GNUNET_log (kind, "Peer 2 receive quota: %llu b/s\n", current_quota_p2_in); + GNUNET_log (kind, + "Peer 1 send rate: %llu b/s (%llu bytes in %llu ms)\n", + throughput_out, + total_bytes_sent, + delta); + GNUNET_log (kind, + "Peer 1 send quota: %llu b/s\n", + current_quota_p1_out); + GNUNET_log (kind, + "Peer 2 receive rate: %llu b/s (%llu bytes in %llu ms)\n", + throughput_in, + total_bytes_recv, + delta); + GNUNET_log (kind, + "Peer 2 receive quota: %llu b/s\n", + current_quota_p2_in); /* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. inbound quota allowed: %llu b/s\n",max_quota_in ); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. outbound quota allowed: %llu b/s\n",max_quota_out); */ - GNUNET_SCHEDULER_cancel (err_task); - err_task = GNUNET_SCHEDULER_add_now (&terminate_task, NULL); + GNUNET_SCHEDULER_shutdown (); } -static size_t -transmit_ready (void *cls, size_t size, void *buf) +static void +do_transmit (void *cls) { - char *cbuf = buf; - struct TestMessage hdr; - unsigned int ret; - - p1.nth = NULL; - GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE); - if (buf == NULL) - { - if ((p1.ch != NULL) && (p1.connect_status == 1)) - GNUNET_break (NULL != - (p1.nth = - GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, - GNUNET_CORE_PRIO_BEST_EFFORT, - FAST_TIMEOUT, &p2.id, - MESSAGESIZE, - &transmit_ready, &p1))); - return 0; - } - GNUNET_assert (tr_n < TOTAL_MSGS); - ret = 0; - GNUNET_assert (size >= MESSAGESIZE); - GNUNET_assert (buf != NULL); - cbuf = buf; - do - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending message %u of size %u at offset %u\n", tr_n, - MESSAGESIZE, ret); - hdr.header.size = htons (MESSAGESIZE); - hdr.header.type = htons (MTYPE); - hdr.num = htonl (tr_n); - GNUNET_memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage)); - ret += sizeof (struct TestMessage); - memset (&cbuf[ret], tr_n, MESSAGESIZE - sizeof (struct TestMessage)); - ret += MESSAGESIZE - sizeof (struct TestMessage); - tr_n++; - if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16)) - break; /* sometimes pack buffer full, sometimes not */ - } - while (size - ret >= MESSAGESIZE); + struct TestMessage *hdr; + struct GNUNET_MQ_Envelope *env; + + env = GNUNET_MQ_msg (hdr, + MTYPE); + hdr->num = htonl (tr_n); + memset (&hdr->pad, + tr_n, + MESSAGESIZE); + tr_n++; GNUNET_SCHEDULER_cancel (err_task); err_task = - GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); - - total_bytes_sent += ret; - return ret; + GNUNET_SCHEDULER_add_delayed (TIMEOUT, + &terminate_task_error, + NULL); + total_bytes_sent += sizeof (struct TestMessage); + GNUNET_MQ_send (p1.mq, + env); } -static void -connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) +static void * +connect_notify (void *cls, + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_MQ_Handle *mq) { struct PeerContext *pc = cls; - if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity))) - return; /* loopback */ - GNUNET_assert (pc->connect_status == 0); + if (0 == memcmp (&pc->id, + peer, + sizeof (struct GNUNET_PeerIdentity))) + return NULL; /* loopback */ + GNUNET_assert (0 == pc->connect_status); pc->connect_status = 1; + pc->mq = mq; if (pc == &p1) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Encrypted connection established to peer `%4s'\n", + "Encrypted connection established to peer `%s'\n", GNUNET_i2s (peer)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking core (1) for transmission to peer `%4s'\n", + "Asking core (1) for transmission to peer `%s'\n", GNUNET_i2s (&p2.id)); GNUNET_SCHEDULER_cancel (err_task); err_task = - GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); + GNUNET_SCHEDULER_add_delayed (TIMEOUT, + &terminate_task_error, + NULL); start_time = GNUNET_TIME_absolute_get (); running = GNUNET_YES; measure_task = - GNUNET_SCHEDULER_add_delayed (MEASUREMENT_LENGTH, &measurement_stop, + GNUNET_SCHEDULER_add_delayed (MEASUREMENT_LENGTH, + &measurement_stop, NULL); - - GNUNET_break (NULL != - (p1.nth = - GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, - GNUNET_CORE_PRIO_BEST_EFFORT, - TIMEOUT, &p2.id, - MESSAGESIZE, - &transmit_ready, &p1))); + do_transmit (NULL); } + return pc; } static void -disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) +disconnect_notify (void *cls, + const struct GNUNET_PeerIdentity *peer, + void *internal_cls) { struct PeerContext *pc = cls; - if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity))) + if (NULL == internal_cls) return; /* loopback */ pc->connect_status = 0; + pc->mq = NULL; if (NULL != measure_task) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -408,107 +420,58 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) GNUNET_SCHEDULER_cancel (measure_task); measure_task = NULL; } - if (pc->nth != NULL) - { - GNUNET_CORE_notify_transmit_ready_cancel (pc->nth); - pc->nth = NULL; - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted connection to `%4s' cut\n", - GNUNET_i2s (peer)); -} - - -static int -inbound_notify (void *cls, - const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message) -{ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Core provides inbound data from `%4s' %u.\n", - GNUNET_i2s (other), - (unsigned int) ntohs (message->size)); - total_bytes_recv += ntohs (message->size); - return GNUNET_OK; -} - - -static int -outbound_notify (void *cls, - const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message) -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Core notifies about outbound data for `%4s'.\n", - GNUNET_i2s (other)); - return GNUNET_OK; + "Encrypted connection to `%s' cut\n", + GNUNET_i2s (peer)); } -static size_t -transmit_ready (void *cls, size_t size, void *buf); - -static int -process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message) +static void +handle_test (void *cls, + const struct TestMessage *hdr) { static int n; - const struct TestMessage *hdr; - hdr = (const struct TestMessage *) message; - if (MTYPE != ntohs (message->type)) - return GNUNET_SYSERR; - if (ntohs (message->size) != MESSAGESIZE) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Expected message %u of size %u, got %u bytes of message %u\n", - n, MESSAGESIZE, ntohs (message->size), ntohl (hdr->num)); - GNUNET_SCHEDULER_cancel (err_task); - err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL); - return GNUNET_SYSERR; - } + total_bytes_recv += sizeof (struct TestMessage); if (ntohl (hdr->num) != n) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Expected message %u of size %u, got %u bytes of message %u\n", - n, MESSAGESIZE, ntohs (message->size), ntohl (hdr->num)); + "Expected message %u, got message %u\n", + n, + ntohl (hdr->num)); GNUNET_SCHEDULER_cancel (err_task); - err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL); - return GNUNET_SYSERR; + err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, + NULL); + return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n", - ntohl (hdr->num), ntohs (message->size)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got message %u\n", + ntohl (hdr->num)); n++; if (0 == (n % 10)) FPRINTF (stderr, "%s", "."); - - if (running == GNUNET_YES) - GNUNET_break (NULL != - GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, - GNUNET_CORE_PRIO_BEST_EFFORT, - FAST_TIMEOUT, &p2.id, - MESSAGESIZE, - &transmit_ready, &p1)); - return GNUNET_OK; + if (GNUNET_YES == running) + do_transmit (NULL); } -static struct GNUNET_CORE_MessageHandler handlers[] = { - {&process_mtype, MTYPE, 0}, - {NULL, 0, 0} -}; - - - static void init_notify (void *cls, const struct GNUNET_PeerIdentity *my_identity) { struct PeerContext *p = cls; + struct GNUNET_MQ_MessageHandler handlers[] = { + GNUNET_MQ_hd_fixed_size (test, + MTYPE, + struct TestMessage, + NULL), + GNUNET_MQ_handler_end () + }; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Connection to CORE service of `%4s' established\n", + "Connection to CORE service of `%s' established\n", GNUNET_i2s (my_identity)); GNUNET_assert (NULL != my_identity); p->id = *my_identity; @@ -517,10 +480,12 @@ init_notify (void *cls, GNUNET_assert (ok == 2); OKPP; /* connect p2 */ - p2.ch = - GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify, - &disconnect_notify, &inbound_notify, GNUNET_YES, - &outbound_notify, GNUNET_YES, handlers); + p2.ch = GNUNET_CORE_connecT (p2.cfg, + &p2, + &init_notify, + &connect_notify, + &disconnect_notify, + handlers); } else { @@ -550,31 +515,38 @@ offer_hello_done (void *cls) static void -process_hello (void *cls, const struct GNUNET_MessageHeader *message) +process_hello (void *cls, + const struct GNUNET_MessageHeader *message) { struct PeerContext *p = cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received (my) `%s' from transport service\n", "HELLO"); + "Received (my) HELLO from transport service\n"); GNUNET_assert (message != NULL); p->hello = GNUNET_malloc (ntohs (message->size)); GNUNET_memcpy (p->hello, message, ntohs (message->size)); - if ((p == &p1) && (NULL == p2.oh)) + if ( (p == &p1) && + (NULL == p2.oh) ) p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg, message, &offer_hello_done, &p2); - if ((p == &p2) && (NULL == p1.oh)) + if ( (p == &p2) && + (NULL == p1.oh) ) p1.oh = GNUNET_TRANSPORT_offer_hello (p1.cfg, message, &offer_hello_done, &p1); - if ((p == &p1) && (p2.hello != NULL) && (NULL == p1.oh)) + if ( (p == &p1) && + (NULL != p2.hello) && + (NULL == p1.oh) ) p1.oh = GNUNET_TRANSPORT_offer_hello (p1.cfg, p2.hello, &offer_hello_done, &p1); - if ((p == &p2) && (p1.hello != NULL) && (NULL == p2.oh) ) + if ( (p == &p2) && + (NULL != p1.hello) && + (NULL == p2.oh) ) p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg, p1.hello, &offer_hello_done, @@ -583,85 +555,126 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) 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, + 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->stats = GNUNET_STATISTICS_create ("core", p->cfg); - GNUNET_assert (p->stats != NULL); + "-c", + cfgname, + NULL); + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_load (p->cfg, + cfgname)); + p->stats = GNUNET_STATISTICS_create ("core", + p->cfg); + GNUNET_assert (NULL != p->stats); p->ats = GNUNET_ATS_connectivity_init (p->cfg); GNUNET_assert (NULL != p->ats); - p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg, &process_hello, p); + p->ghh = GNUNET_TRANSPORT_hello_get (p->cfg, + GNUNET_TRANSPORT_AC_ANY, + &process_hello, + p); GNUNET_free (binary); } 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) { + struct GNUNET_MQ_MessageHandler handlers[] = { + GNUNET_MQ_hd_fixed_size (test, + MTYPE, + struct TestMessage, + NULL), + GNUNET_MQ_handler_end () + }; + GNUNET_assert (ok == 1); OKPP; err_task = - GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); + GNUNET_SCHEDULER_add_delayed (TIMEOUT, + &terminate_task_error, + NULL); + GNUNET_SCHEDULER_add_shutdown (&shutdown_task, + NULL); if (test == SYMMETRIC) { - setup_peer (&p1, "test_core_quota_peer1.conf"); - setup_peer (&p2, "test_core_quota_peer2.conf"); + setup_peer (&p1, + "test_core_quota_peer1.conf"); + setup_peer (&p2, + "test_core_quota_peer2.conf"); } else if (test == ASYMMETRIC_SEND_LIMITED) { - setup_peer (&p1, "test_core_quota_asymmetric_send_limit_peer1.conf"); - setup_peer (&p2, "test_core_quota_asymmetric_send_limit_peer2.conf"); + setup_peer (&p1, + "test_core_quota_asymmetric_send_limit_peer1.conf"); + setup_peer (&p2, + "test_core_quota_asymmetric_send_limit_peer2.conf"); } else if (test == ASYMMETRIC_RECV_LIMITED) { - setup_peer (&p1, "test_core_quota_asymmetric_recv_limited_peer1.conf"); - setup_peer (&p2, "test_core_quota_asymmetric_recv_limited_peer2.conf"); + setup_peer (&p1, + "test_core_quota_asymmetric_recv_limited_peer1.conf"); + setup_peer (&p2, + "test_core_quota_asymmetric_recv_limited_peer2.conf"); } GNUNET_assert (test != -1); GNUNET_assert (GNUNET_SYSERR != - GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", + GNUNET_CONFIGURATION_get_value_size (p1.cfg, + "ATS", "WAN_QUOTA_IN", ¤t_quota_p1_in)); GNUNET_assert (GNUNET_SYSERR != - GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", + GNUNET_CONFIGURATION_get_value_size (p2.cfg, + "ATS", "WAN_QUOTA_IN", ¤t_quota_p2_in)); GNUNET_assert (GNUNET_SYSERR != - GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", + GNUNET_CONFIGURATION_get_value_size (p1.cfg, + "ATS", "WAN_QUOTA_OUT", ¤t_quota_p1_out)); GNUNET_assert (GNUNET_SYSERR != - GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", + GNUNET_CONFIGURATION_get_value_size (p2.cfg, + "ATS", "WAN_QUOTA_OUT", ¤t_quota_p2_out)); - p1.ch = - GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify, - &disconnect_notify, &inbound_notify, GNUNET_YES, - &outbound_notify, GNUNET_YES, handlers); + p1.ch = GNUNET_CORE_connecT (p1.cfg, + &p1, + &init_notify, + &connect_notify, + &disconnect_notify, + handlers); } static void stop_arm (struct PeerContext *p) { - 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", + 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; @@ -672,7 +685,8 @@ stop_arm (struct PeerContext *p) static int check () { - char *const argv[] = { "test-core-quota-compliance", + char *const argv[] = { + "test-core-quota-compliance", "-c", "test_core_api_data.conf", NULL @@ -681,8 +695,12 @@ check () GNUNET_GETOPT_OPTION_END }; ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-core-quota-compliance", "nohelp", options, &run, + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, + "test-core-quota-compliance", + "nohelp", + options, + &run, &ok); stop_arm (&p1); stop_arm (&p2); @@ -690,69 +708,61 @@ check () } -int -main (int argc, char *argv[]) +static void +cleanup_directory (int test) { - int ret; - - test = -1; - if (strstr (argv[0], "_symmetric") != NULL) - { - test = SYMMETRIC; - } - else if (strstr (argv[0], "_asymmetric_send") != NULL) - { - test = ASYMMETRIC_SEND_LIMITED; - } - else if (strstr (argv[0], "_asymmetric_recv") != NULL) - { - test = ASYMMETRIC_RECV_LIMITED; - } - GNUNET_assert (test != -1); - if (test == SYMMETRIC) - { + switch (test) { + case SYMMETRIC: GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/"); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/"); - } - else if (test == ASYMMETRIC_SEND_LIMITED) - { + break; + case ASYMMETRIC_SEND_LIMITED: GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/"); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/"); - } - else if (test == ASYMMETRIC_RECV_LIMITED) - { + break; + case ASYMMETRIC_RECV_LIMITED: GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/"); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/"); + break; } +} - GNUNET_log_setup ("test-core-quota-compliance", - "WARNING", - NULL); - ret = check (); - if (test == SYMMETRIC) + +int +main (int argc, + char *argv[]) +{ + int ret; + + test = -1; + if (NULL != strstr (argv[0], + "_symmetric")) { - GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/"); - GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/"); + test = SYMMETRIC; } - else if (test == ASYMMETRIC_SEND_LIMITED) + else if (NULL != strstr (argv[0], + "_asymmetric_send")) { - GNUNET_DISK_directory_remove - ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/"); - GNUNET_DISK_directory_remove - ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/"); + test = ASYMMETRIC_SEND_LIMITED; } - else if (test == ASYMMETRIC_RECV_LIMITED) + else if (NULL != strstr (argv[0], + "_asymmetric_recv")) { - GNUNET_DISK_directory_remove - ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/"); - GNUNET_DISK_directory_remove - ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/"); + test = ASYMMETRIC_RECV_LIMITED; } + GNUNET_assert (test != -1); + cleanup_directory (test); + GNUNET_log_setup ("test-core-quota-compliance", + "WARNING", + NULL); + ret = check (); + cleanup_directory (test); return ret; } + /* end of test_core_quota_compliance.c */