X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_manipulation_recv_tcp.c;h=40e0b6a4dbd0d0496493b9fa8a8cf9426b569c8c;hb=ad1244d958b76cb249028c7ad87ff84df49293ff;hp=7b82236f9ac29ff6cbf14a38c52bc548a84f35c3;hpb=29e6158507a0758192075ac6ece7ba8e75ddc49a;p=oweals%2Fgnunet.git diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c index 7b82236f9..40e0b6a4d 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp.c +++ b/src/transport/test_transport_api_manipulation_recv_tcp.c @@ -1,21 +1,19 @@ /* This file is part of GNUnet. - Copyright (C) 2009, 2010 GNUnet e.V. + Copyright (C) 2009, 2010, 2016 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 - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_manipulation_recv_tcp.c @@ -36,492 +34,166 @@ */ #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 char *test_source; - -static char *test_plugin; - -static char *test_name; - -static int ok; - -static int s_started; - -static int s_connected; -static int s_sending; - -static struct GNUNET_SCHEDULER_Task * die_task; - -static struct GNUNET_SCHEDULER_Task * send_task; - -static struct PeerContext *p1; - -static struct PeerContext *p2; - -static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc; - -static struct GNUNET_TRANSPORT_TransmitHandle *th; - -static struct GNUNET_TRANSPORT_TESTING_handle *tth; - -static char *cfg_file_p1; - -static char *cfg_file_p2; +static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc; static int messages_recv; static struct GNUNET_TIME_Absolute start_normal; + static struct GNUNET_TIME_Relative dur_normal; static struct GNUNET_TIME_Absolute start_delayed; -static struct GNUNET_TIME_Relative dur_delayed; -static void -end () -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); - - if (send_task != NULL) - GNUNET_SCHEDULER_cancel (send_task); - - if (die_task != NULL) - GNUNET_SCHEDULER_cancel (die_task); - - if (th != NULL) - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; - - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); -} +static struct GNUNET_TIME_Relative dur_delayed; static void -end_badly (void *cls) +do_free (void *cls) { - die_task = NULL; - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); - - - if (send_task != NULL) - GNUNET_SCHEDULER_cancel (send_task); - - if (cc != NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n")); - GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); - cc = NULL; - } - - if (th != NULL) - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not ready to send data\n")); - - if (s_started == GNUNET_NO) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peers were not started \n")); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peers were started \n")); - - if (s_connected == GNUNET_NO) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not connected\n")); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were connected\n")); - - if (s_sending == GNUNET_NO) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not ready to send data\n")); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were ready to send data\n")); - - th = NULL; - - if (p1 != NULL) - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 1 was not started\n")); - if (p2 != NULL) - GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 2 was not started\n")); - - ok = GNUNET_SYSERR; + struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls; + + GNUNET_free (sc); } static void -sendtask (void *cls); - - -static void -notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message) +delayed_transmit (void *cls) { - struct PeerContext *p = cls; - struct PeerContext *t = NULL; - - if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) - t = p1; - if (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity))) - t = p2; - GNUNET_assert (t != NULL); - - char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer %u (`%4s') received message of type %d and size %u size from peer %u (`%4s')!\n", - p->no, ps, ntohs (message->type), ntohs (message->size), t->no, - GNUNET_i2s (&t->id)); - GNUNET_free (ps); - - if ((TEST_MESSAGE_TYPE == ntohs (message->type)) && - (TEST_MESSAGE_SIZE == ntohs (message->size))) - { - ok = 0; - - } - else - { - GNUNET_break (0); - ok = 1; - end (); - return; - } - - if (messages_recv <= 1) - { - /* Received non-delayed message */ - 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 (p1->th, - &p2->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 < 1000 * 1000LL) - { - GNUNET_break (0); - ok += 1; - 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 */ - end (); - } - - messages_recv ++; -} - - -static size_t -notify_ready (void *cls, size_t size, void *buf) -{ - struct PeerContext *p = cls; - struct GNUNET_MessageHeader *hdr; - - th = NULL; - - if (buf == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Timeout occurred while waiting for transmit_ready\n"); - if (NULL != die_task) - GNUNET_SCHEDULER_cancel (die_task); - die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); - ok = 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 (&p2->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer %u (`%4s') sending message with type %u and size %u bytes to peer %u (`%4s')\n", - p2->no, - ps, - ntohs (hdr->type), - ntohs (hdr->size), - p->no, - GNUNET_i2s (&p->id)); - GNUNET_free (ps); - } - - return TEST_MESSAGE_SIZE; + struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls; + + start_delayed = GNUNET_TIME_absolute_get (); + GNUNET_TRANSPORT_TESTING_large_send (sc); } static void sendtask (void *cls) { - const struct GNUNET_SCHEDULER_TaskContext *tc; - - send_task = NULL; - tc = GNUNET_SCHEDULER_get_task_context (); - if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) - return; - char *receiver_s = GNUNET_strdup (GNUNET_i2s (&p1->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n", - p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s); - GNUNET_free (receiver_s); - - + 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) { start_normal = GNUNET_TIME_absolute_get(); } - if (1 == messages_recv) + if (0 < messages_recv) { - start_delayed = GNUNET_TIME_absolute_get(); + memset (&prop, + 0, + sizeof (prop)); + delay = GNUNET_TIME_UNIT_SECONDS; + GNUNET_TRANSPORT_manipulation_set (ccc->p[1]->tmh, + &ccc->p[0]->id, + &prop, + delay, + GNUNET_TIME_UNIT_ZERO); + /* wait 1s to allow manipulation to go into effect */ + if (1 == messages_recv) + { + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, + &delayed_transmit, + sc); + return; + } } - - s_sending = GNUNET_YES; - th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, - &p1->id, - TEST_MESSAGE_SIZE, - TIMEOUT_TRANSMIT, - ¬ify_ready, - p1); + GNUNET_TRANSPORT_TESTING_large_send (sc); } static void -notify_connect (void *cls, - const struct GNUNET_PeerIdentity *peer) +notify_receive (void *cls, + struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver, + const struct GNUNET_PeerIdentity *sender, + const struct GNUNET_TRANSPORT_TESTING_TestMessage *message) { - static int c; - - c++; - struct PeerContext *p = cls; - struct PeerContext *t = NULL; - - if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) - t = p1; - if (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity))) - t = p2; - GNUNET_assert (t != NULL); - { - char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); + char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer %u (`%4s'): peer %u (`%s') connected to me!\n", - p->no, + "Peer %u (`%s') received message of type %d and size %u size from peer %s)!\n", + receiver->no, ps, - t->no, - GNUNET_i2s (peer)); + ntohs (message->header.type), + ntohs (message->header.size), + GNUNET_i2s (sender)); GNUNET_free (ps); } -} - - -static void -notify_disconnect (void *cls, - const struct GNUNET_PeerIdentity *peer) -{ - struct PeerContext *p = cls; - + if ( (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (message->header.type)) || + (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE != ntohs (message->header.size)) ) { - char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer %u (`%4s'): peer (`%s') disconnected from me!\n", - p->no, - ps, - GNUNET_i2s (peer)); - GNUNET_free (ps); - } - - if (th != NULL) - { - GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); - th = NULL; + GNUNET_break (0); + ccc->global_ret = GNUNET_SYSERR; + GNUNET_SCHEDULER_shutdown (); + return; } -} - - -static void -testing_connect_cb (struct PeerContext *p1, - struct PeerContext *p2, - void *cls) -{ - cc = NULL; + if (messages_recv <= 2) { - char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); - + /* Received non-delayed message */ + dur_normal = GNUNET_TIME_absolute_get_duration (start_normal); 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); + "Received non-delayed message %u after %s\n", + messages_recv, + GNUNET_STRINGS_relative_time_to_string (dur_normal, + GNUNET_YES)); + GNUNET_SCHEDULER_add_now (&sendtask, + NULL); + messages_recv++; + return; } - - s_connected = GNUNET_YES; - send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL); -} - - -static void -start_cb (struct PeerContext *p, void *cls) -{ - static int started; - started++; - + /* Received manipulated message */ + dur_delayed = GNUNET_TIME_absolute_get_duration(start_delayed); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer %u (`%s') started\n", - p->no, - GNUNET_i2s (&p->id)); - - if (started != 2) - return; - else - s_started = GNUNET_YES; + "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) { - char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n", - p1->no, - sender_c, - p2->no, - GNUNET_i2s (&p2->id)); - GNUNET_free (sender_c); + 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)); } - - cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, - p1, - p2, - &testing_connect_cb, - NULL); - -} - - -static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) -{ - die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); - - s_started = GNUNET_NO; - s_connected = GNUNET_NO; - s_sending = GNUNET_NO; - - p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, - ¬ify_receive, ¬ify_connect, - ¬ify_disconnect, &start_cb, - NULL); - - p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2, - ¬ify_receive, ¬ify_connect, - ¬ify_disconnect, &start_cb, - NULL); - - if ((p1 == NULL) || (p2 == NULL)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); - if (die_task != NULL) - GNUNET_SCHEDULER_cancel (die_task); - die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); - return; + else + { + ccc->global_ret = GNUNET_OK; } + /* shutdown */ + GNUNET_SCHEDULER_shutdown (); } -static int -check () -{ - static char *const argv[] = { "test-transport-api-manipulation", - "-c", - "test_transport_api_data.conf", - NULL - }; - static struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - - send_task = NULL; - - ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, - "nohelp", options, &run, &ok); - - return ok; -} - int -main (int argc, char *argv[]) +main (int argc, + char *argv[]) { - int ret; - - GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); - GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); - GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source, - &test_plugin); - - GNUNET_log_setup (test_name, - "WARNING", - NULL); - tth = GNUNET_TRANSPORT_TESTING_init (); - - 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_free (cfg_file_p1); - GNUNET_free (cfg_file_p2); - - GNUNET_free (test_source); - GNUNET_free (test_plugin); - GNUNET_free (test_name); - - GNUNET_TRANSPORT_TESTING_done (tth); + 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 = &GNUNET_TRANSPORT_TESTING_log_disconnect, + .timeout = TIMEOUT, + .global_ret = GNUNET_NO + }; - return ret; + ccc = &my_ccc; + if (GNUNET_OK != + GNUNET_TRANSPORT_TESTING_main (2, + &GNUNET_TRANSPORT_TESTING_connect_check, + ccc)) + return 1; + return 0; } /* end of test_transport_api_manipulation_recv_tcp.c */