/*
This file is part of GNUnet.
- Copyright (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010, 2011 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, 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 <http://www.gnu.org/licenses/>.
*/
/**
char *test_name;
-struct PeerContext *p1;
+struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-struct PeerContext *p2;
+struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc;
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+struct GNUNET_TRANSPORT_TESTING_Handle *tth;
/**
* How long until we give up on transmitting the message?
#define OKPP do { ok++; } while (0)
#endif
+
static void
-run_stage(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+run_stage(void *cls);
+
static void
-end(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Stopping\n");
if (cc != NULL )
{
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
cc = NULL;
}
if (p1 != NULL )
{
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
p1 = NULL;
}
if (p2 != NULL )
{
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
p2 = NULL;
}
}
+
static void
-end_badly(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly (void *cls)
{
die_task = NULL;
if (cc != NULL )
{
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
cc = NULL;
}
if (p1 != NULL )
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
if (p2 != NULL )
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
ok = GNUNET_SYSERR;
}
static void
-testing_connect_cb(struct PeerContext *p1, struct PeerContext *p2, void *cls)
+testing_connect_cb (void *cls)
{
cc = NULL;
char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL );
}
+
static void
-connect_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+connect_timeout (void *cls)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peers not connected, next stage\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Peers not connected, next stage\n");
timeout_task = NULL;
- stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL );
+ stage_task = GNUNET_SCHEDULER_add_now (&run_stage,
+ NULL);
}
+
static int started;
-void
-start_cb(struct PeerContext *p, void *cls)
-{
+static void
+start_cb (void *cls)
+{
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
started++;
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peer %u (`%s') started\n", p->no,
- GNUNET_i2s_full (&p->id));
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Peer %u (`%s') started\n",
+ p->no,
+ GNUNET_i2s_full (&p->id));
if (started != 2)
return;
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));
+ "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 (tth, p1, p2, &testing_connect_cb,
- NULL );
+ cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1,
+ p2,
+ &testing_connect_cb,
+ NULL);
}
-static int check_blacklist_config (char *cfg_file,
- struct GNUNET_PeerIdentity *peer, struct GNUNET_PeerIdentity *bl_peer)
+
+static int
+check_blacklist_config (const char *cfg_file,
+ struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_PeerIdentity *bl_peer)
{
struct GNUNET_CONFIGURATION_Handle *cfg;
char *section;
return GNUNET_OK;
}
+
static void
-run_stage(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_stage (void *cls)
{
stage_task = NULL;
if (NULL != die_task)
{
/* Try to connect peers successfully */
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_peer1.conf", 1, NULL, NULL, NULL,
- &start_cb, NULL );
+ "test_transport_blacklisting_cfg_peer1.conf",
+ 1,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ &start_cb,
+ NULL);
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_peer2.conf", 2, NULL, NULL, NULL,
- &start_cb, NULL );
+ "test_transport_blacklisting_cfg_peer2.conf",
+ 2,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ &start_cb,
+ NULL);
}
- else if (0
- == strcmp (test_name, "test_transport_blacklisting_outbound_bl_full"))
+ else if (0 == strcmp (test_name,
+ "test_transport_blacklisting_outbound_bl_full"))
{
- char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_full.conf";
- char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_full.conf";
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p1 , 1, NULL, NULL, NULL, &start_cb, NULL );
+ const char *cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_full.conf";
+ const char *cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_full.conf";
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p1,
+ 1, NULL, NULL, NULL,
+ NULL,
+ &start_cb, NULL);
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p2, 2, NULL, NULL, NULL,
- &start_cb, NULL );
+ cfg_p2, 2,
+ NULL, NULL, NULL,
+ NULL,
+ &start_cb, NULL);
/* check if configuration contain correct blacklist entries */
- if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
- (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
+ if ( (GNUNET_SYSERR ==
+ check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
+ (GNUNET_SYSERR ==
+ check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
{
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
p1 = NULL;
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
p2 = NULL;
ok = 1;
GNUNET_SCHEDULER_add_now (&end, NULL );
else if (0
== strcmp (test_name, "test_transport_blacklisting_outbound_bl_plugin"))
{
- char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_plugin.conf";
- char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
+ const char *cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_plugin.conf";
+ const char *cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p1, 1, NULL,
- NULL, NULL, &start_cb, NULL );
+ cfg_p1,
+ 1,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ &start_cb,
+ NULL);
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p2, 2, NULL, NULL, NULL,
- &start_cb, NULL );
+ cfg_p2, 2,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ &start_cb,
+ NULL);
/* check if configuration contain correct blacklist entries */
- if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
- (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
+ if ( (GNUNET_SYSERR ==
+ check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
+ (GNUNET_SYSERR ==
+ check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
{
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
p1 = NULL;
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
p2 = NULL;
ok = 1;
GNUNET_SCHEDULER_add_now (&end, NULL );
}
}
- else if (0
- == strcmp (test_name, "test_transport_blacklisting_inbound_bl_full"))
+ else if (0 == strcmp (test_name,
+ "test_transport_blacklisting_inbound_bl_full"))
{
- char * cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
- char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_full.conf";
+ const char *cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
+ const char *cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_full.conf";
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p1, 1, NULL, NULL, NULL,
- &start_cb, NULL );
+ cfg_p1, 1,
+ NULL,
+ NULL, NULL, NULL,
+ &start_cb, NULL);
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p2, 2, NULL, NULL,
- NULL, &start_cb, NULL );
+ cfg_p2, 2,
+ NULL,
+ NULL, NULL, NULL,
+ &start_cb, NULL);
/* check if configuration contain correct blacklist entries */
- if ((GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
+ if ( (GNUNET_SYSERR ==
+ check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
{
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
p1 = NULL;
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
p2 = NULL;
ok = 1;
GNUNET_SCHEDULER_add_now (&end, NULL );
}
}
- else if (0
- == strcmp (test_name, "test_transport_blacklisting_inbound_bl_plugin"))
+ else if (0 == strcmp (test_name,
+ "test_transport_blacklisting_inbound_bl_plugin"))
{
- char * cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
- char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
+ const char *cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
+ const char *cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p1, 1, NULL, NULL, NULL,
- &start_cb, NULL );
+ cfg_p1, 1,
+ NULL,
+ NULL, NULL, NULL,
+ &start_cb, NULL);
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p2, 2, NULL, NULL,
- NULL, &start_cb, NULL );
+ cfg_p2, 2,
+ NULL,
+ NULL, NULL,
+ NULL,
+ &start_cb, NULL);
/* check if configuration contain correct blacklist entries */
- if ((GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
+ if ( (GNUNET_SYSERR ==
+ check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
{
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
p1 = NULL;
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
p2 = NULL;
ok = 1;
GNUNET_SCHEDULER_add_now (&end, NULL );
}
}
- else if (0
- == strcmp (test_name, "test_transport_blacklisting_multiple_plugins"))
+ else if (0 == strcmp (test_name,
+ "test_transport_blacklisting_multiple_plugins"))
{
- char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf";
- char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf";
+ const char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf";
+ const char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf";
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p1, 1,
- NULL, NULL, NULL, &start_cb, NULL );
+ cfg_p1, 1,
+ NULL,
+ NULL, NULL, NULL,
+ &start_cb, NULL);
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- cfg_p2, 2,
- NULL, NULL, NULL, &start_cb, NULL );
+ cfg_p2, 2,
+ NULL,
+ NULL, NULL, NULL,
+ &start_cb, NULL);
/* check if configuration contain correct blacklist entries */
- if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
- (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
+ if ( (GNUNET_SYSERR ==
+ check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
+ (GNUNET_SYSERR ==
+ check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
{
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
p1 = NULL;
- GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
p2 = NULL;
ok = 1;
- GNUNET_SCHEDULER_add_now (&end, NULL );
+ GNUNET_SCHEDULER_add_now (&end, NULL);
}
}
else
{
GNUNET_break (0);
- GNUNET_SCHEDULER_add_now (&end, NULL );
+ GNUNET_SCHEDULER_add_now (&end, NULL);
}
if ((NULL == p1) || (NULL == p2))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to start peers\n");
ok = 1;
- GNUNET_SCHEDULER_add_now (&end, NULL );
+ GNUNET_SCHEDULER_add_now (&end, NULL);
}
timeout_task = GNUNET_SCHEDULER_add_delayed (CONNECT_TIMEOUT,
- &connect_timeout, NULL );
+ &connect_timeout,
+ NULL);
stage++;
return;
}
if (cc != NULL )
{
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
cc = NULL;
}
if (p1 != NULL )
{
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
p1 = NULL;
}
if (p2 != NULL )
{
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
p2 = NULL;
}
{
ok = 1;
- GNUNET_TRANSPORT_TESTING_get_test_name (argv0[0], &test_name);
+ test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv0[0]);
GNUNET_log_setup ("test-transport-api-blacklisting", "WARNING", NULL );