/*
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
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.
*/
/**
#define LOG(kind,...) GNUNET_log_from (kind, "transport-api",__VA_ARGS__)
+/**
+ * If we could not send any payload to a peer for this amount of
+ * time, we print a warning.
+ */
+#define UNREADY_WARN_TIME GNUNET_TIME_UNIT_MINUTES
+
/**
* How large to start with for the hashmap of neighbours.
*/
struct Neighbour *neighbour;
/**
- * Function to call when notify_size bytes are available
+ * Function to call when @e notify_size bytes are available
* for transmission.
*/
- GNUNET_CONNECTION_TransmitReadyNotify notify;
+ GNUNET_TRANSPORT_TransmitReadyNotify notify;
/**
- * Closure for notify.
+ * Closure for @e notify.
*/
void *notify_cls;
+ /**
+ * Time at which this request was originally scheduled.
+ */
+ struct GNUNET_TIME_Absolute request_start;
+
/**
* Timeout for this request, 0 for control messages.
*/
* 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?
*/
size_t notify_size;
- /**
- * How important is this message? Not used for control messages.
- */
- uint32_t priority;
-
};
/**
- * Entry in hash table of all of our current neighbours.
+ * Entry in hash table of all of our current (connected) neighbours.
*/
struct Neighbour
{
struct GNUNET_BANDWIDTH_Tracker out_tracker;
/**
- * Entry in our readyness heap (which is sorted by 'next_ready'
+ * Entry in our readyness heap (which is sorted by @e next_ready
* value). NULL if there is no pending transmission request for
- * this neighbour or if we're waiting for 'is_ready' to become
- * true AFTER the 'out_tracker' suggested that this peer's quota
- * has been satisfied (so once 'is_ready' goes to GNUNET_YES,
+ * this neighbour or if we're waiting for @e is_ready to become
+ * true AFTER the @e out_tracker suggested that this peer's quota
+ * has been satisfied (so once @e is_ready goes to #GNUNET_YES,
* we should immediately go back into the heap).
*/
struct GNUNET_CONTAINER_HeapNode *hn;
+ /**
+ * Last time when this peer received payload from us.
+ */
+ struct GNUNET_TIME_Absolute last_payload;
+
+ /**
+ * Task to trigger warnings if we do not get SEND_OK after a while.
+ */
+ struct GNUNET_SCHEDULER_Task *unready_warn_task;
+
/**
* Is this peer currently ready to receive a message?
*/
/**
* 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.
};
+
/**
- * Linked list for all try-connect requests
+ * Entry in linked list for a try-connect request.
*/
struct GNUNET_TRANSPORT_TryConnectHandle
{
*/
struct GNUNET_TRANSPORT_TryConnectHandle *next;
+ /**
+ * Peer we should try to connect to.
+ */
struct GNUNET_PeerIdentity pid;
+ /**
+ * Transport service handle this request is part of.
+ */
struct GNUNET_TRANSPORT_Handle *th;
+ /**
+ * Message transmission request to communicate to service.
+ */
struct GNUNET_TRANSPORT_TransmitHandle *tth;
+ /**
+ * Function to call upon completion (of request transmission).
+ */
GNUNET_TRANSPORT_TryConnectCallback cb;
/**
* Closure for @e cb.
*/
void *cb_cls;
+
+};
+
+
+/**
+ * Entry in linked list for all try-disconnect requests
+ */
+struct GNUNET_TRANSPORT_TryDisconnectHandle
+{
+ /**
+ * For the DLL.
+ */
+ struct GNUNET_TRANSPORT_TryDisconnectHandle *prev;
+
+ /**
+ * For the DLL.
+ */
+ struct GNUNET_TRANSPORT_TryDisconnectHandle *next;
+
+ /**
+ * Peer we should try to connect to.
+ */
+ struct GNUNET_PeerIdentity pid;
+
+ /**
+ * Transport service handle this request is part of.
+ */
+ struct GNUNET_TRANSPORT_Handle *th;
+
+ /**
+ * Message transmission request to communicate to service.
+ */
+ struct GNUNET_TRANSPORT_TransmitHandle *tth;
+
+ /**
+ * Function to call upon completion (of request transmission).
+ */
+ GNUNET_TRANSPORT_TryDisconnectCallback cb;
+
+ /**
+ * Closure for @e cb.
+ */
+ void *cb_cls;
+
};
/**
- * Linked list for all try-connect requests
+ * Entry in linked list for all offer-HELLO requests.
*/
struct GNUNET_TRANSPORT_OfferHelloHandle
{
*/
struct GNUNET_TRANSPORT_OfferHelloHandle *next;
+ /**
+ * Transport service handle we use for transmission.
+ */
struct GNUNET_TRANSPORT_Handle *th;
+ /**
+ * Transmission handle for this request.
+ */
struct GNUNET_TRANSPORT_TransmitHandle *tth;
- GNUNET_SCHEDULER_Task cont;
+ /**
+ * Function to call once we are done.
+ */
+ GNUNET_SCHEDULER_TaskCallback cont;
/**
* Closure for @e cont
*/
void *cls;
+ /**
+ * The HELLO message to be transmitted.
+ */
struct GNUNET_MessageHeader *msg;
};
*/
GNUNET_TRANSPORT_NotifyDisconnect nd_cb;
+ /**
+ * function to call on excess bandwidth events
+ */
+ GNUNET_TRANSPORT_NotifyExcessBandwidth neb_cb;
+
/**
* Head of DLL of control messages.
*/
* The current HELLO message for this peer. Updated
* whenever transports change their addresses.
*/
- struct GNUNET_HELLO_Message *my_hello;
+ struct GNUNET_MessageHeader *my_hello;
/**
* My client connection to the transport service.
*/
struct GNUNET_TRANSPORT_TryConnectHandle *tc_tail;
+ /**
+ * Linked list of pending try disconnect requests head
+ */
+ struct GNUNET_TRANSPORT_TryDisconnectHandle *td_head;
+
+ /**
+ * Linked list of pending try connect requests tail
+ */
+ struct GNUNET_TRANSPORT_TryDisconnectHandle *td_tail;
+
/**
* Linked list of pending offer HELLO requests head
*/
/**
* Hash map of the current connected neighbours of this peer.
- * Maps peer identities to 'struct Neighbour' entries.
+ * Maps peer identities to `struct Neighbour` entries.
*/
struct GNUNET_CONTAINER_MultiPeerMap *neighbours;
* Heap sorting peers with pending messages by the timestamps that
* specify when we could next send a message to the respective peer.
* Excludes control messages (which can always go out immediately).
- * Maps time stamps to 'struct Neighbour' entries.
+ * Maps time stamps to `struct Neighbour` entries.
*/
struct GNUNET_CONTAINER_Heap *ready_heap;
/**
* 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
* maintaining bandwidth quotas. In use if there are no control
- * messages and the smallest entry in the 'ready_heap' has a time
+ * messages and the smallest entry in the @e 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.
};
-
/**
* Schedule the task to send one message, either from the control
* list or the peer message queues to the service.
disconnect_and_schedule_reconnect (struct GNUNET_TRANSPORT_Handle *h);
+/**
+ * A neighbour has not gotten a SEND_OK in a while. Print a warning.
+ *
+ * @param cls the `struct Neighbour`
+ * @param tc scheduler context
+ */
+static void
+do_warn_unready (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct Neighbour *n = cls;
+ struct GNUNET_TIME_Relative delay;
+
+ delay = GNUNET_TIME_absolute_get_duration (n->last_payload);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Lacking SEND_OK, no payload could be send to %s for %s\n",
+ GNUNET_i2s (&n->id),
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
+ n->unready_warn_task
+ = GNUNET_SCHEDULER_add_delayed (UNREADY_WARN_TIME,
+ &do_warn_unready,
+ n);
+}
+
+
/**
* Get the neighbour list entry for the given peer
*
neighbour_find (struct GNUNET_TRANSPORT_Handle *h,
const struct GNUNET_PeerIdentity *peer)
{
- return GNUNET_CONTAINER_multipeermap_get (h->neighbours, peer);
+ return GNUNET_CONTAINER_multipeermap_get (h->neighbours,
+ peer);
+}
+
+
+/**
+ * The outbound quota has changed in a way that may require
+ * us to reset the timeout. Update the timeout.
+ *
+ * @param cls the `struct Neighbour` for which the timeout changed
+ */
+static void
+outbound_bw_tracker_update (void *cls)
+{
+ struct Neighbour *n = cls;
+ struct GNUNET_TIME_Relative delay;
+
+ if (NULL == n->hn)
+ return;
+ delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
+ n->th->notify_size + n->traffic_overhead);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "New outbound delay %s us\n",
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_NO));
+ GNUNET_CONTAINER_heap_update_cost (n->h->ready_heap,
+ n->hn, delay.rel_value_us);
+ schedule_transmission (n->h);
+}
+
+
+/**
+ * Function called by the bandwidth tracker if we have excess
+ * bandwidth.
+ *
+ * @param cls the `struct Neighbour` that has excess bandwidth
+ */
+static void
+notify_excess_cb (void *cls)
+{
+ struct Neighbour *n = cls;
+ struct GNUNET_TRANSPORT_Handle *h = n->h;
+
+ if (NULL != h->neb_cb)
+ h->neb_cb (h->cls,
+ &n->id);
}
struct Neighbour *n;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Creating entry for neighbour `%4s'.\n",
+ "Creating entry for neighbour `%s'.\n",
GNUNET_i2s (pid));
n = GNUNET_new (struct Neighbour);
n->id = *pid;
n->h = h;
n->is_ready = GNUNET_YES;
n->traffic_overhead = 0;
- GNUNET_BANDWIDTH_tracker_init (&n->out_tracker,
- GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
- MAX_BANDWIDTH_CARRY_S);
+ GNUNET_BANDWIDTH_tracker_init2 (&n->out_tracker,
+ &outbound_bw_tracker_update,
+ n,
+ GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
+ MAX_BANDWIDTH_CARRY_S,
+ ¬ify_excess_cb,
+ n);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_put (h->neighbours,
- &n->id, n,
+ &n->id,
+ n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
return n;
}
*/
static int
neighbour_delete (void *cls,
- const struct GNUNET_PeerIdentity *key, void *value)
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct GNUNET_TRANSPORT_Handle *handle = cls;
struct Neighbour *n = value;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Dropping entry for neighbour `%s'.\n",
+ GNUNET_i2s (key));
+ GNUNET_BANDWIDTH_tracker_notification_stop (&n->out_tracker);
if (NULL != handle->nd_cb)
- handle->nd_cb (handle->cls, &n->id);
+ handle->nd_cb (handle->cls,
+ &n->id);
+ if (NULL != n->unready_warn_task)
+ {
+ GNUNET_SCHEDULER_cancel (n->unready_warn_task);
+ n->unready_warn_task = NULL;
+ }
GNUNET_assert (NULL == n->th);
GNUNET_assert (NULL == n->hn);
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multipeermap_remove (handle->neighbours, key,
+ GNUNET_CONTAINER_multipeermap_remove (handle->neighbours,
+ key,
n));
GNUNET_free (n);
return GNUNET_YES;
* @param msg message received, NULL on timeout or fatal error
*/
static void
-demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
+demultiplexer (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_TRANSPORT_Handle *h = cls;
const struct DisconnectInfoMessage *dim;
uint32_t bytes_physical;
GNUNET_assert (NULL != h->client);
+ if (GNUNET_YES == h->reconnecting)
+ {
+ return;
+ }
if (NULL == msg)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Error receiving from transport service, disconnecting temporarily.\n");
+ h->reconnecting = GNUNET_YES;
disconnect_and_schedule_reconnect (h);
return;
}
- GNUNET_CLIENT_receive (h->client, &demultiplexer, h,
+ GNUNET_CLIENT_receive (h->client,
+ &demultiplexer,
+ h,
GNUNET_TIME_UNIT_FOREVER_REL);
size = ntohs (msg->size);
switch (ntohs (msg->type))
{
case GNUNET_MESSAGE_TYPE_HELLO:
if (GNUNET_OK !=
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) msg, &me))
+ GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) msg,
+ &me))
{
GNUNET_break (0);
break;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving (my own) `%s' message, I am `%4s'.\n", "HELLO",
+ "Receiving (my own) HELLO message (%u bytes), I am `%s'.\n",
+ (unsigned int) size,
GNUNET_i2s (&me));
GNUNET_free_non_null (h->my_hello);
h->my_hello = NULL;
GNUNET_break (0);
break;
}
- h->my_hello = GNUNET_malloc (size);
- memcpy (h->my_hello, msg, size);
+ h->my_hello = GNUNET_copy_message (msg);
hwl = h->hwl_head;
while (NULL != hwl)
{
next_hwl = hwl->next;
hwl->rec (hwl->rec_cls,
- (const struct GNUNET_MessageHeader *) h->my_hello);
+ h->my_hello);
hwl = next_hwl;
}
break;
break;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message for `%4s'.\n",
- "CONNECT", GNUNET_i2s (&cim->id));
+ "Receiving CONNECT message for `%s'.\n",
+ GNUNET_i2s (&cim->id));
n = neighbour_find (h, &cim->id);
if (NULL != n)
{
GNUNET_break (0);
break;
}
- n = neighbour_add (h, &cim->id);
+ n = neighbour_add (h,
+ &cim->id);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message for `%4s' with quota %u\n",
- "CONNECT",
+ "Receiving CONNECT message for `%s' with quota %u\n",
GNUNET_i2s (&cim->id),
ntohl (cim->quota_out.value__));
- GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, cim->quota_out);
- if (h->nc_cb != NULL)
- h->nc_cb (h->cls, &n->id);
+ GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker,
+ cim->quota_out);
+ if (NULL != h->nc_cb)
+ h->nc_cb (h->cls,
+ &n->id);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT:
if (size != sizeof (struct DisconnectInfoMessage))
dim = (const struct DisconnectInfoMessage *) msg;
GNUNET_break (ntohl (dim->reserved) == 0);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message for `%4s'.\n",
- "DISCONNECT", GNUNET_i2s (&dim->peer));
+ "Receiving DISCONNECT message for `%s'.\n",
+ GNUNET_i2s (&dim->peer));
n = neighbour_find (h, &dim->peer);
if (NULL == n)
{
GNUNET_break (0);
break;
}
- neighbour_delete (h, &dim->peer, n);
+ neighbour_delete (h,
+ &dim->peer,
+ n);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK:
if (size != sizeof (struct SendOkMessage))
okm = (const struct SendOkMessage *) msg;
bytes_msg = ntohl (okm->bytes_msg);
bytes_physical = ntohl (okm->bytes_physical);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message, transmission %s.\n",
- "SEND_OK", ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Receiving SEND_OK message, transmission %s.\n",
+ ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed");
- n = neighbour_find (h, &okm->peer);
+ n = neighbour_find (h,
+ &okm->peer);
if (NULL == n)
+ {
+ /* we should never get a 'SEND_OK' for a peer that we are not
+ connected to */
+ GNUNET_break (0);
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->unready_warn_task)
+ {
+ GNUNET_SCHEDULER_cancel (n->unready_warn_task);
+ n->unready_warn_task = NULL;
+ }
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);
}
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_RECV:
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message.\n",
- "RECV");
if (size <
sizeof (struct InboundMessage) + sizeof (struct GNUNET_MessageHeader))
{
break;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received message of type %u from `%4s'.\n",
+ "Received message of type %u from `%s'.\n",
ntohs (imm->type), GNUNET_i2s (&im->peer));
n = neighbour_find (h, &im->peer);
if (NULL == n)
break;
}
if (NULL != h->rec)
- h->rec (h->cls, &im->peer, imm);
+ h->rec (h->cls,
+ &im->peer,
+ imm);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA:
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message.\n", "SET_QUOTA");
if (size != sizeof (struct QuotaSetMessage))
{
GNUNET_break (0);
if (NULL == n)
break;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message for `%4s' with quota %u\n",
- "SET_QUOTA",
+ "Receiving SET_QUOTA message for `%s' with quota %u\n",
GNUNET_i2s (&qm->peer),
ntohl (qm->quota.value__));
- GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, qm->quota);
+ GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker,
+ qm->quota);
break;
default:
LOG (GNUNET_ERROR_TYPE_ERROR,
_("Received unexpected message of type %u in %s:%u\n"),
- ntohs (msg->type), __FILE__, __LINE__);
+ ntohs (msg->type),
+ __FILE__,
+ __LINE__);
GNUNET_break (0);
break;
}
{
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
struct Neighbour *n = th->neighbour;
+ struct GNUNET_TIME_Relative delay;
- n->th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ n->th->timeout_task = NULL;
+ delay = GNUNET_TIME_absolute_get_duration (th->request_start);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Discarding %u bytes of payload message after %s delay due to congestion\n",
+ th->notify_size,
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
GNUNET_assert (th == n->th);
GNUNET_assert (NULL == n->hn);
n->th = NULL;
- th->notify (th->notify_cls, 0, NULL);
+ th->notify (th->notify_cls,
+ 0,
+ NULL);
GNUNET_free (th);
}
* @return number of bytes copied to @a buf
*/
static size_t
-transport_notify_ready (void *cls, size_t size, void *buf)
+transport_notify_ready (void *cls,
+ size_t size,
+ void *buf)
{
struct GNUNET_TRANSPORT_Handle *h = cls;
struct GNUNET_TRANSPORT_TransmitHandle *th;
+ struct GNUNET_TIME_Relative delay;
struct Neighbour *n;
char *cbuf;
struct OutboundMessage obm;
cbuf = buf;
ret = 0;
/* first send control messages */
- while ((NULL != (th = h->control_head)) && (th->notify_size <= size))
+ while ( (NULL != (th = h->control_head)) &&
+ (th->notify_size <= size) )
{
- GNUNET_CONTAINER_DLL_remove (h->control_head, h->control_tail, th);
- nret = th->notify (th->notify_cls, size, &cbuf[ret]);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Added %u bytes of control message at %u\n",
- nret, ret);
+ GNUNET_CONTAINER_DLL_remove (h->control_head,
+ h->control_tail,
+ th);
+ nret = th->notify (th->notify_cls,
+ size,
+ &cbuf[ret]);
+ delay = GNUNET_TIME_absolute_get_duration (th->request_start);
+ if (delay.rel_value_us > 1000 * 1000)
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Added %u bytes of control message at %u after %s delay\n",
+ nret,
+ ret,
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Added %u bytes of control message at %u after %s delay\n",
+ nret,
+ ret,
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
GNUNET_free (th);
ret += nret;
size -= nret;
}
/* then, if possible and no control messages pending, send data messages */
- while ((NULL == h->control_head) &&
- (NULL != (n = GNUNET_CONTAINER_heap_peek (h->ready_heap))))
+ while ( (NULL == h->control_head) &&
+ (NULL != (n = GNUNET_CONTAINER_heap_peek (h->ready_heap))) )
{
if (GNUNET_YES != n->is_ready)
{
/* 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);
- n->th->timeout_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
+ GNUNET_assert (NULL == n->th->timeout_task);
+ n->th->timeout_task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
(n->th->timeout),
&timeout_request_due_to_congestion,
n->th);
GNUNET_assert (n == GNUNET_CONTAINER_heap_remove_root (h->ready_heap));
n->hn = NULL;
n->th = NULL;
- n->is_ready = GNUNET_NO;
GNUNET_assert (size >= sizeof (struct OutboundMessage));
- mret =
- th->notify (th->notify_cls, size - sizeof (struct OutboundMessage),
- &cbuf[ret + sizeof (struct OutboundMessage)]);
+ mret = th->notify (th->notify_cls,
+ size - sizeof (struct OutboundMessage),
+ &cbuf[ret + sizeof (struct OutboundMessage)]);
GNUNET_assert (mret <= size - sizeof (struct OutboundMessage));
- if (mret != 0)
+ if (0 == mret)
{
- GNUNET_assert (mret + sizeof (struct OutboundMessage) <
- GNUNET_SERVER_MAX_MESSAGE_SIZE);
- obm.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND);
- obm.header.size = htons (mret + sizeof (struct OutboundMessage));
- obm.priority = htonl (th->priority);
- obm.timeout =
- GNUNET_TIME_relative_hton (GNUNET_TIME_absolute_get_remaining
- (th->timeout));
- obm.peer = n->id;
- memcpy (&cbuf[ret], &obm, sizeof (struct OutboundMessage));
- ret += (mret + sizeof (struct OutboundMessage));
- size -= (mret + sizeof (struct OutboundMessage));
- GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret);
+ GNUNET_free (th);
+ continue;
}
+ if (NULL != n->unready_warn_task)
+ n->unready_warn_task
+ = GNUNET_SCHEDULER_add_delayed (UNREADY_WARN_TIME,
+ &do_warn_unready,
+ n);
+ n->last_payload = GNUNET_TIME_absolute_get ();
+ n->is_ready = GNUNET_NO;
+ GNUNET_assert (mret + sizeof (struct OutboundMessage) <
+ GNUNET_SERVER_MAX_MESSAGE_SIZE);
+ obm.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND);
+ obm.header.size = htons (mret + sizeof (struct OutboundMessage));
+ obm.reserved = htonl (0);
+ obm.timeout =
+ GNUNET_TIME_relative_hton (GNUNET_TIME_absolute_get_remaining
+ (th->timeout));
+ obm.peer = n->id;
+ memcpy (&cbuf[ret],
+ &obm,
+ sizeof (struct OutboundMessage));
+ ret += (mret + sizeof (struct OutboundMessage));
+ size -= (mret + sizeof (struct OutboundMessage));
+ GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker,
+ mret);
+ delay = GNUNET_TIME_absolute_get_duration (th->request_start);
+ if (delay.rel_value_us > 1000 * 1000)
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Added %u bytes of payload message at %u after %s delay\n",
+ mret,
+ ret,
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Added %u bytes of payload message at %u after %s delay\n",
+ mret,
+ ret,
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
GNUNET_free (th);
+ break;
}
/* if there are more pending messages, try to schedule those */
schedule_transmission (h);
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))) &&
- (0 == GNUNET_TIME_absolute_get_remaining (n->th->timeout).rel_value_us))
+ while ( (NULL != (n = GNUNET_CONTAINER_heap_peek (h->ready_heap))) &&
+ (0 == GNUNET_TIME_absolute_get_remaining (n->th->timeout).rel_value_us) )
{
/* notify client that the request could not be satisfied within
* the given time constraints */
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Signalling timeout for transmission to peer %s due to congestion\n",
GNUNET_i2s (&n->id));
- GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
+ GNUNET_assert (0 == th->notify (th->notify_cls,
+ 0,
+ NULL));
GNUNET_free (th);
}
if (NULL != h->cth)
return; /* no pending messages */
size = n->th->notify_size + sizeof (struct OutboundMessage);
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Calling notify_transmit_ready\n");
- h->cth =
- GNUNET_CLIENT_notify_transmit_ready (h->client, size,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Calling notify_transmit_ready\n");
+ h->cth
+ = GNUNET_CLIENT_notify_transmit_ready (h->client,
+ size,
GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO, &transport_notify_ready,
+ GNUNET_NO,
+ &transport_notify_ready,
h);
GNUNET_assert (NULL != h->cth);
}
struct Neighbour *n;
GNUNET_assert (NULL != h->client);
- if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
+ if (NULL != h->quota_task)
{
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;
return; /* no work to be done */
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Scheduling next transmission to service in %s\n",
- GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
h->quota_task =
- GNUNET_SCHEDULER_add_delayed (delay, &schedule_transmission_task, h);
+ GNUNET_SCHEDULER_add_delayed (delay,
+ &schedule_transmission_task,
+ h);
}
* @return a `struct GNUNET_TRANSPORT_TransmitHandle`
*/
static struct GNUNET_TRANSPORT_TransmitHandle *
-schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h, size_t size,
- GNUNET_CONNECTION_TransmitReadyNotify notify,
+schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h,
+ size_t size,
+ GNUNET_TRANSPORT_TransmitReadyNotify notify,
void *notify_cls)
{
struct GNUNET_TRANSPORT_TransmitHandle *th;
th->notify = notify;
th->notify_cls = notify_cls;
th->notify_size = size;
- GNUNET_CONTAINER_DLL_insert_tail (h->control_head, h->control_tail, th);
+ th->request_start = GNUNET_TIME_absolute_get ();
+ GNUNET_CONTAINER_DLL_insert_tail (h->control_head,
+ h->control_tail,
+ th);
schedule_transmission (h);
return th;
}
* @return number of bytes copied to @a buf
*/
static size_t
-send_start (void *cls, size_t size, void *buf)
+send_start (void *cls,
+ size_t size,
+ void *buf)
{
struct GNUNET_TRANSPORT_Handle *h = cls;
struct StartMessage s;
{
/* Can only be shutdown, just give up */
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Shutdown while trying to transmit `%s' request.\n",
- "START");
+ "Shutdown while trying to transmit START request.\n");
return 0;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting `%s' request.\n",
- "START");
+ "Transmitting START request.\n");
GNUNET_assert (size >= sizeof (struct StartMessage));
s.header.size = htons (sizeof (struct StartMessage));
s.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_START);
options = 0;
if (h->check_self)
options |= 1;
- if (h->rec != NULL)
+ if (NULL != h->rec)
options |= 2;
s.options = htonl (options);
s.self = h->self;
{
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 */
GNUNET_assert (NULL == h->client);
GNUNET_assert (NULL == h->control_head);
GNUNET_assert (NULL == h->control_tail);
+ h->reconnecting = GNUNET_NO;
h->client = GNUNET_CLIENT_connect ("transport", h->cfg);
+
GNUNET_assert (NULL != h->client);
- schedule_control_transmit (h, sizeof (struct StartMessage), &send_start, h);
+ schedule_control_transmit (h, sizeof (struct StartMessage),
+ &send_start, h);
}
{
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);
{
GNUNET_CLIENT_disconnect (h->client);
h->client = NULL;
+/* LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Client disconnect done \n");*/
}
/* 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)
+ &neighbour_delete,
+ h);
+ if (NULL != h->quota_task)
{
GNUNET_SCHEDULER_cancel (h->quota_task);
- h->quota_task = GNUNET_SCHEDULER_NO_TASK;
+ h->quota_task = NULL;
}
while ((NULL != (th = h->control_head)))
{
- GNUNET_CONTAINER_DLL_remove (h->control_head, h->control_tail, th);
- th->notify (th->notify_cls, 0, NULL);
+ GNUNET_CONTAINER_DLL_remove (h->control_head,
+ h->control_tail,
+ th);
+ th->notify (th->notify_cls,
+ 0,
+ NULL);
GNUNET_free (th);
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Scheduling task to reconnect to transport service in %s.\n",
- GNUNET_STRINGS_relative_time_to_string(h->reconnect_delay, GNUNET_YES));
+ GNUNET_STRINGS_relative_time_to_string (h->reconnect_delay,
+ GNUNET_YES));
h->reconnect_task =
- GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
+ GNUNET_SCHEDULER_add_delayed (h->reconnect_delay,
+ &reconnect,
+ h);
h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
}
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Canceling transmit of contral transmission requested\n");
- GNUNET_CONTAINER_DLL_remove (th->control_head, th->control_tail, tth);
+ GNUNET_CONTAINER_DLL_remove (th->control_head,
+ th->control_tail,
+ tth);
GNUNET_free (tth);
}
-
/**
- * Send REQUEST_CONNECT message to the service.
+ * Send #GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT message to the
+ * service.
*
- * @param cls the `struct GNUNET_PeerIdentity`
+ * @param cls the `struct GNUNET_TRANSPORT_TryConnectHandle`
* @param size number of bytes available in @a buf
* @param buf where to copy the message
* @return number of bytes copied to @a buf
*/
static size_t
-send_try_connect (void *cls, size_t size, void *buf)
+send_try_connect (void *cls,
+ size_t size,
+ void *buf)
{
struct GNUNET_TRANSPORT_TryConnectHandle *tch = cls;
struct TransportRequestConnectMessage msg;
- if (buf == NULL)
+ tch->tth = NULL;
+ if (NULL == buf)
{
- if (NULL != tch->cb)
- tch->cb (tch->cb_cls, GNUNET_SYSERR);
- GNUNET_CONTAINER_DLL_remove (tch->th->tc_head, tch->th->tc_tail, tch);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Discarding `%s' request to `%4s' due to error in transport service connection.\n",
+ "Discarding `%s' request to `%s' due to error in transport service connection.\n",
"REQUEST_CONNECT",
GNUNET_i2s (&tch->pid));
- GNUNET_free (tch);
+ if (NULL != tch->cb)
+ tch->cb (tch->cb_cls,
+ GNUNET_SYSERR);
+ GNUNET_TRANSPORT_try_connect_cancel (tch);
return 0;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting `%s' request with respect to `%4s'.\n",
+ "Transmitting `%s' request with respect to `%s'.\n",
"REQUEST_CONNECT",
GNUNET_i2s (&tch->pid));
GNUNET_assert (size >= sizeof (struct TransportRequestConnectMessage));
memcpy (buf, &msg, sizeof (msg));
if (NULL != tch->cb)
tch->cb (tch->cb_cls, GNUNET_OK);
- GNUNET_CONTAINER_DLL_remove (tch->th->tc_head, tch->th->tc_tail, tch);
- GNUNET_free (tch);
+ GNUNET_TRANSPORT_try_connect_cancel (tch);
return sizeof (struct TransportRequestConnectMessage);
}
+
/**
* Ask the transport service to establish a connection to
* the given peer.
GNUNET_TRANSPORT_TryConnectCallback cb,
void *cb_cls)
{
- struct GNUNET_TRANSPORT_TryConnectHandle *tch = NULL;
+ struct GNUNET_TRANSPORT_TryConnectHandle *tch;
if (NULL == handle->client)
- return NULL;
+ return NULL;
tch = GNUNET_new (struct GNUNET_TRANSPORT_TryConnectHandle);
tch->th = handle;
- tch->pid = *(target);
+ tch->pid = *target;
tch->cb = cb;
tch->cb_cls = cb_cls;
tch->tth = schedule_control_transmit (handle,
sizeof (struct TransportRequestConnectMessage),
&send_try_connect, tch);
- GNUNET_CONTAINER_DLL_insert(handle->tc_head, handle->tc_tail, tch);
+ GNUNET_CONTAINER_DLL_insert (handle->tc_head,
+ handle->tc_tail,
+ tch);
return tch;
}
struct GNUNET_TRANSPORT_Handle *th;
th = tch->th;
- cancel_control_transmit (th, tch->tth);
- GNUNET_CONTAINER_DLL_remove (th->tc_head, th->tc_tail, tch);
+ if (NULL != tch->tth)
+ cancel_control_transmit (th, tch->tth);
+ GNUNET_CONTAINER_DLL_remove (th->tc_head,
+ th->tc_tail,
+ tch);
GNUNET_free (tch);
}
+
+/**
+ * Send #GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_DISCONNECT message to the
+ * service.
+ *
+ * @param cls the `struct GNUNET_TRANSPORT_TryDisconnectHandle`
+ * @param size number of bytes available in @a buf
+ * @param buf where to copy the message
+ * @return number of bytes copied to @a buf
+ */
+static size_t
+send_try_disconnect (void *cls,
+ size_t size,
+ void *buf)
+{
+ struct GNUNET_TRANSPORT_TryDisconnectHandle *tdh = cls;
+ struct TransportRequestConnectMessage msg;
+
+ tdh->th = NULL;
+ if (NULL == buf)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Discarding `%s' request to `%s' due to error in transport service connection.\n",
+ "REQUEST_DISCONNECT",
+ GNUNET_i2s (&tdh->pid));
+ if (NULL != tdh->cb)
+ tdh->cb (tdh->cb_cls,
+ GNUNET_SYSERR);
+ GNUNET_TRANSPORT_try_disconnect_cancel (tdh);
+ return 0;
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting `%s' request with respect to `%s'.\n",
+ "REQUEST_DISCONNECT",
+ GNUNET_i2s (&tdh->pid));
+ GNUNET_assert (size >= sizeof (struct TransportRequestDisconnectMessage));
+ msg.header.size = htons (sizeof (struct TransportRequestDisconnectMessage));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_DISCONNECT);
+ msg.reserved = htonl (0);
+ msg.peer = tdh->pid;
+ memcpy (buf, &msg, sizeof (msg));
+ if (NULL != tdh->cb)
+ tdh->cb (tdh->cb_cls, GNUNET_OK);
+ GNUNET_TRANSPORT_try_disconnect_cancel (tdh);
+ return sizeof (struct TransportRequestDisconnectMessage);
+}
+
+
+/**
+ * Ask the transport service to shutdown a connection to
+ * the given peer.
+ *
+ * @param handle connection to transport service
+ * @param target who we should try to connect to
+ * @param cb callback to be called when request was transmitted to transport
+ * service
+ * @param cb_cls closure for the callback @a cb
+ * @return a `struct GNUNET_TRANSPORT_TryDisconnectHandle` handle or
+ * NULL on failure (cb will not be called)
+ */
+struct GNUNET_TRANSPORT_TryDisconnectHandle *
+GNUNET_TRANSPORT_try_disconnect (struct GNUNET_TRANSPORT_Handle *handle,
+ const struct GNUNET_PeerIdentity *target,
+ GNUNET_TRANSPORT_TryDisconnectCallback cb,
+ void *cb_cls)
+{
+ struct GNUNET_TRANSPORT_TryDisconnectHandle *tdh;
+
+ if (NULL == handle->client)
+ return NULL;
+ tdh = GNUNET_new (struct GNUNET_TRANSPORT_TryDisconnectHandle);
+ tdh->th = handle;
+ tdh->pid = *target;
+ tdh->cb = cb;
+ tdh->cb_cls = cb_cls;
+ tdh->tth = schedule_control_transmit (handle,
+ sizeof (struct TransportRequestDisconnectMessage),
+ &send_try_disconnect, tdh);
+ GNUNET_CONTAINER_DLL_insert (handle->td_head,
+ handle->td_tail,
+ tdh);
+ return tdh;
+}
+
+
+/**
+ * Cancel the request to transport to try a disconnect
+ * Callback will not be called
+ *
+ * @param tdh the handle to cancel
+ */
+void
+GNUNET_TRANSPORT_try_disconnect_cancel (struct GNUNET_TRANSPORT_TryDisconnectHandle *tdh)
+{
+ struct GNUNET_TRANSPORT_Handle *th;
+
+ th = tdh->th;
+ if (NULL != tdh->tth)
+ cancel_control_transmit (th, tdh->tth);
+ GNUNET_CONTAINER_DLL_remove (th->td_head,
+ th->td_tail,
+ tdh);
+ GNUNET_free (tdh);
+}
+
+
/**
* Send HELLO message to the service.
*
* @return number of bytes copied to @a buf
*/
static size_t
-send_hello (void *cls, size_t size, void *buf)
+send_hello (void *cls,
+ size_t size,
+ void *buf)
{
struct GNUNET_TRANSPORT_OfferHelloHandle *ohh = cls;
struct GNUNET_MessageHeader *msg = ohh->msg;
"Timeout while trying to transmit `%s' request.\n",
"HELLO");
if (NULL != ohh->cont)
- ohh->cont (ohh->cls, &tc);
+ ohh->cont (ohh->cls,
+ &tc);
GNUNET_free (msg);
- GNUNET_CONTAINER_DLL_remove (ohh->th->oh_head, ohh->th->oh_tail, ohh);
+ GNUNET_CONTAINER_DLL_remove (ohh->th->oh_head,
+ ohh->th->oh_tail,
+ ohh);
GNUNET_free (ohh);
return 0;
}
"HELLO");
ssize = ntohs (msg->size);
GNUNET_assert (size >= ssize);
- memcpy (buf, msg, ssize);
+ memcpy (buf,
+ msg,
+ ssize);
GNUNET_free (msg);
tc.reason = GNUNET_SCHEDULER_REASON_READ_READY;
if (NULL != ohh->cont)
- ohh->cont (ohh->cls, &tc);
- GNUNET_CONTAINER_DLL_remove (ohh->th->oh_head, ohh->th->oh_tail, ohh);
+ ohh->cont (ohh->cls,
+ &tc);
+ GNUNET_CONTAINER_DLL_remove (ohh->th->oh_head,
+ ohh->th->oh_tail,
+ ohh);
GNUNET_free (ohh);
return ssize;
}
* @return number of bytes copied to @a buf
*/
static size_t
-send_metric (void *cls, size_t size, void *buf)
+send_metric (void *cls,
+ size_t size,
+ void *buf)
{
struct TrafficMetricMessage *msg = cls;
uint16_t ssize;
if (NULL == buf)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout while trying to transmit `%s' request.\n",
- "TRAFFIC_METRIC");
+ "Timeout while trying to transmit TRAFFIC_METRIC request.\n");
GNUNET_free (msg);
return 0;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting `%s' request.\n",
- "TRAFFIC_METRIC");
+ "Transmitting TRAFFIC_METRIC request.\n");
ssize = ntohs (msg->header.size);
GNUNET_assert (size >= ssize);
memcpy (buf, msg, ssize);
*
* @param handle transport handle
* @param peer the peer to set the metric for
- * @param inbound set inbound direction (#GNUNET_YES or #GNUNET_NO)
- * @param outbound set outbound direction (#GNUNET_YES or #GNUNET_NO)
- * @param ats the metric as ATS information
- * @param ats_count the number of metrics
- *
- * Supported ATS values:
- * #GNUNET_ATS_QUALITY_NET_DELAY (value in ms)
- * #GNUNET_ATS_QUALITY_NET_DISTANCE (value in count(hops))
+ * @param prop the performance metrics to set
+ * @param delay_in inbound delay to introduce
+ * @param delay_out outbound delay to introduce
*
- * Example:
- * To enforce a delay of 10 ms for peer p1 in sending direction use:
- * <code>
- * struct GNUNET_ATS_Information ats;
- * ats.type = ntohl (GNUNET_ATS_QUALITY_NET_DELAY);
- * ats.value = ntohl (10);
- * GNUNET_TRANSPORT_set_traffic_metric (th, p1, TM_SEND, &ats, 1);
- * </code>
- * Note:
- * Delay restrictions in receiving direction will be enforced with
- * 1 message delay.
+ * Note: Delay restrictions in receiving direction will be enforced
+ * with one message delay.
*/
void
GNUNET_TRANSPORT_set_traffic_metric (struct GNUNET_TRANSPORT_Handle *handle,
- const struct GNUNET_PeerIdentity *peer,
- int inbound,
- int outbound,
- const struct GNUNET_ATS_Information *ats,
- size_t ats_count)
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_ATS_Properties *prop,
+ struct GNUNET_TIME_Relative delay_in,
+ struct GNUNET_TIME_Relative delay_out)
{
struct TrafficMetricMessage *msg;
- GNUNET_assert ((outbound == GNUNET_YES) || (outbound == GNUNET_NO));
- GNUNET_assert ((inbound == GNUNET_YES) || (inbound == GNUNET_NO));
- if ((GNUNET_NO == inbound) && (GNUNET_NO == outbound))
- return;
- if (0 == ats_count)
- return;
-
- size_t len = sizeof (struct TrafficMetricMessage) +
- ats_count * sizeof (struct GNUNET_ATS_Information);
-
- msg = GNUNET_malloc (len);
- msg->header.size = htons (len);
+ msg = GNUNET_new (struct TrafficMetricMessage);
+ msg->header.size = htons (sizeof (struct TrafficMetricMessage));
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC);
- msg->direction = htons (0 + outbound + 2 * inbound);
- msg->ats_count = htons (ats_count);
- msg->peer = (*peer);
- memcpy (&msg[1], ats, ats_count * sizeof (struct GNUNET_ATS_Information));
- schedule_control_transmit (handle, len, &send_metric, msg);
+ msg->reserved = htonl (0);
+ msg->peer = *peer;
+ GNUNET_ATS_properties_hton (&msg->properties,
+ prop);
+ msg->delay_in = GNUNET_TIME_relative_hton (delay_in);
+ msg->delay_out = GNUNET_TIME_relative_hton (delay_out);
+ schedule_control_transmit (handle,
+ sizeof (struct TrafficMetricMessage),
+ &send_metric,
+ msg);
}
-
/**
* Offer the transport service the HELLO of another peer. Note that
* the transport service may just ignore this message if the HELLO is
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;
size = ntohs (hello->size);
GNUNET_break (size >= sizeof (struct GNUNET_MessageHeader));
if (GNUNET_OK !=
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hello, &peer))
+ GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hello,
+ &peer))
{
GNUNET_break (0);
return NULL;
msg = GNUNET_malloc (size);
memcpy (msg, hello, size);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Offering `%s' message of `%4s' to transport for validation.\n", "HELLO",
+ "Offering HELLO message of `%s' to transport for validation.\n",
GNUNET_i2s (&peer));
ohh = GNUNET_new (struct GNUNET_TRANSPORT_OfferHelloHandle);
ohh->cont = cont;
ohh->cls = cls;
ohh->msg = msg;
- ohh->tth = schedule_control_transmit (handle, size, &send_hello, ohh);
+ ohh->tth = schedule_control_transmit (handle, size,
+ &send_hello, ohh);
GNUNET_CONTAINER_DLL_insert (handle->oh_head, handle->oh_tail, ohh);
return ohh;
}
/**
* Cancel the request to transport to offer the HELLO message
*
- * @param ohh the GNUNET_TRANSPORT_OfferHelloHandle to cancel
+ * @param ohh the handle for the operation to cancel
*/
void
GNUNET_TRANSPORT_offer_hello_cancel (struct GNUNET_TRANSPORT_OfferHelloHandle *ohh)
struct GNUNET_TRANSPORT_Handle *th = ohh->th;
cancel_control_transmit (ohh->th, ohh->tth);
- GNUNET_CONTAINER_DLL_remove (th->oh_head, th->oh_tail, ohh);
+ GNUNET_CONTAINER_DLL_remove (th->oh_head,
+ th->oh_tail,
+ ohh);
GNUNET_free (ohh->msg);
GNUNET_free (ohh);
}
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);
+ ghh->handle->my_hello);
}
hwl->rec = rec;
hwl->rec_cls = rec_cls;
hwl->handle = handle;
- GNUNET_CONTAINER_DLL_insert (handle->hwl_head, handle->hwl_tail, hwl);
- if (handle->my_hello != NULL)
+ GNUNET_CONTAINER_DLL_insert (handle->hwl_head,
+ handle->hwl_tail,
+ hwl);
+ if (NULL != handle->my_hello)
hwl->notify_task = GNUNET_SCHEDULER_add_now (&call_hello_update_cb_async,
hwl);
return hwl;
{
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);
* @param rec receive function to call
* @param nc function to call on connect events
* @param nd function to call on disconnect events
+ * @return NULL on error
*/
struct GNUNET_TRANSPORT_Handle *
GNUNET_TRANSPORT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const struct GNUNET_PeerIdentity *self, void *cls,
+ const struct GNUNET_PeerIdentity *self,
+ void *cls,
GNUNET_TRANSPORT_ReceiveCallback rec,
GNUNET_TRANSPORT_NotifyConnect nc,
GNUNET_TRANSPORT_NotifyDisconnect nd)
+{
+ return GNUNET_TRANSPORT_connect2 (cfg,
+ self,
+ cls,
+ rec,
+ nc,
+ nd,
+ NULL);
+}
+
+
+/**
+ * Connect to the transport service. Note that the connection may
+ * complete (or fail) asynchronously.
+ *
+ * @param cfg configuration to use
+ * @param self our own identity (API should check that it matches
+ * the identity found by transport), or NULL (no check)
+ * @param cls closure for the callbacks
+ * @param rec receive function to call
+ * @param nc function to call on connect events
+ * @param nd function to call on disconnect events
+ * @param neb function to call if we have excess bandwidth to a peer
+ * @return NULL on error
+ */
+struct GNUNET_TRANSPORT_Handle *
+GNUNET_TRANSPORT_connect2 (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const struct GNUNET_PeerIdentity *self,
+ void *cls,
+ GNUNET_TRANSPORT_ReceiveCallback rec,
+ GNUNET_TRANSPORT_NotifyConnect nc,
+ GNUNET_TRANSPORT_NotifyDisconnect nd,
+ GNUNET_TRANSPORT_NotifyExcessBandwidth neb)
{
struct GNUNET_TRANSPORT_Handle *ret;
ret->rec = rec;
ret->nc_cb = nc;
ret->nd_cb = nd;
+ ret->neb_cb = neb;
ret->reconnect_delay = GNUNET_TIME_UNIT_ZERO;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Connecting to transport service.\n");
- ret->client = GNUNET_CLIENT_connect ("transport", cfg);
+ ret->client = GNUNET_CLIENT_connect ("transport",
+ cfg);
if (NULL == ret->client)
{
GNUNET_free (ret);
GNUNET_YES);
ret->ready_heap =
GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
- schedule_control_transmit (ret, sizeof (struct StartMessage),
- &send_start, ret);
+ schedule_control_transmit (ret,
+ sizeof (struct StartMessage),
+ &send_start,
+ ret);
return ret;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transport disconnect called!\n");
/* this disconnects all neighbours... */
- if (handle->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
+ if (NULL == handle->reconnect_task)
disconnect_and_schedule_reconnect (handle);
/* and now we stop trying to connect again... */
- if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ if (NULL != handle->reconnect_task)
{
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 (NULL != handle->quota_task)
{
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;
- GNUNET_assert (handle->tc_head == NULL);
- GNUNET_assert (handle->tc_tail == NULL);
- GNUNET_assert (handle->hwl_head == NULL);
- GNUNET_assert (handle->hwl_tail == NULL);
+ GNUNET_assert (NULL == handle->tc_head);
+ GNUNET_assert (NULL == handle->tc_tail);
+ GNUNET_assert (NULL == handle->hwl_head);
+ GNUNET_assert (NULL == handle->hwl_tail);
GNUNET_CONTAINER_heap_destroy (handle->ready_heap);
handle->ready_heap = NULL;
GNUNET_free (handle);
* @param handle connection to transport service
* @param target who should receive the message
* @param size how big is the message we want to transmit?
- * @param priority how important is the message?
* @param timeout after how long should we give up (and call
* notify with buf NULL and size 0)?
* @param notify function to call when we are ready to
struct GNUNET_TRANSPORT_TransmitHandle *
GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle *handle,
const struct GNUNET_PeerIdentity *target,
- size_t size, uint32_t priority,
+ size_t size,
struct GNUNET_TIME_Relative timeout,
- GNUNET_CONNECTION_TransmitReadyNotify notify,
+ GNUNET_TRANSPORT_TransmitReadyNotify notify,
void *notify_cls)
{
struct Neighbour *n;
th->neighbour = n;
th->notify = notify;
th->notify_cls = notify_cls;
+ th->request_start = GNUNET_TIME_absolute_get ();
th->timeout = GNUNET_TIME_relative_to_absolute (timeout);
th->notify_size = size;
- th->priority = priority;
n->th = th;
/* calculate when our transmission should be ready */
- delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker, size + n->traffic_overhead);
+ delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
+ size + n->traffic_overhead);
n->traffic_overhead = 0;
if (delay.rel_value_us > timeout.rel_value_us)
delay.rel_value_us = 0; /* notify immediately (with failure) */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Bandwidth tracker allows next transmission to peer %s in %s\n",
- GNUNET_i2s (target),
- GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
- n->hn = GNUNET_CONTAINER_heap_insert (handle->ready_heap, n, delay.rel_value_us);
+ if (delay.rel_value_us > GNUNET_TIME_UNIT_SECONDS.rel_value_us)
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "At bandwidth %u byte/s next transmission to %s in %s\n",
+ (unsigned int) n->out_tracker.available_bytes_per_s__,
+ GNUNET_i2s (target),
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "At bandwidth %u byte/s next transmission to %s in %s\n",
+ (unsigned int) n->out_tracker.available_bytes_per_s__,
+ GNUNET_i2s (target),
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
+ n->hn = GNUNET_CONTAINER_heap_insert (handle->ready_heap,
+ n,
+ delay.rel_value_us);
schedule_transmission (handle);
return th;
}
}
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);
}
projects / oweals / gnunet.git / blobdiff