GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet_bandwidth_lib.h"
#include "gnunet_client_lib.h"
#include "gnunet_constants.h"
#include "gnunet_container_lib.h"
struct GNUNET_PeerIdentity id;
/**
- * At what time did we reset last_sent last?
+ * Outbound bandwidh tracker.
*/
- struct GNUNET_TIME_Absolute last_quota_update;
-
- /**
- * How many bytes have we sent since the "last_quota_update"
- * timestamp?
- */
- uint64_t last_sent;
-
- /**
- * Quota for outbound traffic to the neighbour in bytes/ms.
- */
- uint32_t quota_out;
+ struct GNUNET_BANDWIDTH_Tracker out_tracker;
/**
* Set to GNUNET_NO if we are currently allowed to accept a
*/
struct NeighbourList *neighbours;
+ /**
+ * Peer identity as assumed by this process, or all zeros.
+ */
+ struct GNUNET_PeerIdentity self;
+
/**
* ID of the task trying to reconnect to the service.
*/
*/
struct GNUNET_TIME_Relative reconnect_delay;
+ /**
+ * Set once we are in the process of disconnecting from the
+ * service.
+ */
+ int in_disconnect;
+
+ /**
+ * Should we check that 'self' matches what the service thinks?
+ * (if GNUNET_NO, then 'self' is all zeros!).
+ */
+ int check_self;
};
}
-/**
- * Update the quota values for the given neighbour now.
- *
- * @param n neighbour to update
- */
-static void
-update_quota (struct NeighbourList *n)
-{
- struct GNUNET_TIME_Relative delta;
- uint64_t allowed;
- uint64_t remaining;
-
- delta = GNUNET_TIME_absolute_get_duration (n->last_quota_update);
- allowed = delta.value * n->quota_out;
- if (n->last_sent < allowed)
- {
- remaining = allowed - n->last_sent;
- if (n->quota_out > 0)
- remaining /= n->quota_out;
- else
- remaining = 0;
- if (remaining > MAX_BANDWIDTH_CARRY)
- remaining = MAX_BANDWIDTH_CARRY;
- n->last_sent = 0;
- n->last_quota_update = GNUNET_TIME_absolute_get ();
- n->last_quota_update.value -= remaining;
- }
- else
- {
- n->last_sent -= allowed;
- n->last_quota_update = GNUNET_TIME_absolute_get ();
- }
-}
-
-
/**
* Figure out which transmission to a peer can be done right now.
* If none can, schedule a task to call 'schedule_transmission'
struct NeighbourList *next;
struct GNUNET_TIME_Relative retry_time;
struct GNUNET_TIME_Relative duration;
- uint64_t available;
if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
{
next = n->next;
if (n->transmit_stage != TS_QUEUED)
continue; /* not eligible */
+ if (n->is_connected != GNUNET_YES)
+ continue;
+
th = &n->transmit_handle;
+ GNUNET_break (n == th->neighbour);
/* check outgoing quota */
- duration = GNUNET_TIME_absolute_get_duration (n->last_quota_update);
- if (duration.value > MIN_QUOTA_REFRESH_TIME)
+ duration = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
+ th->notify_size - sizeof (struct OutboundMessage));
+ if (th->timeout.value < duration.value)
{
- update_quota (n);
- duration = GNUNET_TIME_absolute_get_duration (n->last_quota_update);
- }
- available = duration.value * n->quota_out;
- if (available < n->last_sent + th->notify_size)
- {
- /* calculate how much bandwidth we'd still need to
- accumulate and based on that how long we'll have
- to wait... */
- available = n->last_sent + th->notify_size - available;
- duration = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
- available / n->quota_out);
- if (th->timeout.value <
- GNUNET_TIME_relative_to_absolute (duration).value)
- {
- /* signal timeout! */
+ /* signal timeout! */
#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Would need %llu ms before bandwidth is available for delivery to `%4s', that is too long. Signaling timeout.\n",
- duration.value, GNUNET_i2s (&n->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Would need %llu ms before bandwidth is available for delivery to `%4s', that is too long. Signaling timeout.\n",
+ duration.value,
+ GNUNET_i2s (&n->id));
#endif
- if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
- th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
- }
- n->transmit_stage = TS_NEW;
- if (NULL != th->notify)
- GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
- continue;
- }
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ n->transmit_stage = TS_NEW;
+ if (NULL != th->notify)
+ GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
+ continue;
+ }
+ if (duration.value > 0)
+ {
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Need more bandwidth, delaying delivery to `%4s' by %llu ms\n",
- GNUNET_i2s (&n->id), duration.value);
+ "Need more bandwidth (%u b/s allowed, %u b needed), delaying delivery to `%4s' by %llu ms\n",
+ (unsigned int) n->out_tracker.available_bytes_per_s__,
+ (unsigned int) th->notify_size - sizeof (struct OutboundMessage),
+ GNUNET_i2s (&n->id),
+ duration.value);
#endif
retry_time = GNUNET_TIME_relative_min (retry_time,
duration);
}
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Bandwidth available for transmission to `%4s'\n",
+ "Have %u bytes of bandwidth available for transmission to `%4s' right now\n",
+ th->notify_size - sizeof (struct OutboundMessage),
GNUNET_i2s (&n->id));
-#endif
+#endif
+
if ( (ret == NULL) ||
(ret->priority < th->priority) )
ret = th;
/**
* Transmit message(s) to service.
*
- * @param cls handle to transport
+ * @param cls handle to transport
* @param size number of bytes available in buf
* @param buf where to copy the message
* @return number of bytes copied to buf
struct OutboundMessage obm;
size_t ret;
size_t mret;
+ size_t nret;
char *cbuf;
h->network_handle = NULL;
GNUNET_CONTAINER_DLL_remove (h->control_head,
h->control_tail,
cm);
- ret += cm->notify (cm->notify_cls, size, &cbuf[ret]);
+ nret = cm->notify (cm->notify_cls, size, &cbuf[ret]);
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Added %u bytes of control message at %u\n",
+ nret,
+ ret);
+#endif
GNUNET_free (cm);
- size -= ret;
+ ret += nret;
+ size -= nret;
}
while ( (NULL != (th = schedule_peer_transmission (h))) &&
(th->notify_size <= size) )
GNUNET_break (0);
}
GNUNET_assert (size >= sizeof (struct OutboundMessage));
- mret = th->notify (th->notify_cls,
+ mret = th->notify (th->notify_cls,
size - sizeof (struct OutboundMessage),
&cbuf[ret + sizeof (struct OutboundMessage)]);
GNUNET_assert (mret <= size - sizeof (struct OutboundMessage));
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Message of %u bytes with timeout %llums constructed for `%4s'\n",
+ (unsigned int) mret,
+ (unsigned long long) GNUNET_TIME_absolute_get_remaining (th->timeout).value,
+ GNUNET_i2s (&n->id));
+#endif
if (mret != 0)
{
+ 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);
+ }
+ else
+ {
+ switch (n->transmit_stage)
+ {
+ case TS_NEW:
+ GNUNET_break (0);
+ break;
+ case TS_QUEUED:
+ GNUNET_break (0);
+ break;
+ case TS_TRANSMITTED:
+ n->transmit_stage = TS_NEW;
+ break;
+ case TS_TRANSMITTED_QUEUED:
+ n->transmit_stage = TS_QUEUED;
+ continue;
+ default:
+ GNUNET_break (0);
+ }
}
}
schedule_transmission (h);
*/
static void
schedule_transmission (struct GNUNET_TRANSPORT_Handle *h)
-{
+{
size_t size;
struct GNUNET_TIME_Relative timeout;
struct GNUNET_TRANSPORT_TransmitHandle *th;
return;
if (h->client == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Could not yet schedule transmission: we are not yet connected to the transport service!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Could not yet schedule transmission: we are not yet connected to the transport service!\n"));
return; /* not yet connected */
}
- if (NULL != h->control_head)
+ if (NULL != h->control_head)
{
size = h->control_head->notify_size;
timeout = GNUNET_TIME_UNIT_FOREVER_REL;
if (th == NULL)
{
/* no transmission ready right now */
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Could not yet schedule transmission: none ready\n");
+#endif
return;
}
size = th->notify_size;
timeout = GNUNET_TIME_absolute_get_remaining (th->timeout);
}
- h->network_handle =
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Calling notify_transmit_ready\n");
+#endif
+ h->network_handle =
GNUNET_CLIENT_notify_transmit_ready (h->client,
size,
timeout,
th->notify_delay_task
= GNUNET_SCHEDULER_add_delayed (h->sched,
timeout, &control_transmit_timeout, th);
- if (at_head)
+ if (at_head)
GNUNET_CONTAINER_DLL_insert (h->control_head,
h->control_tail,
th);
struct GNUNET_TIME_Absolute timeout;
- uint32_t quota_in;
+ struct GNUNET_BANDWIDTH_Value32NBO quota_in;
};
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting `%s' request with respect to `%4s'.\n",
- "SET_QUOTA",
+ "SET_QUOTA",
GNUNET_i2s (&sqc->target));
#endif
GNUNET_assert (size >= sizeof (struct QuotaSetMessage));
msg = buf;
msg->header.size = htons (sizeof (struct QuotaSetMessage));
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
- msg->quota_in = htonl (sqc->quota_in);
+ msg->quota = sqc->quota_in;
memcpy (&msg->peer, &sqc->target, sizeof (struct GNUNET_PeerIdentity));
if (sqc->cont != NULL)
GNUNET_SCHEDULER_add_continuation (sqc->handle->sched,
void
GNUNET_TRANSPORT_set_quota (struct GNUNET_TRANSPORT_Handle *handle,
const struct GNUNET_PeerIdentity *target,
- uint32_t quota_in,
- uint32_t quota_out,
+ struct GNUNET_BANDWIDTH_Value32NBO quota_in,
+ struct GNUNET_BANDWIDTH_Value32NBO quota_out,
struct GNUNET_TIME_Relative timeout,
GNUNET_SCHEDULER_Task cont, void *cont_cls)
{
n = neighbour_find (handle, target);
if (n != NULL)
{
- update_quota (n);
- if (n->quota_out < quota_out)
- n->last_quota_update = GNUNET_TIME_absolute_get ();
- n->quota_out = quota_out;
+#if DEBUG_TRANSPORT
+ if (ntohl (quota_out.value__) != n->out_tracker.available_bytes_per_s__)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Quota changed from %u to %u for peer `%s'\n",
+ (unsigned int) n->out_tracker.available_bytes_per_s__,
+ (unsigned int) ntohl (quota_out.value__),
+ GNUNET_i2s (target));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Quota remains at %u for peer `%s'\n",
+ (unsigned int) n->out_tracker.available_bytes_per_s__,
+ GNUNET_i2s (target));
+#endif
+ GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker,
+ quota_out);
+ }
+ else
+ {
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Quota changed to %u for peer `%s', but I have no such neighbour!\n",
+ (unsigned int) ntohl (quota_out.value__),
+ GNUNET_i2s (target));
+#endif
}
sqc = GNUNET_malloc (sizeof (struct SetQuotaContext));
sqc->handle = handle;
* Obtain the HELLO message for this peer.
*
* @param handle connection to transport service
- * @param timeout how long to wait for the HELLO
* @param rec function to call with the HELLO, sender will be our peer
* identity; message and sender will be NULL on timeout
* (handshake with transport service pending/failed).
hwl->rec = rec;
hwl->rec_cls = rec_cls;
if (handle->my_hello == NULL)
- return;
+ return;
rec (rec_cls, (const struct GNUNET_MessageHeader *) handle->my_hello);
}
if (buf == NULL)
{
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+#if DEBUG_TRANSPORT_TIMEOUT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Timeout while trying to transmit `%s' request.\n",
"HELLO");
#endif
{
struct GNUNET_MessageHeader *hc;
uint16_t size;
+ struct GNUNET_PeerIdentity peer;
GNUNET_break (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO);
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_break (0);
+ return;
+ }
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Offering `%s' message of `%4s' to transport for validation.\n",
+ "HELLO",
+ GNUNET_i2s (&peer));
+#endif
hc = GNUNET_malloc (size);
memcpy (hc, hello, size);
schedule_control_transmit (handle,
static size_t
send_start (void *cls, size_t size, void *buf)
{
- struct GNUNET_MessageHeader *s = buf;
+ struct GNUNET_TRANSPORT_Handle *h = cls;
+ struct StartMessage s;
if (buf == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting `%s' request.\n", "START");
#endif
- GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
- s->size = htons (sizeof (struct GNUNET_MessageHeader));
- s->type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_START);
- return sizeof (struct GNUNET_MessageHeader);
+ GNUNET_assert (size >= sizeof (struct StartMessage));
+ s.header.size = htons (sizeof (struct StartMessage));
+ s.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_START);
+ s.do_check = htonl (h->check_self);
+ s.self = h->self;
+ memcpy (buf, &s, sizeof (struct StartMessage));
+ return sizeof (struct StartMessage);
}
/**
- * Free neighbour.
- *
- * @param h our state
+ * Free neighbour.
+ *
* @param n the entry to free
*/
static void
/**
- * Mark neighbour as disconnected.
- *
+ * Mark neighbour as disconnected.
+ *
* @param n the entry to mark as disconnected
*/
static void
* @param cls closure (struct GNUNET_TRANSPORT_Handle *)
* @param msg message received, NULL on timeout or fatal error
*/
-static void demultiplexer (void *cls,
+static void demultiplexer (void *cls,
const struct GNUNET_MessageHeader *msg);
* @param tc scheduler context
*/
static void
-reconnect (void *cls,
+reconnect (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TRANSPORT_Handle *h = cls;
struct ControlMessage *pos;
struct NeighbourList *n;
+ struct NeighbourList *next;
+ h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
{
/* shutdown, just give up */
n = h->neighbours;
while (NULL != n)
{
- neighbour_disconnect (n);
- n = n->next;
+#if DEBUG_TRANSPORT_DISCONNECT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting due to reconnect being called\n");
+#endif
+ next = n->next;
+ if (n->is_connected)
+ neighbour_disconnect (n);
+ n = next;
}
#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting to transport service.\n");
#endif
GNUNET_assert (h->client == NULL);
- h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
h->client = GNUNET_CLIENT_connect (h->sched, "transport", h->cfg);
GNUNET_assert (h->client != NULL);
/* make sure we don't send "START" twice, remove existing entry from
pos = pos->next;
}
schedule_control_transmit (h,
- sizeof (struct GNUNET_MessageHeader),
+ sizeof (struct StartMessage),
GNUNET_YES,
- GNUNET_TIME_UNIT_FOREVER_REL, &send_start, NULL);
+ GNUNET_TIME_UNIT_FOREVER_REL, &send_start, h);
GNUNET_CLIENT_receive (h->client,
&demultiplexer, h, GNUNET_TIME_UNIT_FOREVER_REL);
}
{
h->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
}
- else
+ else
{
h->reconnect_delay = GNUNET_TIME_relative_multiply (h->reconnect_delay, 2);
h->reconnect_delay = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS,
}
+/**
+ * Send request connect message to the service.
+ *
+ * @param cls the TransportRequestConnectMessage
+ * @param size number of bytes available in buf
+ * @param buf where to copy the message
+ * @return number of bytes copied to buf
+ */
+static size_t
+send_transport_request_connect (void *cls, size_t size, void *buf)
+{
+ struct TransportRequestConnectMessage *trcm = cls;
+
+ if (buf == NULL)
+ {
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Buffer null for %s\n",
+ "REQUEST_CONNECT");
+#endif
+ GNUNET_free (trcm);
+ return 0;
+ }
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting `%s' request for `%4s'.\n",
+ "REQUEST_CONNECT",
+ GNUNET_i2s (&trcm->peer));
+#endif
+ GNUNET_assert (size >= sizeof (struct TransportRequestConnectMessage));
+ memcpy(buf, trcm, sizeof(struct TransportRequestConnectMessage));
+ return sizeof(struct TransportRequestConnectMessage);
+}
+
+/**
+ * Create and send a request connect message to
+ * the transport service for a particular peer.
+ *
+ * @param h handle to the transport service
+ * @param n the neighbor to send the request connect message about
+ *
+ */
+static void send_request_connect_message(struct GNUNET_TRANSPORT_Handle *h, struct NeighbourList *n)
+{
+ struct TransportRequestConnectMessage *trcm;
+
+ trcm = GNUNET_malloc(sizeof(struct TransportRequestConnectMessage));
+ trcm->header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT);
+ trcm->header.size = htons(sizeof(struct TransportRequestConnectMessage));
+ memcpy(&trcm->peer, &n->id, sizeof(struct GNUNET_PeerIdentity));
+ schedule_control_transmit (h,
+ sizeof (struct TransportRequestConnectMessage),
+ GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL, &send_transport_request_connect, trcm);
+}
+
/**
* Add neighbour to our list
+ *
+ * @return NULL if this API is currently disconnecting from the service
*/
static struct NeighbourList *
neighbour_add (struct GNUNET_TRANSPORT_Handle *h,
{
struct NeighbourList *n;
+ if (GNUNET_YES == h->in_disconnect)
+ return NULL;
/* check for duplicates */
if (NULL != (n = neighbour_find (h, pid)))
{
}
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating entry for neighbour `%4s'.\n",
+ "Creating entry for neighbour `%4s'.\n",
GNUNET_i2s (pid));
#endif
n = GNUNET_malloc (sizeof (struct NeighbourList));
n->id = *pid;
- n->last_quota_update = GNUNET_TIME_absolute_get ();
+ GNUNET_BANDWIDTH_tracker_init (&n->out_tracker,
+ GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
+ MAX_BANDWIDTH_CARRY_S);
n->next = h->neighbours;
- n->quota_out = GNUNET_CONSTANTS_DEFAULT_BPM_IN_OUT;
n->h = h;
- h->neighbours = n;
+ h->neighbours = n;
+
+
return n;
}
*
* @param sched scheduler to use
* @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
struct GNUNET_TRANSPORT_Handle *
GNUNET_TRANSPORT_connect (struct GNUNET_SCHEDULER_Handle *sched,
const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const struct GNUNET_PeerIdentity *self,
void *cls,
GNUNET_TRANSPORT_ReceiveCallback rec,
GNUNET_TRANSPORT_NotifyConnect nc,
{
struct GNUNET_TRANSPORT_Handle *ret;
- GNUNET_ARM_start_services (cfg, sched, "peerinfo", "transport", NULL);
ret = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_Handle));
+ if (self != NULL)
+ {
+ ret->self = *self;
+ ret->check_self = GNUNET_YES;
+ }
ret->sched = sched;
ret->cfg = cfg;
ret->cls = cls;
struct NeighbourList *n;
struct HelloWaitList *hwl;
struct GNUNET_CLIENT_Connection *client;
+ struct ControlMessage *cm;
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
#endif
+ handle->in_disconnect = GNUNET_YES;
while (NULL != (n = handle->neighbours))
{
handle->neighbours = n->next;
th->notify_delay_task);
th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
+ GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
break;
default:
GNUNET_break (0);
hwl->rec (hwl->rec_cls, NULL);
GNUNET_free (hwl);
}
+
+ /* Check for still scheduled control messages, cancel delay tasks if so */
+ /* Added because somehow a notify_delay_task is remaining scheduled and is ever so annoying */
+ while ( (NULL != (cm = handle->control_head)))
+ {
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnect before control message sent!\n");
+#endif
+ if (cm->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (handle->sched, cm->notify_delay_task);
+ cm->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_CONTAINER_DLL_remove (handle->control_head,
+ handle->control_tail,
+ cm);
+ GNUNET_free (cm);
+ }
+ /* end check */
+
if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (handle->sched, handle->reconnect_task);
}
GNUNET_free_non_null (handle->my_hello);
handle->my_hello = NULL;
- GNUNET_ARM_stop_services (handle->cfg, handle->sched, "transport",
- "peerinfo", NULL);
+
if (NULL != handle->network_handle)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (handle->network_handle);
"Disconnecting from transport service for good.\n");
#endif
handle->client = NULL;
- GNUNET_CLIENT_disconnect (client);
+ GNUNET_CLIENT_disconnect (client, GNUNET_NO);
}
GNUNET_free (handle);
}
GNUNET_free (h);
return;
}
- if (msg == NULL)
+ if (msg == NULL)
{
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
GNUNET_CLIENT_notify_transmit_ready_cancel (h->network_handle);
h->network_handle = NULL;
}
- GNUNET_CLIENT_disconnect (h->client);
+ GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
h->client = NULL;
schedule_reconnect (h);
return;
if (n == NULL)
n = neighbour_add (h,
&cim->id);
+ if (n == NULL)
+ return;
GNUNET_break (n->is_connected == GNUNET_NO);
n->is_connected = GNUNET_YES;
if (h->nc_cb != NULL)
h->nc_cb (h->cls, &n->id,
- GNUNET_TIME_relative_ntoh (cim->latency),
- ntohs (cim->distance));
+ GNUNET_TIME_relative_ntoh (cim->latency),
+ ntohl (cim->distance));
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT:
if (size != sizeof (struct DisconnectInfoMessage))
break;
}
dim = (const struct DisconnectInfoMessage *) msg;
-#if DEBUG_TRANSPORT
+#if DEBUG_TRANSPORT_DISCONNECT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiving `%s' message for `%4s'.\n",
"DISCONNECT",
GNUNET_i2s (&dim->peer));
#endif
- n = neighbour_find (h, &cim->id);
+ n = neighbour_find (h, &dim->peer);
GNUNET_break (n != NULL);
if (n != NULL)
- neighbour_disconnect (n);
+ neighbour_disconnect (n);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK:
if (size != sizeof (struct SendOkMessage))
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received message of type %u from `%4s'.\n",
ntohs (imm->type), GNUNET_i2s (&im->peer));
-#endif
+#endif
n = neighbour_find (h, &im->peer);
if (n == NULL)
{
GNUNET_break (0);
break;
- }
+ }
+ if (n->is_connected != GNUNET_YES)
+ {
+ GNUNET_break (0);
+ break;
+ }
if (h->rec != NULL)
h->rec (h->cls, &im->peer, imm,
- GNUNET_TIME_relative_ntoh (im->latency), ntohs(im->distance));
+ GNUNET_TIME_relative_ntoh (im->latency), ntohl(im->distance));
break;
default:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
{
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
struct NeighbourList *n;
+ GNUNET_CONNECTION_TransmitReadyNotify notify;
+ void *notify_cls;
th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
n = th->neighbour;
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Triggering timeout for request to transmit to `%4s' (%d)\n",
+ GNUNET_i2s (&n->id),
+ n->transmit_stage);
+#endif
+ notify = th->notify;
+ notify_cls = th->notify_cls;
switch (n->transmit_stage)
{
case TS_NEW:
default:
GNUNET_break (0);
}
- if (NULL != th->notify)
- th->notify (th->notify_cls, 0, NULL);
+ if (NULL != notify)
+ notify (notify_cls, 0, NULL);
}
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Message size is %d, max allowed is %d.\n",
- size + sizeof (struct OutboundMessage), GNUNET_SERVER_MAX_MESSAGE_SIZE);
+ size + sizeof (struct OutboundMessage), GNUNET_SERVER_MAX_MESSAGE_SIZE - 1);
#endif
GNUNET_break (0);
return NULL;
}
-#if DEBUG_TRANSPORT
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking transport service for transmission of %u bytes to peer `%4s'.\n",
- size, GNUNET_i2s (target));
-#endif
+ "Asking transport service for transmission of %u bytes to peer `%4s' within %llu ms.\n",
+ size, GNUNET_i2s (target),
+ (unsigned long long) timeout.value);
+
n = neighbour_find (handle, target);
if (n == NULL)
- n = neighbour_add (handle, target);
- if (n == NULL)
- return NULL;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created neighbour entry for peer `%s'\n",
+ GNUNET_i2s (target));
+ n = neighbour_add (handle, target);
+
+ }
+
+ /**
+ * Send a request connect message if not connected,
+ * otherwise we will never send anything to
+ * transport service
+ */
+ if (n->is_connected == GNUNET_NO)
+ {
+ send_request_connect_message(handle, n);
+ }
+
+ if (n == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Could not create neighbour entry for peer `%s'\n",
+ GNUNET_i2s (target));
+ return NULL;
+ }
switch (n->transmit_stage)
{
case TS_NEW:
n->transmit_stage = TS_QUEUED;
break;
case TS_QUEUED:
- break;
+ GNUNET_break (0);
+ return NULL;
case TS_TRANSMITTED:
n->transmit_stage = TS_TRANSMITTED_QUEUED;
break;
case TS_TRANSMITTED_QUEUED:
+ GNUNET_break (0);
return NULL;
- break;
default:
GNUNET_break (0);
return NULL;
th->priority = priority;
th->notify_delay_task
= GNUNET_SCHEDULER_add_delayed (handle->sched, timeout,
- &peer_transmit_timeout, th);
+ &peer_transmit_timeout, th);
schedule_transmission (handle);
return th;
}
projects / oweals / gnunet.git / blobdiff