/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010 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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file transport/test_transport_testing_startstop.c
*
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
#include "gnunet_transport_service.h"
-#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_NO
-
-#define VERBOSE_ARM GNUNET_NO
-
-#define START_ARM GNUNET_YES
-
/**
* How long until we give up on transmitting the message?
*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+struct GNUNET_SCHEDULER_Task * timeout_task;
static struct PeerContext *p;
-//static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
-
struct GNUNET_TRANSPORT_TESTING_handle *tth;
static int ret = 0;
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
- if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (timeout_task != NULL)
GNUNET_SCHEDULER_cancel (timeout_task);
- if (NULL != p)
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
GNUNET_TRANSPORT_TESTING_done (tth);
}
static void
end_badly ()
{
- timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ timeout_task = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
- if (p != NULL)
+ if (NULL != p)
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
- GNUNET_TRANSPORT_TESTING_done (tth);
+ if (NULL != tth)
+ GNUNET_TRANSPORT_TESTING_done (tth);
ret = GNUNET_SYSERR;
}
-#if 0
-static void
-testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
-{
- char *ps = GNUNET_strdup (GNUNET_i2s (&p1->id));
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %u (`%4s') connected to peer %u (`%s')!\n", p1->no, ps,
- p2->no, GNUNET_i2s (&p2->id));
- GNUNET_free (ps);
- GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-
-static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n",
- GNUNET_i2s (peer));
- connected++;
-}
static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' disconnected \n",
- GNUNET_i2s (peer));
-}
-
-static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving\n");
-}
-
-
-
-void
start_cb (struct PeerContext *p, void *cls)
{
- static int started;
-
- started++;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') successfully started\n",
+ p->no,
GNUNET_i2s (&p->id));
- if (started != 2)
- return;
-
- char *sender_c = GNUNET_strdup (GNUNET_i2s (&p->id));
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
- p->no, sender_c, p2->no, GNUNET_i2s (&p2->id));
- GNUNET_free (sender_c);
-
- cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p, p2, &testing_connect_cb,
- NULL);
+ ret = 0;
+ GNUNET_SCHEDULER_add_now (&end, NULL);
}
-#endif
+
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ ret = 1;
tth = GNUNET_TRANSPORT_TESTING_init ();
GNUNET_assert (NULL != tth);
timeout_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &end_badly, NULL);
- GNUNET_SCHEDULER_add_now (&end, NULL);
+ p = GNUNET_TRANSPORT_TESTING_start_peer(tth, cfgfile, 1,
+ NULL, /* receive cb */
+ NULL, /* connect cb */
+ NULL, /* disconnect cb */
+ start_cb, /* startup cb */
+ NULL); /* closure */
+ if (NULL == p)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to start peer\n");
+ if (timeout_task != NULL)
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ }
}
int
main (int argc, char *argv[])
{
GNUNET_log_setup ("test_transport_testing_startstop",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
char *const argv_1[] = { "test_transport_testing",
"-c",
"test_transport_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};