From 8d0883a3f695261cfd8651ed53734f2f4fb30417 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 22 Jul 2016 21:35:51 +0000 Subject: [PATCH] migrate more tests to new transmission API --- .../test_transport_api_manipulation_cfg.c | 212 +++-------------- ...test_transport_api_manipulation_recv_tcp.c | 216 +++++------------- ...test_transport_api_manipulation_send_tcp.c | 81 +++---- src/transport/transport-testing.h | 2 +- 4 files changed, 134 insertions(+), 377 deletions(-) diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c index 19823e0b3..84824ad8b 100644 --- a/src/transport/test_transport_api_manipulation_cfg.c +++ b/src/transport/test_transport_api_manipulation_cfg.c @@ -20,7 +20,7 @@ /** * @file transport/test_transport_api_manipulation_cfg.c * @brief base test case for transport traffic manipulation implementation - * based onf cfg + * based on cfg * * Peer 1 has inbound and outbound delay of 100ms * Peer 2 has no inbound and outbound delay @@ -37,15 +37,9 @@ */ #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, 30) #define TEST_MESSAGE_SIZE 2600 -#define TEST_REQUEST_MESSAGE_TYPE 12345 - #define TEST_RESPONSE_MESSAGE_TYPE 12346 /** @@ -56,157 +50,31 @@ static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc; -static struct GNUNET_TRANSPORT_TransmitHandle *th; - -static struct GNUNET_SCHEDULER_Task *send_task; - static struct GNUNET_TIME_Absolute start_request; static struct GNUNET_TIME_Absolute start_response; -static void -custom_shutdown (void *cls) -{ - if (NULL != th) - { - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; - } - if (NULL != send_task) - { - GNUNET_SCHEDULER_cancel (send_task); - send_task = NULL; - } -} - - -static size_t -notify_request_ready (void *cls, size_t size, void *buf) -{ - struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; - struct GNUNET_MessageHeader *hdr; - - th = NULL; - if (NULL == buf) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Timeout occurred while waiting for transmit_ready\n"); - GNUNET_SCHEDULER_shutdown (); - ccc->global_ret = 42; - return 0; - } - - GNUNET_assert (size >= TEST_MESSAGE_SIZE); - memset (buf, '\0', TEST_MESSAGE_SIZE); - hdr = buf; - hdr->size = htons (TEST_MESSAGE_SIZE); - hdr->type = htons (TEST_REQUEST_MESSAGE_TYPE); - - { - char *ps = GNUNET_strdup (GNUNET_i2s (&ccc->p[0]->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending request message from peer %u (`%4s') with type %u and size %u bytes to peer %u (`%4s')\n", - ccc->p[0]->no, ps, - ntohs (hdr->type), - ntohs (hdr->size), - p->no, - GNUNET_i2s (&p->id)); - GNUNET_free (ps); - } - - return TEST_MESSAGE_SIZE; -} - - -static void -sendtask_request_task (void *cls) -{ - send_task = NULL; - { - char *receiver_s = GNUNET_strdup (GNUNET_i2s (&ccc->p[1]->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending message from peer %u (`%s') -> peer %u (`%s') !\n", - ccc->p[0]->no, - GNUNET_i2s (&ccc->p[0]->id), - ccc->p[1]->no, - receiver_s); - GNUNET_free (receiver_s); - } - - start_request = GNUNET_TIME_absolute_get(); - th = GNUNET_TRANSPORT_notify_transmit_ready (ccc->p[0]->th, - &ccc->p[1]->id, - TEST_MESSAGE_SIZE, - TIMEOUT_TRANSMIT, - ¬ify_request_ready, - ccc->p[1]); -} - - -static size_t -notify_response_ready (void *cls, size_t size, void *buf) -{ - struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; - struct GNUNET_MessageHeader *hdr; - - th = NULL; - if (NULL == buf) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Timeout occurred while waiting for transmit_ready\n"); - GNUNET_SCHEDULER_shutdown (); - ccc->global_ret = 42; - return 0; - } - - GNUNET_assert (size >= TEST_MESSAGE_SIZE); - memset (buf, '\0', TEST_MESSAGE_SIZE); - hdr = buf; - hdr->size = htons (TEST_MESSAGE_SIZE); - hdr->type = htons (TEST_RESPONSE_MESSAGE_TYPE); - - { - char *ps = GNUNET_strdup (GNUNET_i2s (&ccc->p[0]->id)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending response message from peer %u (`%4s') with type %u and size %u bytes to peer %u (`%4s')\n", - ccc->p[0]->no, - ps, - ntohs (hdr->type), - ntohs (hdr->size), - p->no, - GNUNET_i2s (&p->id)); - GNUNET_free (ps); - } - - return TEST_MESSAGE_SIZE; -} - - static void sendtask_response_task (void *cls) { - send_task = NULL; + int ret; + + start_response = GNUNET_TIME_absolute_get(); + ret = GNUNET_TRANSPORT_TESTING_send (ccc->p[1], + ccc->p[0], + TEST_RESPONSE_MESSAGE_TYPE, + TEST_MESSAGE_SIZE, + 1, + NULL, + NULL); + if (GNUNET_NO == ret) { - char *receiver_s = GNUNET_strdup (GNUNET_i2s (&ccc->p[0]->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n", - ccc->p[1]->no, - GNUNET_i2s (&ccc->p[1]->id), - ccc->p[0]->no, - receiver_s); - GNUNET_free (receiver_s); + GNUNET_break (0); + GNUNET_SCHEDULER_shutdown (); + return; } - start_response = GNUNET_TIME_absolute_get(); - th = GNUNET_TRANSPORT_notify_transmit_ready (ccc->p[1]->th, - &ccc->p[0]->id, - TEST_MESSAGE_SIZE, - TIMEOUT_TRANSMIT, - ¬ify_response_ready, - ccc->p[0]); + GNUNET_assert (GNUNET_SYSERR != ret); } @@ -232,14 +100,16 @@ notify_receive (void *cls, } switch (ntohs (message->type)) { - case TEST_REQUEST_MESSAGE_TYPE: - duration = GNUNET_TIME_absolute_get_difference(start_request, - GNUNET_TIME_absolute_get()); + case GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE: + duration = GNUNET_TIME_absolute_get_difference (start_request, + GNUNET_TIME_absolute_get()); if (duration.rel_value_us >= TEST_DELAY) + { GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Request message was delayed for %s\n", GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES)); + } else { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -250,17 +120,20 @@ notify_receive (void *cls, GNUNET_SCHEDULER_shutdown (); } /* Send response */ - send_task = GNUNET_SCHEDULER_add_now (&sendtask_response_task, - NULL); + GNUNET_SCHEDULER_add_now (&sendtask_response_task, + NULL); return; case TEST_RESPONSE_MESSAGE_TYPE: duration = GNUNET_TIME_absolute_get_difference(start_response, GNUNET_TIME_absolute_get()); if (duration.rel_value_us >= TEST_DELAY) + { GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Response message was delayed for %s\n", GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES)); + ccc->global_ret = GNUNET_OK; + } else { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -268,48 +141,35 @@ notify_receive (void *cls, GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES)); ccc->global_ret = GNUNET_SYSERR; - GNUNET_SCHEDULER_shutdown (); - break; } - ccc->global_ret = GNUNET_OK; GNUNET_SCHEDULER_shutdown (); break; default: + GNUNET_break (0); break; } } -static void -notify_disconnect (void *cls, - struct GNUNET_TRANSPORT_TESTING_PeerContext *me, - const struct GNUNET_PeerIdentity *other) -{ - GNUNET_TRANSPORT_TESTING_log_disconnect (cls, - me, - other); - if (NULL != th) - { - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; - } -} - - int -main (int argc, char *argv[]) +main (int argc, + char *argv[]) { + struct GNUNET_TRANSPORT_TESTING_SendClosure sc = { + .num_messages = 1 + }; struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = { - .connect_continuation = &sendtask_request_task, + .connect_continuation = &GNUNET_TRANSPORT_TESTING_large_send, + .connect_continuation_cls = &sc, .config_file = "test_transport_api_data.conf", .rec = ¬ify_receive, .nc = &GNUNET_TRANSPORT_TESTING_log_connect, - .nd = ¬ify_disconnect, - .shutdown_task = &custom_shutdown, + .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect, .timeout = TIMEOUT }; ccc = &my_ccc; + sc.ccc = ccc; if (GNUNET_OK != GNUNET_TRANSPORT_TESTING_main (2, &GNUNET_TRANSPORT_TESTING_connect_check, diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c index 023d5a714..e902aed62 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp.c +++ b/src/transport/test_transport_api_manipulation_recv_tcp.c @@ -36,22 +36,9 @@ */ #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, 30) - -#define TEST_MESSAGE_SIZE 2600 - -#define TEST_MESSAGE_TYPE 12345 - static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc; -static struct GNUNET_TRANSPORT_TransmitHandle *th; - -static struct GNUNET_SCHEDULER_Task *send_task; - static int messages_recv; static struct GNUNET_TIME_Absolute start_normal; @@ -64,25 +51,45 @@ static struct GNUNET_TIME_Relative dur_delayed; static void -custom_shutdown (void *cls) +do_free (void *cls) { - if (NULL != th) + struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls; + + GNUNET_free (sc); +} + + +static void +sendtask (void *cls) +{ + struct GNUNET_TRANSPORT_TESTING_SendClosure *sc; + struct GNUNET_ATS_Properties prop; + struct GNUNET_TIME_Relative delay; + + sc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_SendClosure); + sc->num_messages = 1; + sc->ccc = ccc; + sc->cont = &do_free; + sc->cont_cls = sc; + if (0 == messages_recv) { - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; + start_normal = GNUNET_TIME_absolute_get(); } - if (NULL != send_task) + if (0 < messages_recv) { - GNUNET_SCHEDULER_cancel (send_task); - send_task = NULL; + memset (&prop, 0, sizeof (prop)); + delay = GNUNET_TIME_UNIT_SECONDS; + GNUNET_TRANSPORT_set_traffic_metric (ccc->p[1]->th, + &ccc->p[0]->id, + &prop, + delay, + GNUNET_TIME_UNIT_ZERO); + start_delayed = GNUNET_TIME_absolute_get(); } + GNUNET_TRANSPORT_TESTING_large_send (sc); } -static void -sendtask (void *cls); - - static void notify_receive (void *cls, struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver, @@ -101,13 +108,8 @@ notify_receive (void *cls, GNUNET_i2s (sender)); GNUNET_free (ps); } - if ((TEST_MESSAGE_TYPE == ntohs (message->type)) && - (TEST_MESSAGE_SIZE == ntohs (message->size))) - { - if (GNUNET_NO == ccc->global_ret) - ccc->global_ret = GNUNET_OK; - } - else + if ( (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (message->type)) || + (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE != ntohs (message->size)) ) { GNUNET_break (0); ccc->global_ret = GNUNET_SYSERR; @@ -118,150 +120,54 @@ notify_receive (void *cls, if (messages_recv <= 1) { /* Received non-delayed message */ - dur_normal = GNUNET_TIME_absolute_get_duration(start_normal); + dur_normal = GNUNET_TIME_absolute_get_duration (start_normal); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received non-delayed message %u after %s\n", messages_recv, GNUNET_STRINGS_relative_time_to_string (dur_normal, GNUNET_YES)); - - struct GNUNET_ATS_Properties prop; - struct GNUNET_TIME_Relative delay; - - delay.rel_value_us = 1000 * 1000LL; - memset (&prop, 0, sizeof (prop)); - prop.distance = 10; - GNUNET_TRANSPORT_set_traffic_metric (ccc->p[0]->th, - &ccc->p[1]->id, - &prop, - delay, - GNUNET_TIME_UNIT_ZERO); - send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL); - } - if (2 == messages_recv) - { - /* Received manipulated message */ - dur_delayed = GNUNET_TIME_absolute_get_duration(start_delayed); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received delayed message %u after %s\n", - messages_recv, - GNUNET_STRINGS_relative_time_to_string (dur_delayed, - GNUNET_YES)); - if (dur_delayed.rel_value_us < GNUNET_TIME_UNIT_SECONDS.rel_value_us) - { - GNUNET_break (0); - ccc->global_ret = GNUNET_SYSERR; - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Delayed message was not delayed correctly: took only %s\n", - GNUNET_STRINGS_relative_time_to_string (dur_delayed, - GNUNET_YES)); - } - /* shutdown */ - GNUNET_SCHEDULER_shutdown (); + GNUNET_SCHEDULER_add_now (&sendtask, + NULL); + messages_recv++; + return; } - messages_recv++; -} - - -static size_t -notify_ready (void *cls, size_t size, void *buf) -{ - struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; - struct GNUNET_MessageHeader *hdr; - - th = NULL; - if (NULL == buf) + /* Received manipulated message */ + dur_delayed = GNUNET_TIME_absolute_get_duration(start_delayed); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received delayed message %u after %s\n", + messages_recv, + GNUNET_STRINGS_relative_time_to_string (dur_delayed, + GNUNET_YES)); + if (dur_delayed.rel_value_us < GNUNET_TIME_UNIT_SECONDS.rel_value_us) { + GNUNET_break (0); + ccc->global_ret = GNUNET_SYSERR; GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Timeout occurred while waiting for transmit_ready\n"); - GNUNET_SCHEDULER_shutdown (); - ccc->global_ret = 42; - return 0; - } - - GNUNET_assert (size >= TEST_MESSAGE_SIZE); - memset (buf, '\0', TEST_MESSAGE_SIZE); - hdr = buf; - hdr->size = htons (TEST_MESSAGE_SIZE); - hdr->type = htons (TEST_MESSAGE_TYPE); - - { - char *ps = GNUNET_strdup (GNUNET_i2s (&ccc->p[1]->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer %u (`%s') sending message with type %u and size %u bytes to peer %u (`%s')\n", - ccc->p[1]->no, - ps, - ntohs (hdr->type), - ntohs (hdr->size), - p->no, - GNUNET_i2s (&p->id)); - GNUNET_free (ps); - } - - return TEST_MESSAGE_SIZE; -} - - -static void -sendtask (void *cls) -{ - if (NULL == send_task) - ccc->global_ret = GNUNET_NO; /* first call! */ - send_task = NULL; - { - char *receiver_s = GNUNET_strdup (GNUNET_i2s (&ccc->p[0]->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n", - ccc->p[1]->no, GNUNET_i2s (&ccc->p[1]->id), ccc->p[0]->no, receiver_s); - GNUNET_free (receiver_s); - } - if (0 == messages_recv) - { - start_normal = GNUNET_TIME_absolute_get(); - } - if (1 == messages_recv) - { - start_delayed = GNUNET_TIME_absolute_get(); + "Delayed message was not delayed correctly: took only %s\n", + GNUNET_STRINGS_relative_time_to_string (dur_delayed, + GNUNET_YES)); } - - th = GNUNET_TRANSPORT_notify_transmit_ready (ccc->p[1]->th, - &ccc->p[0]->id, - TEST_MESSAGE_SIZE, - TIMEOUT_TRANSMIT, - ¬ify_ready, - ccc->p[0]); -} - - -static void -notify_disconnect (void *cls, - struct GNUNET_TRANSPORT_TESTING_PeerContext *me, - const struct GNUNET_PeerIdentity *other) -{ - GNUNET_TRANSPORT_TESTING_log_disconnect (cls, - me, - other); - if (NULL != th) - { - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; + else + { + ccc->global_ret = GNUNET_OK; } + /* shutdown */ + GNUNET_SCHEDULER_shutdown (); } int -main (int argc, char *argv[]) +main (int argc, + char *argv[]) { struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = { .connect_continuation = &sendtask, .config_file = "test_transport_api_data.conf", .rec = ¬ify_receive, .nc = &GNUNET_TRANSPORT_TESTING_log_connect, - .nd = ¬ify_disconnect, - .shutdown_task = &custom_shutdown, - .timeout = TIMEOUT + .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect, + .timeout = TIMEOUT, + .global_ret = GNUNET_NO }; ccc = &my_ccc; diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c b/src/transport/test_transport_api_manipulation_send_tcp.c index 7e73f0b9c..95a6b5140 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp.c +++ b/src/transport/test_transport_api_manipulation_send_tcp.c @@ -36,9 +36,6 @@ */ #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) -#define TEST_MESSAGE_SIZE 2600 - - static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc; static int messages_recv; @@ -52,24 +49,27 @@ static struct GNUNET_TIME_Absolute start_delayed; static struct GNUNET_TIME_Relative dur_delayed; -static size_t -get_size (unsigned int cnt_down) +static void +do_free (void *cls) { - return TEST_MESSAGE_SIZE; + struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls; + + GNUNET_free (sc); } static void sendtask (void *cls) { + struct GNUNET_TRANSPORT_TESTING_SendClosure *sc; struct GNUNET_TIME_Relative delay; struct GNUNET_ATS_Properties prop; - struct GNUNET_TRANSPORT_TESTING_SendClosure sc = { - .num_messages = 1, - .get_size_cb = &get_size, - .ccc = ccc - }; + sc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_SendClosure); + sc->num_messages = 1; + sc->ccc = ccc; + sc->cont = &do_free; + sc->cont_cls = sc; if (0 == messages_recv) { start_normal = GNUNET_TIME_absolute_get (); @@ -78,20 +78,14 @@ sendtask (void *cls) { memset (&prop, 0, sizeof (prop)); delay = GNUNET_TIME_UNIT_SECONDS; - GNUNET_TRANSPORT_set_traffic_metric (ccc->p[1]->th, - &ccc->p[0]->id, - &prop, - GNUNET_TIME_UNIT_ZERO, - delay); - prop.distance = 10; GNUNET_TRANSPORT_set_traffic_metric (ccc->p[0]->th, &ccc->p[1]->id, &prop, - delay, + GNUNET_TIME_UNIT_ZERO, delay); start_delayed = GNUNET_TIME_absolute_get(); } - GNUNET_TRANSPORT_TESTING_simple_send (&sc); + GNUNET_TRANSPORT_TESTING_large_send (sc); } @@ -114,13 +108,8 @@ notify_receive (void *cls, GNUNET_free (ps); } - if ( (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE == ntohs (message->type)) && - (TEST_MESSAGE_SIZE == ntohs (message->size)) ) - { - if (GNUNET_NO == ccc->global_ret) - ccc->global_ret = GNUNET_OK; - } - else + if ( (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (message->type)) || + (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE != ntohs (message->size)) ) { GNUNET_break (0); ccc->global_ret = GNUNET_SYSERR; @@ -139,28 +128,30 @@ notify_receive (void *cls, GNUNET_YES)); GNUNET_SCHEDULER_add_now (&sendtask, NULL); + messages_recv++; + return; } - if (1 == messages_recv) + /* Received manipulated message */ + dur_delayed = GNUNET_TIME_absolute_get_duration(start_delayed); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received delayed message %u after %s\n", + messages_recv, + GNUNET_STRINGS_relative_time_to_string (dur_delayed, + GNUNET_YES)); + if (dur_delayed.rel_value_us < GNUNET_TIME_UNIT_SECONDS.rel_value_us) { - /* Received manipulated message */ - dur_delayed = GNUNET_TIME_absolute_get_duration(start_delayed); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received delayed message %u after %s\n", - messages_recv, - GNUNET_STRINGS_relative_time_to_string (dur_delayed, - GNUNET_YES)); - if (dur_delayed.rel_value_us < GNUNET_TIME_UNIT_SECONDS.rel_value_us) - { - GNUNET_break (0); - ccc->global_ret = GNUNET_SYSERR; - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Delayed message was not delayed correctly: took only %s\n", - GNUNET_STRINGS_relative_time_to_string (dur_delayed, - GNUNET_YES)); - } - GNUNET_SCHEDULER_shutdown (); + GNUNET_break (0); + ccc->global_ret = GNUNET_SYSERR; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Delayed message was not delayed correctly: took only %s\n", + GNUNET_STRINGS_relative_time_to_string (dur_delayed, + GNUNET_YES)); + } + else + { + ccc->global_ret = GNUNET_OK; } - messages_recv++; + GNUNET_SCHEDULER_shutdown (); } diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h index dc26950cb..bfed64b70 100644 --- a/src/transport/transport-testing.h +++ b/src/transport/transport-testing.h @@ -809,7 +809,7 @@ GNUNET_NETWORK_STRUCT_BEGIN struct GNUNET_TRANSPORT_TESTING_TestMessage { /** - * Type is #GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE. + * Type is (usually) #GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE. */ struct GNUNET_MessageHeader header; -- 2.25.1