X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=inline;f=src%2Ftransport%2Ftest_transport_api_reliability.c;h=a3c7ac7b93a2dc4c4d12445454ae0eb093ce055a;hb=bcef1618a1224814d7fd644c5594de40e322578b;hp=67884e5ea0e2950fbbad1b5d0be7de1ee559773f;hpb=18e38359e46e7b368276d06411766a1a54026340;p=oweals%2Fgnunet.git diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 67884e5ea..a3c7ac7b9 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -34,70 +34,85 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_server_lib.h" #include "gnunet_transport_service.h" +#include "gauger.h" #include "transport.h" +#include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES /** - * 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. + * Testcase timeout */ -#define TOTAL_MSGS (60000 * 2) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) /** * How long until we give up on transmitting the message? */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500) +#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) -#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 char *test_source; -static struct PeerContext p2; +static char *test_plugin; -static struct GNUNET_SCHEDULER_Handle *sched; +static char *test_name; static int ok; -static int is_tcp; +static GNUNET_SCHEDULER_TaskIdentifier die_task; -static int is_tcp_nat; +struct PeerContext *p1; -static int is_http; +struct PeerContext *p2; -static int is_https; +struct PeerContext * sender; -static int is_udp; +struct PeerContext * receiver; -static int connected; +struct GNUNET_TRANSPORT_TransmitHandle *th; -static unsigned long long total_bytes; +char *cfg_file_p1; -static struct GNUNET_TIME_Absolute start_time; +char *cfg_file_p2; -static GNUNET_SCHEDULER_TaskIdentifier die_task; +/* + * 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; -static char * key_file_p1; -static char * cert_file_p1; +static unsigned long long total_bytes; -static char * key_file_p2; -static char * cert_file_p2; +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) @@ -111,55 +126,51 @@ end () { unsigned long long delta; - GNUNET_SCHEDULER_cancel (sched, die_task); - die_task = GNUNET_SCHEDULER_NO_TASK; -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); -#endif - GNUNET_TRANSPORT_disconnect (p1.th); - GNUNET_TRANSPORT_disconnect (p2.th); -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transports disconnected, returning success!\n"); -#endif - delta = GNUNET_TIME_absolute_get_duration (start_time).value; - fprintf (stderr, - "\nThroughput was %llu kb/s\n", - total_bytes * 1000 / 1024 / delta); - ok = 0; + char *value_name; -} + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); + delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; + fprintf (stderr, "\nThroughput was %llu kb/s\n", + total_bytes * 1000 / 1024 / delta); + GNUNET_asprintf (&value_name, "reliable_%s", test_plugin); + GAUGER ("TRANSPORT", value_name, (int) (total_bytes * 1000 / 1024 / delta), + "kb/s"); + GNUNET_free (value_name); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); -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); -} + if (th != NULL) + GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); + th = NULL; + GNUNET_TRANSPORT_TESTING_stop_peer (p1); + GNUNET_TRANSPORT_TESTING_stop_peer (p2); +} static void -end_badly (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +end_badly () { - GNUNET_break (0); - GNUNET_TRANSPORT_disconnect (p1.th); - GNUNET_TRANSPORT_disconnect (p2.th); - ok = 1; -} + die_task = GNUNET_SCHEDULER_NO_TASK; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); + if (test_connected == GNUNET_NO) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n"); + else + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got NOT connected\n"); -struct TestMessage -{ - struct GNUNET_MessageHeader header; - uint32_t num; -}; + if (th != NULL) + GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); + th = NULL; + + if (p1 != NULL) + GNUNET_TRANSPORT_TESTING_stop_peer (p1); + if (p2 != NULL) + GNUNET_TRANSPORT_TESTING_stop_peer (p2); + + ok = GNUNET_SYSERR; +} static unsigned int @@ -167,84 +178,86 @@ 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, +notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, - struct GNUNET_TIME_Relative latency, - uint32_t distance) + const struct GNUNET_TRANSPORT_ATS_Information *ats, + uint32_t ats_count) { static int n; unsigned int s; char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1]; const struct TestMessage *hdr; - hdr = (const struct TestMessage*) message; + 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; - } + 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)); - GNUNET_SCHEDULER_cancel (sched, die_task); - die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL); - return; - } + { + 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))) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Expected message %u with bits %u, but body did not match\n", - n, (unsigned char) n); - GNUNET_SCHEDULER_cancel (sched, die_task); - die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL); - return; - } + if (0 != memcmp (cbuf, &hdr[1], s - sizeof (struct TestMessage))) + { + 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) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Got message %u of size %u\n", - ntohl (hdr->num), - ntohs (message->size)); - } + if (ntohl (hdr->num) % 5000 == 0) + { + 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); + } #endif n++; - if (0 == (n % (TOTAL_MSGS/100))) - { - fprintf (stderr, "."); - GNUNET_SCHEDULER_cancel (sched, die_task); - die_task = GNUNET_SCHEDULER_add_delayed (sched, - TIMEOUT, - &end_badly, - NULL); - } + if (0 == (n % (TOTAL_MSGS / 100))) + { + fprintf (stderr, "."); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); + } if (n == TOTAL_MSGS) + { + ok = 0; + fprintf (stderr, "\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All messages received\n"); end (); + } } @@ -257,294 +270,187 @@ notify_ready (void *cls, size_t size, void *buf) unsigned int s; unsigned int ret; + th = NULL; if (buf == NULL) - { - GNUNET_break (0); - ok = 42; - return 0; - } + { + 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); - memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage)); - ret += sizeof (struct TestMessage); - memset (&cbuf[ret], n, s - sizeof (struct TestMessage)); - ret += s - sizeof (struct TestMessage); + { + 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) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending message %u of size %u\n", - n, - 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 */ + if (n % 5000 == 0) + { + + 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) - GNUNET_TRANSPORT_notify_transmit_ready (p2.th, - &p1.id, - s, 0, TIMEOUT, - ¬ify_ready, - NULL); + { + 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); - } + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Returning total message block of size %u\n", ret); + } total_bytes += ret; + if (n == TOTAL_MSGS) + { + fprintf (stderr, "\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All messages sent\n"); + } return ret; } static void -notify_connect (void *cls, - const struct GNUNET_PeerIdentity *peer, - struct GNUNET_TIME_Relative latency, - uint32_t distance) +notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_TRANSPORT_ATS_Information *ats, + uint32_t ats_count) { - 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); - start_time = GNUNET_TIME_absolute_get (); - connected++; - } - 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); - connected++; - } - if (connected == 2) - { - GNUNET_TRANSPORT_notify_transmit_ready (p2.th, - &p1.id, - get_size (0), 0, TIMEOUT, - ¬ify_ready, - NULL); - } -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls); -#endif + struct PeerContext *p = cls; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') connected to us!\n", + p->no, GNUNET_i2s (peer)); + + 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)); + } + else if (cls == p2) + { + GNUNET_TRANSPORT_set_quota (p2->th, &p1->id, + GNUNET_BANDWIDTH_value_init (1024 * 1024 * + 1024), + GNUNET_BANDWIDTH_value_init (1024 * 1024 * + 1024)); + } } static void notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) { -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer `%4s' disconnected (%p)!\n", - GNUNET_i2s (peer), cls); -#endif -} + 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; +} static void -setup_peer (struct PeerContext *p, const char *cfgname) +sendtask () { - 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)); - - if (is_https) - { - struct stat sbuf; - if (p==&p1) - { - if (GNUNET_CONFIGURATION_have_value (p->cfg, - "transport-https", "KEY_FILE")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p1); - if (key_file_p1 == NULL) - GNUNET_asprintf(&key_file_p1,"https_p1.key"); - if (0 == stat (key_file_p1, &sbuf )) - { - if (0 == remove(key_file_p1)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing private key file `%s'\n",key_file_p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove private key file `%s'\n",key_file_p1); - } - if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p1); - if (cert_file_p1 == NULL) - GNUNET_asprintf(&cert_file_p1,"https_p1.cert"); - if (0 == stat (cert_file_p1, &sbuf )) - { - if (0 == remove(cert_file_p1)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing certificate file `%s'\n",cert_file_p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove existing certificate file `%s'\n",cert_file_p1); - } - } - else if (p==&p2) - { - if (GNUNET_CONFIGURATION_have_value (p->cfg, - "transport-https", "KEY_FILE")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p2); - if (key_file_p2 == NULL) - GNUNET_asprintf(&key_file_p2,"https_p2.key"); - if (0 == stat (key_file_p2, &sbuf )) - { - if (0 == remove(key_file_p2)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing private key file `%s'\n",key_file_p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove private key file `%s'\n",key_file_p2); - } - if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p2); - if (cert_file_p2 == NULL) - GNUNET_asprintf(&cert_file_p2,"https_p2.cert"); - if (0 == stat (cert_file_p2, &sbuf )) - { - if (0 == remove(cert_file_p2)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing certificate file `%s'\n",cert_file_p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove existing certificate file `%s'\n",cert_file_p2); - } - } - } - - p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, NULL, - p, - ¬ify_receive, - ¬ify_connect, - ¬ify_disconnect); - GNUNET_assert (p->th != NULL); + 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); } - static void -exchange_hello_last (void *cls, - const struct GNUNET_MessageHeader *message) +testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) { - struct PeerContext *me = cls; - - GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, me); -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Exchanging HELLO with peer (%p)!\n", cls); -#endif - 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"); + 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); + + // FIXME: THIS IS REQUIRED! SEEMS TO BE A BUG! + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL); } - static void -exchange_hello (void *cls, - const struct GNUNET_MessageHeader *message) +run (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) { - struct PeerContext *me = cls; + die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); + + p1 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p1, + ¬ify_receive, + ¬ify_connect, ¬ify_disconnect, + NULL); + p1->no = 1; + p2 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p2, + ¬ify_receive, + ¬ify_connect, ¬ify_disconnect, + NULL); + p2->no = 2; + + 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; + } + test_connected = GNUNET_NO; - GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, me); -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Exchanging HELLO with peer (%p)!\n", cls); -#endif - 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, "Peer %u: `%s' using configuration file `%s'\n", + p1->no, + GNUNET_i2s (&p1->id), cfg_file_p1); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u: `%s' using configuration file `%s'\n", + p2->no, + GNUNET_i2s (&p2->id), cfg_file_p2); -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received HELLO size %d\n", - GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); -#endif - GNUNET_TRANSPORT_offer_hello (p2.th, message); - GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); -} + sender = p2; + receiver = p1; + char *sender_c = strdup (GNUNET_i2s (&sender->id)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test triest to send from %u (%s) -> peer %u (%s)\n", + sender->no, sender_c, + receiver->no, GNUNET_i2s (&receiver->id)); -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_rel_http_peer1.conf"); - setup_peer (&p2, "test_transport_api_rel_http_peer2.conf"); - } - else if (is_https) - { - setup_peer (&p1, "test_transport_api_rel_https_peer1.conf"); - setup_peer (&p2, "test_transport_api_rel_https_peer2.conf"); - } - else if (is_udp) - { - setup_peer (&p1, "test_transport_api_udp_peer1.conf"); - setup_peer (&p2, "test_transport_api_udp_peer2.conf"); - } - else if (is_tcp_nat) - { - setup_peer (&p1, "test_transport_api_tcp_nat_peer1.conf"); - setup_peer (&p2, "test_transport_api_tcp_nat_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); + GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL); } - static int check () { - char *const argv[] = { "test-transport-api-reliability", + static char *argv[] = { "test_transport", "-c", "test_transport_api_data.conf", #if VERBOSE @@ -552,102 +458,71 @@ check () #endif NULL }; - struct GNUNET_GETOPT_CommandLineOption options[] = { + static struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; #if WRITECONFIG - setTransportOptions("test_transport_api_data.conf"); + setTransportOptions ("test_transport_api_data.conf"); #endif ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, - argv, "test-transport-api-reliability", "nohelp", - options, &run, &ok); - stop_arm (&p1); - stop_arm (&p2); - - if (is_https) - { - struct stat sbuf; - if (0 == stat (cert_file_p1, &sbuf )) - { - if (0 == remove(cert_file_p1)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed existing certificate file `%s'\n",cert_file_p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove certfile `%s'\n",cert_file_p1); - } - - if (0 == stat (key_file_p1, &sbuf )) - { - if (0 == remove(key_file_p1)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed private key file `%s'\n",key_file_p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to private key file `%s'\n",key_file_p1); - } - - if (0 == stat (cert_file_p2, &sbuf )) - { - if (0 == remove(cert_file_p2)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed existing certificate file `%s'\n",cert_file_p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove certfile `%s'\n",cert_file_p2); - } - - if (0 == stat (key_file_p2, &sbuf )) - { - if (0 == remove(key_file_p2)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed private key file `%s'\n",key_file_p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to private key file `%s'\n",key_file_p2); - } - GNUNET_free(key_file_p1); - GNUNET_free(key_file_p2); - GNUNET_free(cert_file_p1); - GNUNET_free(cert_file_p2); - } + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, + "nohelp", options, &run, &ok); return ok; } - int main (int argc, char *argv[]) { int ret; -#ifdef MINGW - return GNUNET_SYSERR; -#endif - if (strstr(argv[0], "tcp_nat") != NULL) - { - is_tcp_nat = GNUNET_YES; - } - else if (strstr(argv[0], "tcp") != NULL) - { - is_tcp = GNUNET_YES; - } - else if (strstr(argv[0], "https") != NULL) - { - is_https = GNUNET_YES; - } - else if (strstr(argv[0], "http") != NULL) - { - is_http = GNUNET_YES; - } - else if (strstr(argv[0], "udp") != NULL) - { - is_udp = GNUNET_YES; - } - GNUNET_log_setup ("test-transport-api-reliability", + int nat_res; + + 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)) + { + 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; + } + } + + GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); + GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); + ret = check (); - GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1"); - GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2"); + + GNUNET_free (cfg_file_p1); + GNUNET_free (cfg_file_p2); + + GNUNET_free (test_source); + GNUNET_free (test_plugin); + GNUNET_free (test_name); + return ret; } + /* end of test_transport_api_reliability.c */