X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_quota_compliance.c;h=211e64e32beffa8f6739a945527b51735edf9b65;hb=4bd01d03e323377bbbd7609e29d8179bcb682deb;hp=7d28820cbdd6d429780a7c5ab28080b9a6bdd0e9;hpb=83b19539f4d322b43683f5838b72e9ec2c8e6073;p=oweals%2Fgnunet.git diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 7d28820cb..211e64e32 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors) + Copyright (C) 2009, 2010, 2011, 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 @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** * @file transport/test_quota_compliance.c @@ -24,629 +24,295 @@ * This test case tests quota compliance both on transport level */ #include "platform.h" -#include "gnunet_common.h" -#include "gnunet_hello_lib.h" -#include "gnunet_getopt_lib.h" -#include "gnunet_os_lib.h" -#include "gnunet_program_lib.h" -#include "gnunet_scheduler_lib.h" -#include "gnunet_server_lib.h" #include "gnunet_transport_service.h" +#include "gnunet_ats_service.h" #include "gauger.h" -#include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO - -#define VERBOSE_ARM GNUNET_EXTRA_LOGGING - -#define START_ARM GNUNET_YES - /** * Testcase timeout */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) - -/** - * How long until we give up on transmitting the message? - */ -#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20) - -#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) - -static char *test_source; - -static char *test_plugin; - -static char *test_name; - -static int ok; - -static GNUNET_SCHEDULER_TaskIdentifier die_task; +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 480) -static GNUNET_SCHEDULER_TaskIdentifier measure_task; +#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 80) -struct PeerContext *p1; -struct PeerContext *p2; +static struct GNUNET_SCHEDULER_Task *measure_task; -struct PeerContext *sender; +static char *gen_cfgs[2]; -struct PeerContext *receiver; +static unsigned long long quota_in[] = { 10000, 10000 }; -struct GNUNET_TRANSPORT_TransmitHandle *th; +static unsigned long long quota_out[] = { 10000, 10000 }; -char *cfg_file_p1; -char *gen_cfg_p2; -unsigned long long quota_in_p1; -unsigned long long quota_out_p1; +static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc; -char *cfg_file_p2; -char *gen_cfg_p1; -unsigned long long quota_in_p2; -unsigned long long quota_out_p2; - -struct GNUNET_TRANSPORT_TESTING_handle *tth; - -static GNUNET_TRANSPORT_TESTING_ConnectRequest cc; - - -/* - * Testcase specific declarations - */ /** * Note that this value must not significantly exceed * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise * messages may be dropped even for a reliable transport. */ -#define TOTAL_MSGS (1024 * 2) - -#define MTYPE 12345 - -struct TestMessage -{ - struct GNUNET_MessageHeader header; - uint32_t num; -}; - -static int msg_scheduled; -static int msg_sent; -static int msg_recv_expected; -static int msg_recv; - -static int test_failed; -static int test_connected; +#define TOTAL_MSGS (1024 * 32) -static unsigned long long total_bytes_sent; +static unsigned long long total_bytes_recv; static struct GNUNET_TIME_Absolute start_time; -/* - * END Testcase specific declarations - */ - -#if VERBOSE -#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) -#else -#define OKPP do { ok++; } while (0) -#endif - static void -end () +report () { unsigned long long delta; unsigned long long datarate; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); - - delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; - datarate = (total_bytes_sent * 1000) / delta; - - fprintf (stderr, "Throughput was %llu b/s\n", datarate); - - test_failed = GNUNET_NO; - if (datarate > quota_in_p2) + delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us; + datarate = (total_bytes_recv * 1000 * 1000) / delta; + + FPRINTF (stderr, + "Throughput was %llu b/s\n", + datarate); + ccc->global_ret = GNUNET_OK; + if (datarate > 1.1 * quota_in[1]) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Datarate of %llu b/s higher than allowed inbound quota of %llu b/s\n", - datarate, quota_in_p2); - test_failed = GNUNET_YES; + "Datarate of %llu b/s significantly higher than allowed inbound quota of %llu b/s\n", + datarate, + quota_in[1]); + ccc->global_ret = GNUNET_SYSERR; } - if (datarate > quota_out_p1) + if (datarate > 1.1 * quota_out[0]) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Datarate of %llu b/s higher than allowed outbound quota of %llu b/s\n", - datarate, quota_out_p1); - test_failed = GNUNET_YES; + "Datarate of %llu b/s significantly higher than allowed outbound quota of %llu b/s\n", + datarate, + quota_out[0]); + ccc->global_ret = GNUNET_SYSERR; } - if (test_failed == GNUNET_NO) + if (GNUNET_OK == ccc->global_ret) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Datarate of %llu b/s complied to allowed outbound quota of %llu b/s and inbound quota of %llu b/s\n", - datarate, quota_out_p1, quota_in_p2); + datarate, + quota_out[0], + quota_in[1]); } - - if (die_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (die_task); - - if (th != NULL) - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; - - if (cc != NULL) - GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); - - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); - -} - -static void -end_badly () -{ - die_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); - - if (measure_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (measure_task); - - if (test_connected == GNUNET_YES) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n"); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got NOT connected\n"); - - if (th != NULL) - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; - - if (cc != NULL) - GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); - - if (p1 != NULL) - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); - if (p2 != NULL) - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); - - ok = GNUNET_SYSERR; -} - - -static unsigned int -get_size (unsigned int iter) -{ - unsigned int ret; - - ret = (iter * iter * iter); - return sizeof (struct TestMessage) + (ret % 60000); } static void -notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message, - const struct GNUNET_ATS_Information *ats, uint32_t ats_count) +custom_shutdown (void *cls) { - static int n; - unsigned int s; - char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1]; - const struct TestMessage *hdr; - - hdr = (const struct TestMessage *) message; - s = get_size (n); - if (MTYPE != ntohs (message->type)) - return; - msg_recv_expected = n; - msg_recv = ntohl (hdr->num); - if (ntohs (message->size) != (s)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Expected message %u of size %u, got %u bytes of message %u\n", - n, s, ntohs (message->size), ntohl (hdr->num)); - if (die_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (die_task); - test_failed = GNUNET_YES; - die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); - return; - } - 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, s, ntohs (message->size), ntohl (hdr->num)); - if (die_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (die_task); - test_failed = GNUNET_YES; - die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); - return; - } - memset (cbuf, n, s - sizeof (struct TestMessage)); - if (0 != memcmp (cbuf, &hdr[1], s - sizeof (struct TestMessage))) + if (NULL != measure_task) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Expected message %u with bits %u, but body did not match\n", n, - (unsigned char) n); - if (die_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (die_task); - test_failed = GNUNET_YES; - die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); - return; - } -#if VERBOSE - if (ntohl (hdr->num) % 5000 == 0) - { - struct PeerContext *p = cls; - char *ps = strdup (GNUNET_i2s (&p->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer %u (`%s') got message %u of size %u from peer (`%s')\n", - p->no, ps, ntohl (hdr->num), ntohs (message->size), - GNUNET_i2s (peer)); - GNUNET_free (ps); + GNUNET_SCHEDULER_cancel (measure_task); + measure_task = NULL; } -#endif - n++; + report (); } static size_t -notify_ready (void *cls, size_t size, void *buf) +get_size (unsigned int iter) { - static int n; - char *cbuf = buf; - struct TestMessage hdr; - unsigned int s; - unsigned int ret; - - th = NULL; - if (buf == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Timeout occurred while waiting for transmit_ready for message %u of %u\n", - msg_scheduled, TOTAL_MSGS); - if (GNUNET_SCHEDULER_NO_TASK != die_task) - GNUNET_SCHEDULER_cancel (die_task); - die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); - ok = 42; - return 0; - } - - ret = 0; - s = get_size (n); - GNUNET_assert (size >= s); - GNUNET_assert (buf != NULL); - cbuf = buf; - do - { - hdr.header.size = htons (s); - hdr.header.type = htons (MTYPE); - hdr.num = htonl (n); - msg_sent = n; - memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage)); - ret += sizeof (struct TestMessage); - memset (&cbuf[ret], n, s - sizeof (struct TestMessage)); - ret += s - sizeof (struct TestMessage); -#if VERBOSE - if (n % 5000 == 0) - { + size_t ret; - char *receiver_s = strdup (GNUNET_i2s (&receiver->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending message of size %u from peer %u (`%4s') -> peer %u (`%s') !\n", - n, sender->no, GNUNET_i2s (&sender->id), receiver->no, - receiver_s); - GNUNET_free (receiver_s); - } -#endif - n++; - s = get_size (n); - if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16)) - break; /* sometimes pack buffer full, sometimes not */ - } - while (size - ret >= s); - if (n < TOTAL_MSGS) - { - if (th == NULL) - th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0, - TIMEOUT_TRANSMIT, - ¬ify_ready, NULL); - msg_scheduled = n; - } - if (n % 5000 == 0) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Returning total message block of size %u\n", ret); - } - total_bytes_sent += ret; - if (n == TOTAL_MSGS) - { - fprintf (stderr, "\n"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All messages sent\n"); - } + ret = (iter * iter * iter) % 60000; + ret += sizeof (struct GNUNET_TRANSPORT_TESTING_TestMessage); return ret; } static void -notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_ATS_Information *ats, uint32_t ats_count) +notify_receive (void *cls, + struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver, + const struct GNUNET_PeerIdentity *sender, + const struct GNUNET_TRANSPORT_TESTING_TestMessage *hdr) { - struct PeerContext *p = cls; - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') connected to us!\n", - p->no, GNUNET_i2s (peer)); -} - - -static void -notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) -{ - struct PeerContext *p = cls; - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') disconnected!\n", p->no, - GNUNET_i2s (peer)); - if (th != NULL) - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; + if (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (hdr->header.type)) + return; + total_bytes_recv += ntohs (hdr->header.size); -} + { + char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id)); -static void -sendtask () -{ - start_time = GNUNET_TIME_absolute_get (); - th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0), 0, - TIMEOUT_TRANSMIT, ¬ify_ready, - NULL); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Peer %u (`%s') got message %u of size %u from peer (`%s')\n", + receiver->no, + ps, + ntohl (hdr->num), + ntohs (hdr->header.size), + GNUNET_i2s (sender)); + GNUNET_free (ps); + } } static void -measure (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +measure (void *cls) { static int counter; - measure_task = GNUNET_SCHEDULER_NO_TASK; - + measure_task = NULL; counter++; - if ((DURATION.rel_value / 1000) < counter) + if ((DURATION.rel_value_us / 1000 / 1000LL) < counter) { - fprintf (stderr, ".\n"); - GNUNET_SCHEDULER_add_now (&end, NULL); - } - else - { - fprintf (stderr, "."); - measure_task = - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &measure, NULL); + FPRINTF (stderr, "%s", ".\n"); + GNUNET_SCHEDULER_shutdown (); + return; } + FPRINTF (stderr, "%s", "."); + measure_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, + &measure, + NULL); } static void -testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) +start_task (void *cls) { - char *p1_c = strdup (GNUNET_i2s (&p1->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %u (%s) <-> %u (%s)\n", - p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id)); - GNUNET_free (p1_c); - - cc = NULL; - test_connected = GNUNET_YES; - - measure_task = - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &measure, NULL); - GNUNET_SCHEDULER_add_now (&sendtask, NULL); - -} - -void -start_cb (struct PeerContext *p, void *cls) -{ - static int started; - - started++; - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no, - GNUNET_i2s (&p->id)); - - if (started != 2) - return; - - test_connected = GNUNET_NO; - - sender = p2; - receiver = p1; - - char *sender_c = strdup (GNUNET_i2s (&sender->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Test tries to send from %u (%s) -> peer %u (%s)\n", sender->no, - sender_c, receiver->no, GNUNET_i2s (&receiver->id)); + static struct GNUNET_TRANSPORT_TESTING_SendClosure sc = { + .num_messages = TOTAL_MSGS, + .get_size_cb = &get_size + }; - cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, + sc.ccc = ccc; + measure_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, + &measure, NULL); - + start_time = GNUNET_TIME_absolute_get (); + GNUNET_SCHEDULER_add_now (&GNUNET_TRANSPORT_TESTING_simple_send, + &sc); } + static char * -generate_config (char *cfg_file, unsigned long long quota_in, +generate_config (const char *cfg_file, + unsigned long long quota_in, unsigned long long quota_out) { + char *in_name; + char *out_name; char *fname = NULL; struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create (); - GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (cfg, cfg_file)); - GNUNET_asprintf (&fname, "q_in_%llu_q_out_%llu_%s", quota_in, quota_out, + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_load (cfg, + cfg_file)); + GNUNET_asprintf (&fname, + "q_in_%llu_q_out_%llu_%s", + quota_in, + quota_out, cfg_file); - GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", fname); - GNUNET_CONFIGURATION_set_value_number (cfg, "core", "TOTAL_QUOTA_OUT", - quota_out); - GNUNET_CONFIGURATION_set_value_number (cfg, "core", "TOTAL_QUOTA_IN", - quota_in); - GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_QUOTA_IN", - quota_in); - GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_QUOTA_OUT", - quota_out); - GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname)); + GNUNET_CONFIGURATION_set_value_string (cfg, + "PATHS", + "DEFAULTCONFIG", + fname); + for (int c = 0; c < GNUNET_ATS_NetworkTypeCount; c++) + { + GNUNET_asprintf (&in_name, + "%s_QUOTA_IN", + GNUNET_ATS_print_network_type (c)); + GNUNET_asprintf (&out_name, + "%s_QUOTA_OUT", + GNUNET_ATS_print_network_type (c)); + GNUNET_CONFIGURATION_set_value_number (cfg, + "ats", + in_name, + quota_in); + GNUNET_CONFIGURATION_set_value_number (cfg, + "ats", + out_name, + quota_out); + GNUNET_free (in_name); + GNUNET_free (out_name); + } + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_write (cfg, + fname)); GNUNET_CONFIGURATION_destroy (cfg); return fname; } -static void -run_measurement (unsigned long long p1_quota_in, - unsigned long long p1_quota_out, - unsigned long long p2_quota_in, - unsigned long long p2_quota_out) -{ - die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); - - /* setting ATS quota */ - quota_out_p1 = p1_quota_out; - gen_cfg_p1 = generate_config (cfg_file_p1, p1_quota_in, p1_quota_out); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Generated config file `%s'\n", - gen_cfg_p1); - - quota_in_p2 = p2_quota_in; - gen_cfg_p2 = generate_config (cfg_file_p2, p2_quota_in, p2_quota_out); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Generated config file `%s'\n", - gen_cfg_p2); - p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p1, 1, ¬ify_receive, - ¬ify_connect, ¬ify_disconnect, - &start_cb, NULL); - - p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p2, 2, ¬ify_receive, - ¬ify_connect, ¬ify_disconnect, - &start_cb, NULL); - - if ((p1 == NULL) || (p2 == NULL)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); - if (die_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (die_task); - die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); - return; - } -} - -static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) +static int +check (void *cls, + struct GNUNET_TRANSPORT_TESTING_Handle *tth_, + const char *test_plugin_, + const char *test_name_, + unsigned int num_peers, + char *cfg_files[]) { - unsigned long long p1_quota_in = 10000; - unsigned long long p1_quota_out = 10000; - unsigned long long p2_quota_in = 10000; - unsigned long long p2_quota_out = 10000; + struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = { + .connect_continuation = &start_task, + .config_file = "test_quota_compliance_data.conf", + .rec = ¬ify_receive, + .nc = &GNUNET_TRANSPORT_TESTING_log_connect, + .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect, + .shutdown_task = &custom_shutdown, + .timeout = TIMEOUT + }; + ccc = &my_ccc; - if (NULL != strstr (test_name, "asymmetric")) + if (NULL != strstr (test_name_, + "asymmetric")) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Running asymmetric test with sending peer unlimited, receiving peer (in/out): %llu/%llu b/s \n", - p2_quota_in, p2_quota_out); - p1_quota_out = 1024 * 1024 * 1024; - p1_quota_in = 1024 * 1024 * 1024; + quota_in[1], + quota_out[1]); + quota_out[0] = 1024 * 1024 * 1024; + quota_in[0] = 1024 * 1024 * 1024; } else { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Running symmetric test with (in/out) %llu/%llu b/s \n", - p2_quota_in, p2_quota_out); + quota_in[1], + quota_out[1]); } - run_measurement (p1_quota_in, p1_quota_out, p2_quota_in, p2_quota_out); -} - -static int -check () -{ - static char *argv[] = { "test_transport-quota-compliance", - "-c", - "", -#if VERBOSE - "-L", "DEBUG", -#endif - NULL - }; - static struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - - ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, - "nohelp", options, &run, &ok); - - return ok; -} - -int -main (int argc, char *argv[]) -{ - int nat_res; - - tth = GNUNET_TRANSPORT_TESTING_init (); - - GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); - GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source, - &test_plugin); - GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); - - GNUNET_log_setup (test_name, -#if VERBOSE - "DEBUG", -#else - "WARNING", -#endif - NULL); - - if ((strcmp (test_plugin, "tcp_nat") == 0) || - (strcmp (test_plugin, "udp_nat") == 0)) + for (unsigned int i=0;i<2;i++) { - nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); - if (GNUNET_NO == nat_res) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", - "gnunet-nat-server", "SUID not set"); - return 0; - } - if (GNUNET_SYSERR == nat_res) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", - "gnunet-nat-server", "file not found"); - return 0; - } + gen_cfgs[i] = generate_config (cfg_files[i], + quota_in[i], + quota_out[i]); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Generated config file `%s'\n", + gen_cfgs[i]); } - GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); - GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); - - check (); + return GNUNET_TRANSPORT_TESTING_connect_check (&my_ccc, + tth_, + test_plugin_, + test_name_, + num_peers, + gen_cfgs); +} - GNUNET_free (cfg_file_p1); - GNUNET_free (cfg_file_p2); - if (GNUNET_YES == GNUNET_DISK_file_test (gen_cfg_p1)) +int +main (int argc, + char *argv[]) +{ + if (GNUNET_OK != + GNUNET_TRANSPORT_TESTING_main (2, + &check, + NULL)) { - GNUNET_DISK_directory_remove (gen_cfg_p1); - GNUNET_free (gen_cfg_p1); + GNUNET_break (0); + return 1; } - - if (GNUNET_YES == GNUNET_DISK_file_test (gen_cfg_p2)) + for (unsigned int i=0;i<2;i++) { - GNUNET_DISK_directory_remove (gen_cfg_p2); - GNUNET_free (gen_cfg_p2); + if ( (NULL != gen_cfgs[i]) && + (GNUNET_YES == GNUNET_DISK_file_test (gen_cfgs[i])) ) + { + GNUNET_DISK_directory_remove (gen_cfgs[i]); + GNUNET_free (gen_cfgs[i]); + } } - - GNUNET_free (test_source); - GNUNET_free (test_plugin); - GNUNET_free (test_name); - - GNUNET_TRANSPORT_TESTING_done (tth); - - return test_failed; + return 0; }