/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010 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
static int s_sending;
-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 struct PeerContext *p1;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Stopping peers\n");
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ if (send_task != NULL)
+ {
GNUNET_SCHEDULER_cancel (send_task);
+ send_task = NULL;
+ }
- 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 (th != NULL)
pmc_p2 = NULL;
}
-
-
ok = 0;
}
end_badly (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
-
+ die_task = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Fail! Stopping peers\n");
-
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ if (send_task != NULL)
+ {
GNUNET_SCHEDULER_cancel (send_task);
+ send_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_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;
enum GNUNET_TRANSPORT_PeerState state,
struct GNUNET_TIME_Absolute state_timeout)
{
- if ((NULL == peer) || (NULL == p1))
+ if ((NULL == address) || (NULL == p1))
return;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Monitor 1: %s %s %s\n",
- GNUNET_i2s (peer),
+ GNUNET_i2s (&address->peer),
GNUNET_TRANSPORT_ps2s (state),
GNUNET_STRINGS_absolute_time_to_string(state_timeout));
- if ((0 == memcmp (peer, &p2->id, sizeof (p2->id)) &&
+ if ((0 == memcmp (&address->peer, &p2->id, sizeof (p2->id)) &&
(GNUNET_YES == GNUNET_TRANSPORT_is_connected(state)) &&
GNUNET_NO == p1_c) )
{
enum GNUNET_TRANSPORT_PeerState state,
struct GNUNET_TIME_Absolute state_timeout)
{
- if ((NULL == peer) || (NULL == p2))
+ if ((NULL == address) || (NULL == p2))
return;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Monitor 2: %s %s %s\n",
- GNUNET_i2s (peer),
+ GNUNET_i2s (&address->peer),
GNUNET_TRANSPORT_ps2s (state),
GNUNET_STRINGS_absolute_time_to_string(state_timeout));
- if ((0 == memcmp (peer, &p1->id, sizeof (p1->id)) &&
+ if ((0 == memcmp (&address->peer, &p1->id, sizeof (p1->id)) &&
(GNUNET_YES == GNUNET_TRANSPORT_is_connected(state)) &&
GNUNET_NO == p2_c) )
{
if ((p1 == NULL) || (p2 == NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (die_task != NULL)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
GNUNET_GETOPT_OPTION_END
};
- send_task = GNUNET_SCHEDULER_NO_TASK;
+ send_task = NULL;
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,