From 4a8b0022e6235b9912d02a8e92c020bea1ac1798 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 31 May 2010 07:55:27 +0000 Subject: [PATCH] testcase --- src/transport/Makefile.am | 12 +- src/transport/plugin_transport_tcp.c | 14 +- src/transport/test_transport_api.c | 10 +- src/transport/test_transport_api_data.conf | 2 +- .../test_transport_api_reliability.c | 438 ++++++++++++++++++ src/transport/transport.h | 6 +- src/transport/transport_api.c | 10 +- 7 files changed, 474 insertions(+), 18 deletions(-) create mode 100644 src/transport/test_transport_api_reliability.c diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index d926698c1..caee5b51d 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -130,10 +130,12 @@ libgnunet_plugin_transport_http_la_LDFLAGS = \ endif check_PROGRAMS = \ + test_transport_api_tcp \ test_transport_api_tcp \ test_transport_api_udp \ $(HTTP_PLGUIN_CHECK) \ - test_transport_api_udp_nat + test_transport_api_udp_nat \ + test_transport_api_reliability_tcp # test_transport_api_http \ # TODO: add tests for http, nat, etc. @@ -145,6 +147,12 @@ test_transport_api_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la +test_transport_api_reliability_tcp_SOURCES = \ + test_transport_api_reliability.c +test_transport_api_reliability_tcp_LDADD = \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/util/libgnunetutil.la + test_transport_api_udp_SOURCES = \ test_transport_api.c test_transport_api_udp_LDADD = \ @@ -156,7 +164,7 @@ test_transport_api_udp_nat_SOURCES = \ test_transport_api_udp_nat_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + #test_transport_api_http_SOURCES = \ # test_transport_api.c #test_transport_api_http_LDADD = \ diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 099e10a1a..865ca325a 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -37,7 +37,7 @@ #include "plugin_transport.h" #include "transport.h" -#define DEBUG_TCP GNUNET_NO +#define DEBUG_TCP GNUNET_YES /** * How long until we give up on transmitting the welcome message? @@ -339,7 +339,11 @@ tcp_address_to_string (void *cls, } else { - GNUNET_break_op (0); + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + "tcp", + _("Unexected address length: %u\n"), + addrlen); + GNUNET_break (0); return NULL; } inet_ntop (af, sb, buf, INET6_ADDRSTRLEN); @@ -878,7 +882,11 @@ tcp_plugin_send (void *cls, } else { - GNUNET_break_op (0); + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + "tcp", + _("Address of unexpected length: %u\n"), + addrlen); + GNUNET_break (0); return -1; } sa = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched, diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 768e514a1..dace6a5e9 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -75,7 +75,7 @@ static int is_udp_nat; static int is_http; -GNUNET_SCHEDULER_TaskIdentifier die_task; +static GNUNET_SCHEDULER_TaskIdentifier die_task; #if VERBOSE #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) @@ -114,16 +114,10 @@ stop_arm (struct PeerContext *p) static void end_badly () { - /* do work here */ -#if VERBOSE - fprintf(stderr, "Ending on an unhappy note.\n"); -#endif - + GNUNET_break (0); GNUNET_TRANSPORT_disconnect (p1.th); GNUNET_TRANSPORT_disconnect (p2.th); - ok = 1; - return; } static void diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf index dc1096cc6..fc22e3a11 100644 --- a/src/transport/test_transport_api_data.conf +++ b/src/transport/test_transport_api_data.conf @@ -35,7 +35,7 @@ AUTOSTART = NO [transport] plugins = udp -DEBUG = NO +DEBUG = YES PREFIX = ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c new file mode 100644 index 000000000..9b2c167cb --- /dev/null +++ b/src/transport/test_transport_api_reliability.c @@ -0,0 +1,438 @@ +/* + This file is part of GNUnet. + (C) 2009, 2010 Christian Grothoff (and other contributing authors) + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 2, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + 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. +*/ +/** + * @file transport/test_transport_api_reliability.c + * @brief base test case for transport implementations + * + * This test case serves as a base for tcp and http + * transport test cases to check that the transports + * achieve reliable message delivery. + */ +#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_transport_service.h" +#include "transport.h" + +#define VERBOSE GNUNET_YES + +#define VERBOSE_ARM GNUNET_NO + +#define START_ARM GNUNET_YES + +#define TOTAL_MSGS (60000 * 2) + +/** + * How long until we give up on transmitting the message? + */ +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) + +#define MTYPE 12345 + +struct PeerContext +{ + struct GNUNET_CONFIGURATION_Handle *cfg; + struct GNUNET_TRANSPORT_Handle *th; + struct GNUNET_PeerIdentity id; +#if START_ARM + pid_t arm_pid; +#endif +}; + +static struct PeerContext p1; + +static struct PeerContext p2; + +static struct GNUNET_SCHEDULER_Handle *sched; + +static int ok; + +static int is_tcp; + +static int is_http; + +static GNUNET_SCHEDULER_TaskIdentifier die_task; + +#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 () +{ + GNUNET_assert (ok == 6); + GNUNET_SCHEDULER_cancel (sched, die_task); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); + GNUNET_TRANSPORT_disconnect (p1.th); + GNUNET_TRANSPORT_disconnect (p2.th); + + die_task = GNUNET_SCHEDULER_NO_TASK; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transports disconnected, returning success!\n"); + ok = 0; +} + + +static void +stop_arm (struct PeerContext *p) +{ +#if START_ARM + if (0 != PLIBC_KILL (p->arm_pid, SIGTERM)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); + GNUNET_OS_process_wait (p->arm_pid); +#endif + GNUNET_CONFIGURATION_destroy (p->cfg); +} + + +static void +end_badly (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + GNUNET_break (0); + GNUNET_TRANSPORT_disconnect (p1.th); + GNUNET_TRANSPORT_disconnect (p2.th); + ok = 1; +} + + +struct TestMessage +{ + struct GNUNET_MessageHeader header; + uint32_t num; +}; + + +static unsigned int +get_size (unsigned int iter) +{ + unsigned int ret; + if (iter < 60000) + return iter + sizeof (struct TestMessage); + 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, + struct GNUNET_TIME_Relative latency, + uint32_t distance) +{ + static int n; + unsigned int s; + const struct TestMessage *hdr; + + hdr = (const struct TestMessage*) message; + s = get_size (n); + if (MTYPE != ntohs (message->type)) + return; + 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)); + GNUNET_SCHEDULER_cancel (sched, die_task); + die_task = GNUNET_SCHEDULER_add_now (sched, &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)); + GNUNET_SCHEDULER_cancel (sched, die_task); + die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL); + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got message %u of size %u\n", + ntohl (hdr->num), + ntohs (message->size)); + n++; + if (n == TOTAL_MSGS) + end (); +} + + +static size_t +notify_ready (void *cls, size_t size, void *buf) +{ + static int n; + char *cbuf = buf; + struct TestMessage hdr; + unsigned int s; + unsigned int ret; + + if (buf == NULL) + { + GNUNET_break (0); + 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); + memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage)); + ret += sizeof (struct TestMessage); + memset (&cbuf[ret], n, s - sizeof (struct TestMessage)); + ret += s - sizeof (struct TestMessage); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Sending message %u of size %u\n", + n, + s); + 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) + GNUNET_TRANSPORT_notify_transmit_ready (p1.th, + &p2.id, + s, 0, TIMEOUT, + ¬ify_ready, + NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Returning total message block of size %u\n", + ret); + return ret; +} + + +static void +notify_connect (void *cls, + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_TIME_Relative latency, + uint32_t distance) +{ + if (cls == &p1) + { + GNUNET_TRANSPORT_set_quota (p1.th, + &p2.id, + GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), + GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, NULL); + GNUNET_TRANSPORT_notify_transmit_ready (p1.th, + &p2.id, + get_size (0), 0, TIMEOUT, + ¬ify_ready, + NULL); + } + else + { + GNUNET_TRANSPORT_set_quota (p2.th, + &p1.id, + GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), + GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, NULL); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls); +} + + +static void +notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer `%4s' disconnected (%p)!\n", + GNUNET_i2s (peer), cls); +} + + +static void +setup_peer (struct PeerContext *p, const char *cfgname) +{ + p->cfg = GNUNET_CONFIGURATION_create (); +#if START_ARM + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, + "gnunet-service-arm", + "gnunet-service-arm", +#if VERBOSE_ARM + "-L", "DEBUG", +#endif + "-c", cfgname, NULL); +#endif + GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); + p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, + p, + ¬ify_receive, + ¬ify_connect, + ¬ify_disconnect); + GNUNET_assert (p->th != NULL); +} + + +static void +exchange_hello_last (void *cls, + const struct GNUNET_MessageHeader *message) +{ + struct PeerContext *me = cls; + + GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, me); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Exchanging HELLO with peer (%p)!\n", cls); + GNUNET_assert (ok >= 3); + OKPP; + GNUNET_assert (message != NULL); + GNUNET_assert (GNUNET_OK == + GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) + message, &me->id)); + /* both HELLOs exchanged, get ready to test transmission! */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Finished exchanging HELLOs, now waiting for transmission!\n"); +} + + +static void +exchange_hello (void *cls, + const struct GNUNET_MessageHeader *message) +{ + struct PeerContext *me = cls; + + GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, me); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Exchanging HELLO with peer (%p)!\n", cls); + GNUNET_assert (ok >= 2); + OKPP; + GNUNET_assert (message != NULL); + GNUNET_assert (GNUNET_OK == + GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) + message, &me->id)); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received HELLO size %d\n", GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); + + GNUNET_TRANSPORT_offer_hello (p2.th, message); + GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); +} + + +static void +run (void *cls, + struct GNUNET_SCHEDULER_Handle *s, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + GNUNET_assert (ok == 1); + OKPP; + sched = s; + die_task = GNUNET_SCHEDULER_add_delayed (sched, + TIMEOUT, + &end_badly, + NULL); + if (is_tcp) + { + setup_peer (&p1, "test_transport_api_tcp_peer1.conf"); + setup_peer (&p2, "test_transport_api_tcp_peer2.conf"); + } + else if (is_http) + { + setup_peer (&p1, "test_transport_api_http_peer1.conf"); + setup_peer (&p2, "test_transport_api_http_peer2.conf"); + } + else + GNUNET_assert (0); + GNUNET_assert(p1.th != NULL); + GNUNET_assert(p2.th != NULL); + GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1); +} + + +static int +check () +{ + char *const argv[] = { "test-transport-api-reliability", + "-c", + "test_transport_api_data.conf", +#if VERBOSE + "-L", "DEBUG", +#endif + NULL + }; + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_OPTION_END + }; + +#if WRITECONFIG + setTransportOptions("test_transport_api_data.conf"); +#endif + ok = 1; + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, "test-transport-api", "nohelp", + options, &run, &ok); + stop_arm (&p1); + stop_arm (&p2); + return ok; +} + + +int +main (int argc, char *argv[]) +{ + int ret; +#ifdef MINGW + return GNUNET_SYSERR; +#endif + if (strstr(argv[0], "tcp") != NULL) + { + is_tcp = GNUNET_YES; + } + else if (strstr(argv[0], "http") != NULL) + { + is_http = GNUNET_YES; + } + GNUNET_log_setup ("test-transport-api-reliability", +#if VERBOSE + "DEBUG", +#else + "WARNING", +#endif + NULL); + ret = check (); + GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2"); + return ret; +} + +/* end of test_transport_api_reliability.c */ diff --git a/src/transport/transport.h b/src/transport/transport.h index 6cdbaae77..b2ef01bb5 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h @@ -30,9 +30,9 @@ #include "gnunet_time_lib.h" #include "gnunet_transport_service.h" -#define DEBUG_TRANSPORT GNUNET_NO -#define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO -#define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO +#define DEBUG_TRANSPORT GNUNET_YES +#define DEBUG_TRANSPORT_TIMEOUT GNUNET_YES +#define DEBUG_TRANSPORT_DISCONNECT GNUNET_YES /** * For how long do we allow unused bandwidth diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c index 578400cdc..22f6eee51 100644 --- a/src/transport/transport_api.c +++ b/src/transport/transport_api.c @@ -546,8 +546,12 @@ transport_notify_ready (void *cls, size_t size, void *buf) } GNUNET_CONTAINER_DLL_remove (h->control_head, h->control_tail, - cm); + cm); nret = cm->notify (cm->notify_cls, size, &cbuf[ret]); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Added %u bytes of control message at %u\n", + nret, + ret); GNUNET_free (cm); ret += nret; size -= nret; @@ -582,6 +586,10 @@ transport_notify_ready (void *cls, size_t size, void *buf) mret = th->notify (th->notify_cls, size - sizeof (struct OutboundMessage), &cbuf[ret + sizeof (struct OutboundMessage)]); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Added %u bytes of data message at %u\n", + mret, + ret); GNUNET_assert (mret <= size - sizeof (struct OutboundMessage)); #if DEBUG_TRANSPORT GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, -- 2.25.1