/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
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.
*/
/**
#include "gnunet_transport_service.h"
#include "transport-testing.h"
-struct PeerContext *p1;
+static struct PeerContext *p1;
-struct PeerContext *p2;
+static struct PeerContext *p2;
static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
-struct GNUNET_TRANSPORT_TransmitHandle *th;
+static struct GNUNET_TRANSPORT_TransmitHandle *th;
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+static struct GNUNET_TRANSPORT_TESTING_handle *tth;
/**
* How long until we give up on transmitting the message?
static int blacklist_request_p1;
static int blacklist_request_p2;
-struct GNUNET_TRANSPORT_Blacklist * blacklist_p1;
+static struct GNUNET_TRANSPORT_Blacklist * blacklist_p1;
-struct GNUNET_TRANSPORT_Blacklist * blacklist_p2;
+static struct GNUNET_TRANSPORT_Blacklist * blacklist_p2;
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
-static GNUNET_SCHEDULER_TaskIdentifier send_task;
+static struct GNUNET_SCHEDULER_Task * send_task;
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static struct GNUNET_SCHEDULER_Task * shutdown_task;
#if VERBOSE
#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping\n");
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ if (send_task != NULL)
GNUNET_SCHEDULER_cancel (send_task);
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (die_task != NULL)
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
}
if (cc != NULL)
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ if (send_task != NULL)
{
GNUNET_SCHEDULER_cancel (send_task);
- send_task = GNUNET_SCHEDULER_NO_TASK;
+ send_task = NULL;
}
- if (shutdown_task != GNUNET_SCHEDULER_NO_TASK)
+ if (shutdown_task != NULL)
{
GNUNET_SCHEDULER_cancel (shutdown_task);
- shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+ shutdown_task = NULL;
}
if (cc != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready\n");
- if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ if (NULL != die_task)
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
}
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
static void
sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- send_task = GNUNET_SCHEDULER_NO_TASK;
+ send_task = NULL;
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
GNUNET_free (receiver_s);
- th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, TEST_MESSAGE_SIZE, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id,
+ TEST_MESSAGE_SIZE,
TIMEOUT_TRANSMIT, ¬ify_ready,
p1);
}
+
static void
notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
th = NULL;
}
+
static void
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
{
}
-int blacklist_cb (void *cls,
- const struct
- GNUNET_PeerIdentity * pid)
+static int
+blacklist_cb (void *cls,
+ const struct
+ GNUNET_PeerIdentity * pid)
{
struct PeerContext * p = cls;
int res = GNUNET_SYSERR;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u : Blacklist request for peer `%s'\n", p->no, GNUNET_i2s (pid));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u : Blacklist request for peer `%s'\n",
+ p->no,
+ GNUNET_i2s (pid));
if (p == p1)
{
res = GNUNET_SYSERR;
}
- if (((blacklist_request_p2 == GNUNET_YES) && (blacklist_request_p1 == GNUNET_YES)) && (shutdown_task == GNUNET_SCHEDULER_NO_TASK))
+ if (((blacklist_request_p2 == GNUNET_YES) && (blacklist_request_p1 == GNUNET_YES)) && (shutdown_task == NULL))
{
shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3), &end, NULL);
}
return res;
}
-void
+
+static void
start_cb (struct PeerContext *p, void *cls)
{
static int started;
}
+
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)