/*
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
*
* This test case starts 2 peers, connects and exchanges a message
* boths peer are restarted and tested if peers reconnect
- * C code apparently.
*/
#include "platform.h"
#include "gnunet_transport_service.h"
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 900)
/**
* How long until we give up on transmitting the message?
static int ok;
-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 reconnect_task;
+static struct GNUNET_SCHEDULER_Task * reconnect_task;
static struct PeerContext *p1;
end ()
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
- 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 (reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ if (reconnect_task != NULL)
GNUNET_SCHEDULER_cancel (reconnect_task);
- reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ reconnect_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)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
if (restarted == GNUNET_YES)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer was restarted, but communication did not resume\n");
if (restarted == GNUNET_NO)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer was NOT (even) restarted\n");
- if (reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ if (reconnect_task != NULL)
GNUNET_SCHEDULER_cancel (reconnect_task);
- reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ reconnect_task = NULL;
- 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 (cc != NULL)
{
{
struct PeerContext *p = cls;
- reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ reconnect_task = NULL;
GNUNET_TRANSPORT_try_connect (p1->th, &p2->id, NULL, NULL); /*FIXME TRY_CONNECT change */
reconnect_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, p);
restart (struct PeerContext *p, char *cfg_file)
{
GNUNET_assert (p != NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting peer %u (`%4s')\n", p->no,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Restarting peer %u (`%4s')\n",
+ p->no,
GNUNET_i2s (&p->id));
GNUNET_TRANSPORT_TESTING_restart_peer (tth, p, cfg_file, &restart_cb, p);
}
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)
+ const struct GNUNET_MessageHeader *message)
{
struct PeerContext *p = cls;
struct PeerContext *t = NULL;
{
GNUNET_break (0);
ok = 1;
- 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);
}
{
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;
p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
GNUNET_free (receiver_s);
- th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, 256, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, 256,
TIMEOUT_TRANSMIT, ¬ify_ready,
p1);
}
static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
static int c;
if (th != NULL)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != send_task)
+ if (NULL != send_task)
GNUNET_SCHEDULER_cancel (send_task);
- send_task = GNUNET_SCHEDULER_NO_TASK;
+ send_task = NULL;
}
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,