X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcadet%2Ftest_cadet.c;h=f2e639e7a5726c7795a88c111fb13e0b2aea68bf;hb=ad22adb15a0c895ac9c25d4c289abf86355a4737;hp=b3ded1bdf6d5e997f81d501da42ba63e90cededb;hpb=95f9076a2139f5fb042b944a0658b6cda2fa35db;p=oweals%2Fgnunet.git diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c index b3ded1bdf..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 @@ -33,7 +34,7 @@ /** * How many messages to send */ -#define TOTAL_PACKETS 200 /* Cannot exceed 64k! */ +#define TOTAL_PACKETS 500 /* Cannot exceed 64k! */ /** * How long until we give up on connecting the peers? @@ -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,27 +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 + */ +static struct GNUNET_HashCode port; /** * Peer ids counter. */ -unsigned int p_ids; +static unsigned int p_ids; /** * Is the setup initialized? @@ -213,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 @@ -340,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) @@ -363,26 +383,38 @@ stats_cont (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) * @param subsystem name of subsystem that created the statistic * @param name the name of the datum * @param value the current value - * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not - * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration + * @param is_persistent #GNUNET_YES if the value is persistent, #GNUNET_NO if not + * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration */ static int -stats_iterator (void *cls, const struct GNUNET_TESTBED_Peer *peer, - const char *subsystem, const char *name, - uint64_t value, int is_persistent) +stats_iterator (void *cls, + const struct GNUNET_TESTBED_Peer *peer, + const char *subsystem, + const char *name, + uint64_t value, + int is_persistent) { 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); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "STATS PEER %u - %s [%s]: %llu\n", - i, subsystem, name, value); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "STATS PEER %u - %s [%s]: %llu\n", + i, + subsystem, + name, + (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; } @@ -401,7 +433,7 @@ gather_stats_and_exit (void *cls) disconnect_task = NULL; GNUNET_log (GNUNET_ERROR_TYPE_INFO, "gathering statistics from line %d\n", - l); + (int) l); if (NULL != ch) { if (NULL != th) @@ -414,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); } @@ -427,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); } @@ -497,7 +530,9 @@ data_task (void *cls) else { i++; - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "in %u ms\n", i); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "in %llu ms\n", + (unsigned long long) i); data_job = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, i), &data_task, (void *) i); @@ -513,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; @@ -522,7 +557,9 @@ tmt_rdy (void *cls, size_t size, void *buf) long id = (long) cls; unsigned int counter; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tmt_rdy on %ld, filling buffer\n", id); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "tmt_rdy on %ld, filling buffer\n", + id); if (0 == id) th = NULL; else if ((peers_requested - 1) == id) @@ -531,39 +568,51 @@ 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; - if (size < msg_size || NULL == buf) + GNUNET_assert (msg_size > sizeof (struct GNUNET_MessageHeader)); + if ( (size < msg_size) || + (NULL == buf) ) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "size %u, buf %p, data_sent %u, ack_received %u\n", - size, buf, data_sent, ack_received); + (unsigned int) size, + buf, + data_sent, + ack_received); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ok %u, ok goal %u\n", ok, ok_goal); GNUNET_break (ok >= ok_goal - 2); 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 || SPEED_ACK == test) + else if ( (SPEED == test) || + (SPEED_ACK == test) ) { if (get_expected_target() == id) ack_sent++; else data_sent++; counter++; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, " Sent message %d size %u\n", - counter, msg_size); - if (data_sent < TOTAL_PACKETS && SPEED == test) + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + " Sent message %u size %u\n", + counter, + (unsigned int) msg_size); + if ( (data_sent < TOTAL_PACKETS) && + (SPEED == test) ) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Scheduling message %d\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " Scheduling message %d\n", counter + 1); data_job = GNUNET_SCHEDULER_add_now (&data_task, NULL); } @@ -576,15 +625,16 @@ 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 - * @return GNUNET_OK to keep the connection open, - * GNUNET_SYSERR to close it (signal serious error) + * @return #GNUNET_OK to keep the connection open, + * #GNUNET_SYSERR to close it (signal serious error) */ -int -data_callback (void *cls, struct GNUNET_CADET_Channel *channel, +static int +data_callback (void *cls, + struct GNUNET_CADET_Channel *channel, void **channel_ctx, const struct GNUNET_MessageHeader *message) { @@ -604,7 +654,8 @@ data_callback (void *cls, struct GNUNET_CADET_Channel *channel, { 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, @@ -727,7 +778,9 @@ data_callback (void *cls, struct GNUNET_CADET_Channel *channel, * {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} }; @@ -745,22 +798,35 @@ static struct GNUNET_CADET_MessageHandler handlers[] = { * (can be NULL -- that's not an error). */ static void * -incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel, - const struct GNUNET_PeerIdentity *initiator, - uint32_t port, enum GNUNET_CADET_ChannelOption options) +incoming_channel (void *cls, + struct GNUNET_CADET_Channel *channel, + const struct GNUNET_PeerIdentity *initiator, + const struct GNUNET_HashCode *port, + enum GNUNET_CADET_ChannelOption options) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Incoming channel from %s to peer %d\n", - GNUNET_i2s (initiator), (long) cls); + "Incoming channel from %s to peer %d:%s\n", + GNUNET_i2s (initiator), + (int) (long) cls, GNUNET_h2s (port)); 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) { @@ -773,6 +839,7 @@ incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel, return NULL; } + /** * Function called whenever an inbound channel is destroyed. Should clean up * any associated state. @@ -783,13 +850,15 @@ incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel, * with the channel is stored */ static void -channel_cleaner (void *cls, const struct GNUNET_CADET_Channel *channel, +channel_cleaner (void *cls, + const struct GNUNET_CADET_Channel *channel, void *channel_ctx) { long i = (long) cls; GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Incoming channel disconnected at peer %ld\n", i); + "Incoming channel disconnected at peer %ld\n", + i); if (peers_running - 1 == i) { ok++; @@ -800,14 +869,15 @@ channel_cleaner (void *cls, const struct GNUNET_CADET_Channel *channel, { if (P2P_SIGNAL == test) { - ok ++; + ok++; } GNUNET_break (channel == ch); ch = NULL; } else GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Unknown peer! %d\n", i); + "Unknown peer! %d\n", + (int) i); GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok); if (NULL != disconnect_task) @@ -816,8 +886,6 @@ channel_cleaner (void *cls, const struct GNUNET_CADET_Channel *channel, disconnect_task = GNUNET_SCHEDULER_add_now (&gather_stats_and_exit, (void *) __LINE__); } - - return; } @@ -835,8 +903,8 @@ do_test (void *cls) enum GNUNET_CADET_ChannelOption flags; test_task = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "do_test\n"); - + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "do_test\n"); if (NULL != disconnect_task) { GNUNET_SCHEDULER_cancel (disconnect_task); @@ -849,20 +917,28 @@ do_test (void *cls) test = SPEED; flags |= GNUNET_CADET_OPTION_RELIABLE; } - ch = GNUNET_CADET_channel_create (h1, NULL, p_id[1], 1, flags); - disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME, - &gather_stats_and_exit, - (void *) __LINE__); + ch = GNUNET_CADET_channel_create (h1, + NULL, + p_id[1], + &port, + flags); + + disconnect_task + = GNUNET_SCHEDULER_add_delayed (SHORT_TIME, + &gather_stats_and_exit, + (void *) __LINE__); if (KEEPALIVE == test) return; /* Don't send any data. */ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending data initializer...\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Sending data initializer...\n"); data_received = 0; data_sent = 0; ack_received = 0; ack_sent = 0; - th = GNUNET_CADET_notify_transmit_ready (ch, GNUNET_NO, + th = GNUNET_CADET_notify_transmit_ready (ch, + GNUNET_NO, GNUNET_TIME_UNIT_FOREVER_REL, size_payload + 1000, &tmt_rdy, (void *) 0L); @@ -886,24 +962,31 @@ pi_cb (void *cls, { long i = (long) cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "id callback for %ld\n", i); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "id callback for %ld\n", i); - if (NULL == pinfo || NULL != emsg) + if ( (NULL == pinfo) || + (NULL != emsg) ) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "pi_cb: %s\n", emsg); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "pi_cb: %s\n", emsg); abort_test (__LINE__); return; } p_id[i] = pinfo->result.id; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " id: %s\n", GNUNET_i2s (p_id[i])); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " id: %s\n", GNUNET_i2s (p_id[i])); p_ids++; if (p_ids < 2) return; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got all IDs, starting test\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got all IDs, starting test\n"); test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &do_test, NULL); + &do_test, + NULL); } + /** * test main: start test when all peers are connected * @@ -949,8 +1032,10 @@ int main (int argc, char *argv[]) { initialized = GNUNET_NO; - static uint32_t ports[2]; + static const struct GNUNET_HashCode *ports[2]; const char *config_file; + char port_id[] = "test port"; + GNUNET_CRYPTO_hash (port_id, sizeof (port_id), &port); GNUNET_log_setup ("test", "DEBUG", NULL); config_file = "test_cadet.conf"; @@ -1050,8 +1135,8 @@ main (int argc, char *argv[]) } p_ids = 0; - ports[0] = 1; - ports[1] = 0; + ports[0] = &port; + ports[1] = NULL; GNUNET_CADET_TEST_run ("test_cadet_small", config_file, peers_requested, @@ -1061,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);