/*
This file is part of GNUnet.
- (C) 2009-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2013 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
* Task to trigger request timeout if the request is stalled due to
* congestion.
*/
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+ struct GNUNET_SCHEDULER_Task * timeout_task;
/**
* How many bytes is our notify callback waiting for?
/**
* Task for calling the HelloUpdateCallback when we already have a HELLO
*/
- GNUNET_SCHEDULER_TaskIdentifier notify_task;
+ struct GNUNET_SCHEDULER_Task * notify_task;
/**
* Closure for @e rec.
/**
* Function to call once we are done.
*/
- GNUNET_SCHEDULER_Task cont;
+ GNUNET_SCHEDULER_TaskCallback cont;
/**
* Closure for @e cont
/**
* ID of the task trying to reconnect to the service.
*/
- GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+ struct GNUNET_SCHEDULER_Task * reconnect_task;
/**
* ID of the task trying to trigger transmission for a peer while
* messages and the smallest entry in the 'ready_heap' has a time
* stamp in the future.
*/
- GNUNET_SCHEDULER_TaskIdentifier quota_task;
+ struct GNUNET_SCHEDULER_Task * quota_task;
/**
* Delay until we try to reconnect.
if (NULL == n->hn)
return;
delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
- n->th->notify_size + n->traffic_overhead);
+ n->th->notify_size + n->traffic_overhead);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"New outbound delay %llu us\n",
GNUNET_STRINGS_relative_time_to_string (delay,
"CONNECT",
GNUNET_i2s (&cim->id),
ntohl (cim->quota_out.value__));
- GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, cim->quota_out);
+ GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker,
+ cim->quota_out);
if (h->nc_cb != NULL)
h->nc_cb (h->cls, &n->id);
break;
if (bytes_physical >= bytes_msg)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Overhead for %u byte message: %u\n",
- bytes_msg, bytes_physical - bytes_msg);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Overhead for %u byte message: %u\n",
+ bytes_msg,
+ bytes_physical - bytes_msg);
n->traffic_overhead += bytes_physical - bytes_msg;
}
GNUNET_break (GNUNET_NO == n->is_ready);
n->is_ready = GNUNET_YES;
if ((NULL != n->th) && (NULL == n->hn))
{
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->th->timeout_task);
+ GNUNET_assert (NULL != n->th->timeout_task);
GNUNET_SCHEDULER_cancel (n->th->timeout_task);
- n->th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ n->th->timeout_task = NULL;
/* we've been waiting for this (congestion, not quota,
* caused delayed transmission) */
n->hn = GNUNET_CONTAINER_heap_insert (h->ready_heap, n, 0);
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
struct Neighbour *n = th->neighbour;
- n->th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ n->th->timeout_task = NULL;
GNUNET_assert (th == n->th);
GNUNET_assert (NULL == n->hn);
n->th = NULL;
/* peer not ready, wait for notification! */
GNUNET_assert (n == GNUNET_CONTAINER_heap_remove_root (h->ready_heap));
n->hn = NULL;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == n->th->timeout_task);
+ GNUNET_assert (NULL == n->th->timeout_task);
n->th->timeout_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
(n->th->timeout),
struct GNUNET_TRANSPORT_TransmitHandle *th;
struct Neighbour *n;
- h->quota_task = GNUNET_SCHEDULER_NO_TASK;
+ h->quota_task = NULL;
GNUNET_assert (NULL != h->client);
/* destroy all requests that have timed out */
while ((NULL != (n = GNUNET_CONTAINER_heap_peek (h->ready_heap))) &&
struct Neighbour *n;
GNUNET_assert (NULL != h->client);
- if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
+ if (h->quota_task != NULL)
{
GNUNET_SCHEDULER_cancel (h->quota_task);
- h->quota_task = GNUNET_SCHEDULER_NO_TASK;
+ h->quota_task = NULL;
}
if (NULL != h->control_head)
delay = GNUNET_TIME_UNIT_ZERO;
{
struct GNUNET_TRANSPORT_Handle *h = cls;
- h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ h->reconnect_task = NULL;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
{
/* shutdown, just give up */
{
struct GNUNET_TRANSPORT_TransmitHandle *th;
- GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
+ GNUNET_assert (h->reconnect_task == NULL);
if (NULL != h->cth)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth);
/* Forget about all neighbours that we used to be connected to */
GNUNET_CONTAINER_multipeermap_iterate (h->neighbours,
&neighbour_delete, h);
- if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
+ if (h->quota_task != NULL)
{
GNUNET_SCHEDULER_cancel (h->quota_task);
- h->quota_task = GNUNET_SCHEDULER_NO_TASK;
+ h->quota_task = NULL;
}
while ((NULL != (th = h->control_head)))
{
struct GNUNET_TRANSPORT_OfferHelloHandle *
GNUNET_TRANSPORT_offer_hello (struct GNUNET_TRANSPORT_Handle *handle,
const struct GNUNET_MessageHeader *hello,
- GNUNET_SCHEDULER_Task cont, void *cls)
+ GNUNET_SCHEDULER_TaskCallback cont, void *cls)
{
struct GNUNET_TRANSPORT_OfferHelloHandle *ohh;
struct GNUNET_MessageHeader *msg;
struct GNUNET_TRANSPORT_GetHelloHandle *ghh = cls;
GNUNET_assert (NULL != ghh->handle->my_hello);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != ghh->notify_task);
- ghh->notify_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_assert (NULL != ghh->notify_task);
+ ghh->notify_task = NULL;
ghh->rec (ghh->rec_cls,
(const struct GNUNET_MessageHeader *) ghh->handle->my_hello);
}
{
struct GNUNET_TRANSPORT_Handle *handle = ghh->handle;
- if (GNUNET_SCHEDULER_NO_TASK != ghh->notify_task)
+ if (NULL != ghh->notify_task)
GNUNET_SCHEDULER_cancel (ghh->notify_task);
GNUNET_CONTAINER_DLL_remove (handle->hwl_head, handle->hwl_tail, ghh);
GNUNET_free (ghh);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transport disconnect called!\n");
/* this disconnects all neighbours... */
- if (handle->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
+ if (handle->reconnect_task == NULL)
disconnect_and_schedule_reconnect (handle);
/* and now we stop trying to connect again... */
- if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ if (handle->reconnect_task != NULL)
{
GNUNET_SCHEDULER_cancel (handle->reconnect_task);
- handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ handle->reconnect_task = NULL;
}
GNUNET_CONTAINER_multipeermap_destroy (handle->neighbours);
handle->neighbours = NULL;
- if (handle->quota_task != GNUNET_SCHEDULER_NO_TASK)
+ if (handle->quota_task != NULL)
{
GNUNET_SCHEDULER_cancel (handle->quota_task);
- handle->quota_task = GNUNET_SCHEDULER_NO_TASK;
+ handle->quota_task = NULL;
}
GNUNET_free_non_null (handle->my_hello);
handle->my_hello = NULL;
}
else
{
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != th->timeout_task);
+ GNUNET_assert (NULL != th->timeout_task);
GNUNET_SCHEDULER_cancel (th->timeout_task);
- th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ th->timeout_task = NULL;
}
GNUNET_free (th);
}