[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37528 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37528 - gnunet/src/transport |
|
Date: |
Sun, 10 Jul 2016 19:42:09 +0200 |
Author: grothoff
Date: 2016-07-10 19:42:09 +0200 (Sun, 10 Jul 2016)
New Revision: 37528
Modified:
gnunet/src/transport/test_transport_api_manipulation_cfg.c
Log:
modify manipulation_cfg test to use new transport-testing lib
Modified: gnunet/src/transport/test_transport_api_manipulation_cfg.c
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_cfg.c 2016-07-10
17:34:25 UTC (rev 37527)
+++ gnunet/src/transport/test_transport_api_manipulation_cfg.c 2016-07-10
17:42:09 UTC (rev 37528)
@@ -1,6 +1,6 @@
/*
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
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
/**
- * @file transport/test_transport_api_manipulation_send_tcp.c
+ * @file transport/test_transport_api_manipulation_cfg.c
* @brief base test case for transport traffic manipulation implementation
* based onf cfg
*
@@ -53,111 +53,31 @@
*/
#define TEST_DELAY 100 * 1000LL
-static char *test_source;
-static char *test_plugin;
+static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-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 GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc;
-
static struct GNUNET_TRANSPORT_TransmitHandle *th;
-static struct GNUNET_TRANSPORT_TESTING_Handle *tth;
+static struct GNUNET_SCHEDULER_Task *send_task;
-static char *cfg_file_p1;
+static struct GNUNET_TIME_Absolute start_request;
-static char *cfg_file_p2;
-
-static struct GNUNET_TIME_Absolute start_request;
static struct GNUNET_TIME_Absolute start_response;
-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 (p1);
- GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-}
-
-
static void
-end_badly (void *cls)
+custom_shutdown (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)
+ if (NULL != th)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n"));
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
- cc = NULL;
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = 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 (p1);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 1 was not started\n"));
- if (p2 != NULL)
- GNUNET_TRANSPORT_TESTING_stop_peer (p2);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 2 was not started\n"));
-
- ok = GNUNET_SYSERR;
+ if (NULL != send_task)
+ {
+ GNUNET_SCHEDULER_cancel (send_task);
+ send_task = NULL;
+ }
}
@@ -168,15 +88,12 @@
struct GNUNET_MessageHeader *hdr;
th = NULL;
-
- if (buf == NULL)
+ if (NULL == buf)
{
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;
+ GNUNET_SCHEDULER_shutdown ();
+ ccc->global_ret = 42;
return 0;
}
@@ -187,11 +104,11 @@
hdr->type = htons (TEST_REQUEST_MESSAGE_TYPE);
{
- char *ps = GNUNET_strdup (GNUNET_i2s (&p1->id));
+ 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",
- p1->no, ps,
+ ccc->p[0]->no, ps,
ntohs (hdr->type),
ntohs (hdr->size),
p->no,
@@ -207,18 +124,25 @@
sendtask_request_task (void *cls)
{
send_task = NULL;
- char *receiver_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
+ {
+ char *receiver_s = GNUNET_strdup (GNUNET_i2s (&ccc->p[1]->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
- p1->no, GNUNET_i2s (&p1->id), p2->no, receiver_s);
- GNUNET_free (receiver_s);
+ 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);
+ }
- s_sending = GNUNET_YES;
- start_request = GNUNET_TIME_absolute_get();
- th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th, &p2->id,
TEST_MESSAGE_SIZE,
- TIMEOUT_TRANSMIT,
¬ify_request_ready,
- p2);
+ 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]);
}
@@ -229,15 +153,12 @@
struct GNUNET_MessageHeader *hdr;
th = NULL;
-
- if (buf == NULL)
+ if (NULL == buf)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"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;
+ GNUNET_SCHEDULER_shutdown ();
+ ccc->global_ret = 42;
return 0;
}
@@ -248,10 +169,10 @@
hdr->type = htons (TEST_RESPONSE_MESSAGE_TYPE);
{
- char *ps = GNUNET_strdup (GNUNET_i2s (&p1->id));
+ 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",
- p1->no,
+ ccc->p[0]->no,
ps,
ntohs (hdr->type),
ntohs (hdr->size),
@@ -269,265 +190,133 @@
{
send_task = NULL;
{
- char *receiver_s = GNUNET_strdup (GNUNET_i2s (&p1->id));
+ 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",
- p2->no,
- GNUNET_i2s (&p2->id),
- p1->no,
+ ccc->p[1]->no,
+ GNUNET_i2s (&ccc->p[1]->id),
+ ccc->p[0]->no,
receiver_s);
GNUNET_free (receiver_s);
}
-
- s_sending = GNUNET_YES;
start_response = GNUNET_TIME_absolute_get();
- th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th,
- &p1->id,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (ccc->p[1]->th,
+ &ccc->p[0]->id,
TEST_MESSAGE_SIZE,
TIMEOUT_TRANSMIT,
¬ify_response_ready,
- p1);
+ ccc->p[0]);
}
-
static void
-notify_receive (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_MessageHeader *message)
{
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- struct GNUNET_TRANSPORT_TESTING_PeerContext *t = NULL;
struct GNUNET_TIME_Relative duration;
- 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 (&receiver->id));
- char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%s') received message of type %d and size %u size
from peer %s)!\n",
+ receiver->no,
+ ps,
+ ntohs (message->type),
+ ntohs (message->size),
+ GNUNET_i2s (sender));
+ GNUNET_free (ps);
+ }
- 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);
-
switch (ntohs (message->type)) {
- case TEST_REQUEST_MESSAGE_TYPE:
- 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,
- "Request message was delayed for
unexpected duration %s\n",
- GNUNET_STRINGS_relative_time_to_string
(duration,
-
GNUNET_YES));
- ok = 1;
- }
-
- /* Send response */
- send_task = GNUNET_SCHEDULER_add_now
(&sendtask_response_task, NULL);
- return;
- break;
- 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));
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Response message was delayed for
unexpected duration %s\n",
- GNUNET_STRINGS_relative_time_to_string
(duration,
-
GNUNET_YES));
- ok = 1;
- }
- /* Done */
- ok = 0;
- end();
- break;
- default:
- break;
- }
-}
-
-
-
-static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
- static int c;
-
- c++;
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- struct GNUNET_TRANSPORT_TESTING_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'): peer %u (`%s') connected to me!\n", p->no, ps,
- t->no, GNUNET_i2s (peer));
- GNUNET_free (ps);
-}
-
-
-static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- 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;
-}
-
-
-static void
-testing_connect_cb (void *cls)
-{
- cc = NULL;
- char *p1_c = GNUNET_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);
-
- s_connected = GNUNET_YES;
- send_task = GNUNET_SCHEDULER_add_now (&sendtask_request_task, NULL);
-}
-
-
-static void
-start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p, void *cls)
-{
- static int started;
- started++;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
- GNUNET_i2s (&p->id));
-
- if (started != 2)
+ case TEST_REQUEST_MESSAGE_TYPE:
+ 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,
+ "Request message was delayed for unexpected duration %s\n",
+ GNUNET_STRINGS_relative_time_to_string (duration,
+ GNUNET_YES));
+ ccc->global_ret = GNUNET_SYSERR;
+ GNUNET_SCHEDULER_shutdown ();
+ }
+ /* Send response */
+ send_task = GNUNET_SCHEDULER_add_now (&sendtask_response_task,
+ NULL);
return;
- else
- s_started = GNUNET_YES;
- 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);
-
- cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb,
- NULL);
-
+ 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));
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Response message was delayed for unexpected duration %s\n",
+ 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:
+ break;
+ }
}
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+notify_disconnect (void *cls,
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
+ const struct GNUNET_PeerIdentity *other)
{
- 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_TRANSPORT_TESTING_log_disconnect (cls,
+ me,
+ other);
+ if (NULL != th)
{
- 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;
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
}
}
-static int
-check ()
+int
+main (int argc, char *argv[])
{
- static char *const argv[] = { "test-transport-api-manipulation",
- "-c",
- "test_transport_api_data.conf",
- NULL
+ struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
+ .connect_continuation = &sendtask_request_task,
+ .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
};
- 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;
+ ccc = &my_ccc;
+ if (GNUNET_OK !=
+ GNUNET_TRANSPORT_TESTING_main (2,
+ &GNUNET_TRANSPORT_TESTING_connect_check,
+ ccc))
+ return 1;
+ return 0;
}
-int
-main (int argc, char *argv[])
-{
- int ret;
- test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv[0]);
- test_source = GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__);
- test_plugin = GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0],
- test_source);
-
- GNUNET_log_setup (test_name,
- "WARNING",
- NULL);
- tth = GNUNET_TRANSPORT_TESTING_init ();
-
- cfg_file_p1 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 1);
- cfg_file_p2 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 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);
-
- return ret;
-}
-
-/* end of test_transport_api.c */
+/* end of test_transport_api_manipulation_cfg.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37528 - gnunet/src/transport,
gnunet <=