X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcadet%2Ftest_cadet.c;h=f2e639e7a5726c7795a88c111fb13e0b2aea68bf;hb=ad22adb15a0c895ac9c25d4c289abf86355a4737;hp=b19963bba22f7ba06e522e92e90611b4668a19ff;hpb=22141e7eb07d6331ad1c2548032c2de014f33383;p=oweals%2Fgnunet.git diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c index b19963bba..f2e639e7a 100644 --- a/src/cadet/test_cadet.c +++ b/src/cadet/test_cadet.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2011 GNUnet e.V. + Copyright (C) 2011, 2017 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 @@ -19,7 +19,8 @@ */ /** * @file cadet/test_cadet.c - * + * @author Bart Polot + * @author Christian Grothoff * @brief Test for the cadet service: retransmission of traffic. */ #include @@ -64,7 +65,7 @@ static int test; /** * String with test name */ -char *test_name; +static char *test_name; /** * Flag to send traffic leaf->root in speed tests to test BCK_ACK logic. @@ -79,32 +80,32 @@ static int ok; /** * Number of events expected to conclude the test successfully. */ -int ok_goal; +static int ok_goal; /** * Size of each test packet */ -size_t size_payload = sizeof (struct GNUNET_MessageHeader) + sizeof (uint32_t); +static size_t size_payload = sizeof (struct GNUNET_MessageHeader) + sizeof (uint32_t); /** * Operation to get peer ids. */ -struct GNUNET_TESTBED_Operation *t_op[2]; +static struct GNUNET_TESTBED_Operation *t_op[2]; /** * Peer ids. */ -struct GNUNET_PeerIdentity *p_id[2]; +static struct GNUNET_PeerIdentity *p_id[2]; /** * Port ID */ -struct GNUNET_HashCode port; +static struct GNUNET_HashCode port; /** * Peer ids counter. */ -unsigned int p_ids; +static unsigned int p_ids; /** * Is the setup initialized? @@ -218,6 +219,11 @@ static unsigned int ka_sent; */ static unsigned int ka_received; +/** + * How many messages were dropped by CADET because of full buffers? + */ +static unsigned int msg_dropped; + /** * Get the client number considered as the "target" or "receiver", depending on @@ -345,12 +351,21 @@ shutdown_task (void *cls) * operation has executed successfully. */ static void -stats_cont (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) +stats_cont (void *cls, + struct GNUNET_TESTBED_Operation *op, + const char *emsg) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, " KA sent: %u, KA received: %u\n", - ka_sent, ka_received); - if (KEEPALIVE == test && (ka_sent < 2 || ka_sent > ka_received + 1)) + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + " KA sent: %u, KA received: %u\n", + ka_sent, + ka_received); + if ( (KEEPALIVE == test) && + ( (ka_sent < 2) || + (ka_sent > ka_received + 1)) ) + { + GNUNET_break (0); ok--; + } GNUNET_TESTBED_operation_done (stats_op); if (NULL != disconnect_task) @@ -381,6 +396,8 @@ stats_iterator (void *cls, { static const char *s_sent = "# keepalives sent"; static const char *s_recv = "# keepalives received"; + static const char *rdrops = "# messages dropped due to full buffer"; + static const char *cdrops = "# messages dropped due to slow client"; uint32_t i; i = GNUNET_TESTBED_get_index (peer); @@ -392,9 +409,12 @@ stats_iterator (void *cls, (unsigned long long) value); if (0 == strncmp (s_sent, name, strlen (s_sent)) && 0 == i) ka_sent = value; - if (0 == strncmp(s_recv, name, strlen (s_recv)) && peers_requested - 1 == i) ka_received = value; + if (0 == strncmp(rdrops, name, strlen (rdrops))) + msg_dropped += value; + if (0 == strncmp(cdrops, name, strlen (cdrops))) + msg_dropped += value; return GNUNET_OK; } @@ -426,7 +446,7 @@ gather_stats_and_exit (void *cls) } stats_op = GNUNET_TESTBED_get_statistics (peers_running, testbed_peers, "cadet", NULL, - stats_iterator, stats_cont, cls); + &stats_iterator, stats_cont, cls); } @@ -439,10 +459,11 @@ gather_stats_and_exit (void *cls) static void abort_test (long line) { - if (disconnect_task != NULL) + if (NULL != disconnect_task) { GNUNET_SCHEDULER_cancel (disconnect_task); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting test from %ld\n", line); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Aborting test from %ld\n", line); disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_cadet_peers, (void *) line); } @@ -527,7 +548,7 @@ data_task (void *cls) * @param size Size of the buffer we have. * @param buf Buffer to copy data to. */ -size_t +static size_t tmt_rdy (void *cls, size_t size, void *buf) { struct GNUNET_MessageHeader *msg = buf; @@ -547,6 +568,7 @@ tmt_rdy (void *cls, size_t size, void *buf) GNUNET_assert (0); counter = get_expected_target () == id ? ack_sent : data_sent; msg_size = size_payload + counter; + GNUNET_assert (msg_size > sizeof (struct GNUNET_MessageHeader)); if ( (size < msg_size) || (NULL == buf) ) { @@ -562,14 +584,16 @@ tmt_rdy (void *cls, size_t size, void *buf) return 0; } msg->size = htons (msg_size); - msg->type = htons (1); + msg->type = htons (GNUNET_MESSAGE_TYPE_DUMMY); data = (uint32_t *) &msg[1]; *data = htonl (counter); if (GNUNET_NO == initialized) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending initializer\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "sending initializer\n"); msg_size = size_payload + 1000; - if (SPEED_ACK == test) + msg->size = htons (msg_size); + if (SPEED_ACK == test) data_sent++; } else if ( (SPEED == test) || @@ -601,7 +625,7 @@ tmt_rdy (void *cls, size_t size, void *buf) /** * Function is called whenever a message is received. * - * @param cls closure (set from GNUNET_CADET_connect, peer number) + * @param cls closure (set from GNUNET_CADET_connect(), peer number) * @param channel connection to the other end * @param channel_ctx place to store local state associated with the channel * @param message the actual message @@ -630,7 +654,8 @@ data_callback (void *cls, { if (NULL != disconnect_task) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, " reschedule timeout\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + " reschedule timeout\n"); GNUNET_SCHEDULER_cancel (disconnect_task); disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &gather_stats_and_exit, @@ -753,7 +778,9 @@ data_callback (void *cls, * {callback_function, message_type, size_expected} */ static struct GNUNET_CADET_MessageHandler handlers[] = { - {&data_callback, 1, sizeof (struct GNUNET_MessageHeader)}, + {&data_callback, + GNUNET_MESSAGE_TYPE_DUMMY, + sizeof (struct GNUNET_MessageHeader)}, {NULL, 0, 0} }; @@ -784,12 +811,22 @@ incoming_channel (void *cls, ok++; GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok); if ((long) cls == peers_requested - 1) + { + if (NULL != incoming_ch) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Duplicate incoming channel for client %lu\n", + (long) cls); + GNUNET_break(0); + } incoming_ch = channel; + } else { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Incoming channel for unknown client %lu\n", (long) cls); - GNUNET_break(0); + "Incoming channel for unexpected peer #%lu\n", + (long) cls); + GNUNET_break (0); } if (NULL != disconnect_task) { @@ -1109,8 +1146,10 @@ main (int argc, char *argv[]) &channel_cleaner, handlers, ports); + if (NULL != strstr (argv[0], "_reliable")) + msg_dropped = 0; /* dropped should be retransmitted */ - if (ok_goal > ok) + if (ok_goal > ok - msg_dropped) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "FAILED! (%d/%d)\n", ok, ok_goal);