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
*/
#define STOP_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+/**
+ * How large to start with for the hashmap of neighbours.
+ */
+#define STARTING_NEIGHBOURS_SIZE 10
+
/**
* What stage are we in for transmission processing?
};
-
/**
- * Entry in linked list of all of our current neighbours.
+ * Context for storing information about attempted next transmission.
*/
-struct NeighbourList
+struct TryTransmitContext
{
/**
- * This is a linked list.
+ * Main transport handle.
*/
- struct NeighbourList *next;
+ struct GNUNET_TRANSPORT_Handle *h;
+ /**
+ * Returned transmission handle.
+ */
+ struct GNUNET_TRANSPORT_TransmitHandle *ret;
+
+ /**
+ * Time to retry the send task.
+ */
+ struct GNUNET_TIME_Relative retry_time;
+};
+
+/**
+ * Entry in hash table of all of our current neighbours.
+ */
+struct NeighbourList
+{
/**
* Overall transport handle.
*/
*/
int is_connected;
+ /**
+ * Are we in the middle of disconnecting the peer already?
+ */
+ unsigned int in_disconnect;
+
};
*/
struct HelloWaitList *hwl_head;
- /**
- * My scheduler.
- */
- struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* My configuration.
*/
/**
* Linked list of the current neighbours of this peer.
*/
- struct NeighbourList *neighbours;
+ struct GNUNET_CONTAINER_MultiHashMap *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.
* Delay until we try to reconnect.
*/
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;
+};
+
+struct HelloContext
+{
+
+ /**
+ * Size of the HELLO copied to end of struct.
+ */
+ uint16_t size;
+
+ /**
+ * Continuation to call once HELLO sent.
+ */
+ GNUNET_SCHEDULER_Task cont;
+
+ /**
+ * Closure to call with the continuation.
+ */
+ void *cont_cls;
+
+ /* HELLO */
};
-// FIXME: replace with hash map!
/**
* Get the neighbour list entry for the given peer
*
neighbour_find (struct GNUNET_TRANSPORT_Handle *h,
const struct GNUNET_PeerIdentity *peer)
{
- struct NeighbourList *pos;
-
- pos = h->neighbours;
- while ((pos != NULL) &&
- (0 != memcmp (peer, &pos->id, sizeof (struct GNUNET_PeerIdentity))))
- pos = pos->next;
- return pos;
+ return GNUNET_CONTAINER_multihashmap_get(h->neighbours, &peer->hashPubKey);
}
}
+/**
+ * Iterator over hash map entries, attempt to schedule
+ * a transmission to entries in the neighbour hashmap.
+ *
+ * @param cls closure a TryTransmitContext
+ * @param key current key code
+ * @param value value in the hash map, the neighbour entry to consider
+ * @return GNUNET_YES if we should continue to
+ * iterate,
+ * GNUNET_NO if not.
+ */
+static int
+try_schedule_transmission (void *cls,
+ const GNUNET_HashCode * key,
+ void *value)
+{
+ struct NeighbourList *n = value;
+ struct TryTransmitContext *try_transmit_ctx = cls;
+ struct GNUNET_TIME_Relative duration;
+ GNUNET_CONNECTION_TransmitReadyNotify notify;
+ struct GNUNET_TRANSPORT_TransmitHandle *th;
+ struct GNUNET_TIME_Absolute duration_abs;
+
+ if (n->transmit_stage != TS_QUEUED)
+ return GNUNET_YES; /* not eligible, keep iterating */
+ if (n->is_connected != GNUNET_YES)
+ return GNUNET_YES; /* keep iterating */
+
+ th = &n->transmit_handle;
+ GNUNET_break (n == th->neighbour);
+ /* check outgoing quota */
+ duration = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
+ th->notify_size - sizeof (struct OutboundMessage));
+ duration_abs = GNUNET_TIME_relative_to_absolute (duration);
+ if (th->timeout.abs_value < duration_abs.abs_value)
+ {
+ /* 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.rel_value,
+ GNUNET_i2s (&n->id));
+#endif
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (th->notify_delay_task);
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ n->transmit_stage = TS_NEW;
+ if (NULL != (notify = th->notify))
+ {
+ th->notify = NULL;
+ GNUNET_assert (0 == notify (th->notify_cls, 0, NULL));
+ }
+ return GNUNET_YES; /* keep iterating */
+ }
+ if (duration.rel_value > 0)
+ {
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "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),
+ (unsigned long long) duration.rel_value);
+#endif
+ try_transmit_ctx->retry_time = GNUNET_TIME_relative_min (try_transmit_ctx->retry_time,
+ duration);
+ return GNUNET_YES; /* keep iterating */
+ }
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Have %u bytes of bandwidth available for transmission to `%4s' right now\n",
+ th->notify_size - sizeof (struct OutboundMessage),
+ GNUNET_i2s (&n->id));
+#endif
+
+ if ( (try_transmit_ctx->ret == NULL) ||
+ (try_transmit_ctx->ret->priority < th->priority) )
+ try_transmit_ctx->ret = th;
+ return GNUNET_YES;
+}
+
+
/**
* Figure out which transmission to a peer can be done right now.
* If none can, schedule a task to call 'schedule_transmission'
static struct GNUNET_TRANSPORT_TransmitHandle *
schedule_peer_transmission (struct GNUNET_TRANSPORT_Handle *h)
{
- struct GNUNET_TRANSPORT_TransmitHandle *ret;
- struct GNUNET_TRANSPORT_TransmitHandle *th;
- struct NeighbourList *n;
- struct NeighbourList *next;
- struct GNUNET_TIME_Relative retry_time;
- struct GNUNET_TIME_Relative duration;
+ struct TryTransmitContext try_transmit_ctx;
if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (h->sched,
- h->quota_task);
+ GNUNET_SCHEDULER_cancel (h->quota_task);
h->quota_task = GNUNET_SCHEDULER_NO_TASK;
}
- retry_time = GNUNET_TIME_UNIT_FOREVER_REL;
- ret = NULL;
- next = h->neighbours;
- while (NULL != (n = next))
- {
- next = n->next;
- if (n->transmit_stage != TS_QUEUED)
- continue; /* not eligible */
- th = &n->transmit_handle;
- GNUNET_break (n == th->neighbour);
- /* check outgoing quota */
- duration = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
- th->notify_size - sizeof (struct OutboundMessage));
- if (th->timeout.value < duration.value)
- {
- /* 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));
-#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 (duration.value > 0)
- {
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "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);
- continue;
- }
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Have %u bytes of bandwidth available for transmission to `%4s' right now\n",
- th->notify_size - sizeof (struct OutboundMessage),
- GNUNET_i2s (&n->id));
-#endif
- if ( (ret == NULL) ||
- (ret->priority < th->priority) )
- ret = th;
- }
- if (ret == NULL)
- h->quota_task = GNUNET_SCHEDULER_add_delayed (h->sched,
- retry_time,
+ try_transmit_ctx.h = h;
+ try_transmit_ctx.ret = NULL;
+ try_transmit_ctx.retry_time = GNUNET_TIME_UNIT_FOREVER_REL;
+ GNUNET_CONTAINER_multihashmap_iterate(h->neighbours,
+ &try_schedule_transmission,
+ &try_transmit_ctx);
+ if (try_transmit_ctx.ret == NULL)
+ h->quota_task = GNUNET_SCHEDULER_add_delayed (try_transmit_ctx.retry_time,
"a_transmit_ready,
h);
- return ret;
+ return try_transmit_ctx.ret;
}
/**
* 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 GNUNET_TRANSPORT_TransmitHandle *th;
struct NeighbourList *n;
struct OutboundMessage obm;
+ GNUNET_CONNECTION_TransmitReadyNotify notify;
size_t ret;
size_t mret;
size_t nret;
{
if (cm->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (h->sched, cm->notify_delay_task);
+ GNUNET_SCHEDULER_cancel (cm->notify_delay_task);
cm->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_CONTAINER_DLL_remove (h->control_head,
h->control_tail,
- cm);
+ cm);
nret = cm->notify (cm->notify_cls, size, &cbuf[ret]);
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
{
if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
+ GNUNET_SCHEDULER_cancel (th->notify_delay_task);
th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
n = th->neighbour;
GNUNET_break (0);
}
GNUNET_assert (size >= sizeof (struct OutboundMessage));
- mret = th->notify (th->notify_cls,
- size - sizeof (struct OutboundMessage),
- &cbuf[ret + sizeof (struct OutboundMessage)]);
+ notify = th->notify;
+ th->notify = NULL;
+ mret = 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,
+ (unsigned int) mret,
+ (unsigned long long) GNUNET_TIME_absolute_get_remaining (th->timeout).rel_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);
*/
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,
+ 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;
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,
struct ControlMessage *th = cls;
th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
- if (NULL != th->notify)
- th->notify (th->notify_cls, 0, NULL);
+ if (NULL != th->notify)
+ th->notify (th->notify_cls, 0, NULL);
GNUNET_CONTAINER_DLL_remove (th->h->control_head,
th->h->control_tail,
th);
GNUNET_CONNECTION_TransmitReadyNotify notify,
void *notify_cls)
{
- struct ControlMessage *th;
+ struct ControlMessage *cm;
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Control transmit of %u bytes within %llums requested\n",
- size, (unsigned long long) timeout.value);
+ size, (unsigned long long) timeout.rel_value);
#endif
- th = GNUNET_malloc (sizeof (struct ControlMessage));
- th->h = h;
- th->notify = notify;
- th->notify_cls = notify_cls;
- th->notify_size = size;
- th->notify_delay_task
- = GNUNET_SCHEDULER_add_delayed (h->sched,
- timeout, &control_transmit_timeout, th);
- if (at_head)
+ cm = GNUNET_malloc (sizeof (struct ControlMessage));
+ cm->h = h;
+ cm->notify = notify;
+ cm->notify_cls = notify_cls;
+ cm->notify_size = size;
+ cm->notify_delay_task
+ = GNUNET_SCHEDULER_add_delayed (timeout, &control_transmit_timeout, cm);
+ if (at_head)
GNUNET_CONTAINER_DLL_insert (h->control_head,
h->control_tail,
- th);
+ cm);
else
GNUNET_CONTAINER_DLL_insert_after (h->control_head,
h->control_tail,
h->control_tail,
- th);
+ cm);
schedule_transmission (h);
}
+/**
+ * FIXME: document
+ */
struct SetQuotaContext
{
+ /**
+ * FIXME: document
+ */
struct GNUNET_TRANSPORT_Handle *handle;
+ /**
+ * FIXME: document
+ */
struct GNUNET_PeerIdentity target;
+ /**
+ * FIXME: document
+ */
GNUNET_SCHEDULER_Task cont;
+ /**
+ * Closure for 'cont'.
+ */
void *cont_cls;
+ /**
+ * FIXME: document
+ */
struct GNUNET_TIME_Absolute timeout;
+ /**
+ * FIXME: document
+ */
struct GNUNET_BANDWIDTH_Value32NBO quota_in;
};
if (buf == NULL)
{
- GNUNET_SCHEDULER_add_continuation (sqc->handle->sched,
- sqc->cont,
- sqc->cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
+ if (sqc->cont != NULL)
+ GNUNET_SCHEDULER_add_continuation (sqc->cont,
+ sqc->cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
GNUNET_free (sqc);
return 0;
}
#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->quota = sqc->quota_in;
memcpy (&msg->peer, &sqc->target, sizeof (struct GNUNET_PeerIdentity));
if (sqc->cont != NULL)
- GNUNET_SCHEDULER_add_continuation (sqc->handle->sched,
- sqc->cont,
+ GNUNET_SCHEDULER_add_continuation (sqc->cont,
sqc->cont_cls,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
GNUNET_free (sqc);
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);
}
static size_t
send_hello (void *cls, size_t size, void *buf)
{
- struct GNUNET_MessageHeader *hello = cls;
- uint16_t msize;
-
+ struct HelloContext *hc = cls;
+ uint16_t ssize;
if (buf == NULL)
{
#if DEBUG_TRANSPORT_TIMEOUT
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Timeout while trying to transmit `%s' request.\n",
"HELLO");
#endif
- GNUNET_free (hello);
+ GNUNET_SCHEDULER_add_now(hc->cont, hc->cont_cls);
+ GNUNET_free (hc);
return 0;
}
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting `%s' request.\n", "HELLO");
#endif
- msize = ntohs (hello->size);
- GNUNET_assert (size >= msize);
- memcpy (buf, hello, msize);
- GNUNET_free (hello);
- return msize;
+ GNUNET_assert (size >= hc->size);
+ memcpy (buf, &hc[1], hc->size);
+
+ if (hc->cont != NULL)
+ {
+ GNUNET_SCHEDULER_add_continuation(hc->cont, hc->cont_cls, GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ }
+ ssize = hc->size;
+ GNUNET_free (hc);
+ return ssize;
}
*
* @param handle connection to transport service
* @param hello the hello message
+ * @param cont continuation to call when HELLO has been sent
+ * @param cls closure for continuation
+ *
*/
void
GNUNET_TRANSPORT_offer_hello (struct GNUNET_TRANSPORT_Handle *handle,
- const struct GNUNET_MessageHeader *hello)
+ const struct GNUNET_MessageHeader *hello,
+ GNUNET_SCHEDULER_Task cont,
+ void *cls)
{
- struct GNUNET_MessageHeader *hc;
uint16_t size;
struct GNUNET_PeerIdentity peer;
+ struct HelloContext *hc;
GNUNET_break (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO);
size = ntohs (hello->size);
GNUNET_break (0);
return;
}
-#if DEBUG_TRANSPORT
+ hc = GNUNET_malloc(sizeof(struct HelloContext) + size);
+ hc->size = size;
+ hc->cont = cont;
+ hc->cont_cls = cls;
+ memcpy (&hc[1], hello, size);
+
+#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,
size,
GNUNET_NO, OFFER_HELLO_TIMEOUT, &send_hello, hc);
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.
- *
+ * Free neighbour.
+ *
* @param n the entry to free
*/
static void
neighbour_free (struct NeighbourList *n)
{
struct GNUNET_TRANSPORT_Handle *h;
- struct NeighbourList *prev;
- struct NeighbourList *pos;
+ /* Added so task gets canceled when a disconnect is received! */
+ /* Method 1
+ if (n->transmit_handle.notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(n->transmit_handle.notify_delay_task);
+ n->transmit_handle.notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ n->transmit_handle.notify = NULL;
+ }
+ */
+ /* NATE: if the above is not needed, then clearly this assertion
+ should hold (I've checked the code and I'm pretty sure this is
+ true. -CG
+ FIXME: remove above comments once we've seen tests pass with the assert... */
+ GNUNET_assert (n->transmit_handle.notify_delay_task == GNUNET_SCHEDULER_NO_TASK);
+ GNUNET_assert (n->transmit_handle.notify == NULL);
h = n->h;
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_break (n->is_connected == GNUNET_NO);
GNUNET_break (n->transmit_stage == TS_NEW);
- prev = NULL;
- pos = h->neighbours;
- while (pos != n)
- {
- prev = pos;
- pos = pos->next;
- }
- if (prev == NULL)
- h->neighbours = n->next;
- else
- prev->next = n->next;
+ GNUNET_assert(GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove(h->neighbours,
+ &n->id.hashPubKey,
+ n));
GNUNET_free (n);
}
/**
- * Mark neighbour as disconnected.
- *
+ * Mark neighbour as disconnected.
+ *
* @param n the entry to mark as disconnected
*/
static void
#endif
GNUNET_break (n->is_connected == GNUNET_YES);
n->is_connected = GNUNET_NO;
- if (h->nc_cb != NULL)
+ /* FIXME: this 'in_disconnect' flag is dubious; we should define
+ clearly what disconnect means for pending 'notify_transmit_ready'
+ requests; maybe a good approach is to REQUIRE clients to
+ call 'notify_transmit_ready_cancel' on pending requests on disconnect
+ and otherwise FAIL HARD with an assertion failure before
+ 'neighbour_free' right here (transmit_stage would be forced
+ to 'TS_NEW') */
+ n->in_disconnect = GNUNET_YES;
+ if (h->nd_cb != NULL)
h->nd_cb (h->cls, &n->id);
- if (n->transmit_stage == TS_NEW)
+ if (n->transmit_stage == TS_NEW)
neighbour_free (n);
+
}
const struct GNUNET_MessageHeader *msg);
+/**
+ * Iterator over hash map entries, for getting rid of a neighbor
+ * upon a reconnect call.
+ *
+ * @param cls closure (NULL)
+ * @param key current key code
+ * @param value value in the hash map, the neighbour entry to forget
+ * @return GNUNET_YES if we should continue to
+ * iterate,
+ * GNUNET_NO if not.
+ */
+static int
+forget_neighbours (void *cls,
+ const GNUNET_HashCode * key,
+ void *value)
+{
+ struct NeighbourList *n = value;
+
+#if DEBUG_TRANSPORT_DISCONNECT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting due to reconnect being called\n");
+#endif
+ if (n->is_connected)
+ neighbour_disconnect (n);
+
+ return GNUNET_YES;
+}
+
+
/**
* Try again to connect to transport service.
*
* @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)
return;
}
/* Forget about all neighbours that we used to be connected to */
- n = h->neighbours;
- while (NULL != n)
- {
-#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;
- }
+ GNUNET_CONTAINER_multihashmap_iterate(h->neighbours,
+ &forget_neighbours,
+ NULL);
+
#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connecting to transport service.\n");
#endif
GNUNET_assert (h->client == NULL);
- h->client = GNUNET_CLIENT_connect (h->sched, "transport", h->cfg);
+ h->client = GNUNET_CLIENT_connect ("transport", h->cfg);
GNUNET_assert (h->client != NULL);
/* make sure we don't send "START" twice, remove existing entry from
queue (if present) */
pos);
if (GNUNET_SCHEDULER_NO_TASK != pos->notify_delay_task)
{
- GNUNET_SCHEDULER_cancel (h->sched, pos->notify_delay_task);
+ GNUNET_SCHEDULER_cancel (pos->notify_delay_task);
pos->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_free (pos);
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);
}
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Scheduling task to reconnect to transport service in %llu ms.\n",
- h->reconnect_delay.value);
+ h->reconnect_delay.rel_value);
#endif
GNUNET_assert (h->client == NULL);
GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
h->reconnect_task
- = GNUNET_SCHEDULER_add_delayed (h->sched,
- h->reconnect_delay, &reconnect, h);
- if (h->reconnect_delay.value == 0)
+ = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
+ if (h->reconnect_delay.rel_value == 0)
{
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
*
}
#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->h = h;
GNUNET_BANDWIDTH_tracker_init (&n->out_tracker,
GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
MAX_BANDWIDTH_CARRY_S);
- n->next = h->neighbours;
- n->h = h;
- h->neighbours = n;
+ GNUNET_CONTAINER_multihashmap_put (h->neighbours,
+ &pid->hashPubKey,
+ n,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+
return n;
}
+/**
+ * Iterator over hash map entries, for deleting state of a neighbor.
+ *
+ * @param cls closure (NULL)
+ * @param key current key code
+ * @param value value in the hash map, the neighbour entry to delete
+ * @return GNUNET_YES if we should continue to
+ * iterate,
+ * GNUNET_NO if not.
+ */
+static int
+delete_neighbours (void *cls,
+ const GNUNET_HashCode * key,
+ void *value)
+{
+ struct NeighbourList *n = value;
+ struct GNUNET_TRANSPORT_TransmitHandle *th;
+
+ switch (n->transmit_stage)
+ {
+ case TS_NEW:
+ case TS_TRANSMITTED:
+ /* nothing to do */
+ break;
+ case TS_QUEUED:
+ case TS_TRANSMITTED_QUEUED:
+ th = &n->transmit_handle;
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (th->notify_delay_task);
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
+ break;
+ default:
+ GNUNET_break (0);
+ }
+ GNUNET_free (n);
+ return GNUNET_YES;
+}
+
+
/**
* Connect to the transport service. Note that the connection may
* complete (or fail) asynchronously.
*
- * @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
* @param nd function to call on disconnect events
*/
struct GNUNET_TRANSPORT_Handle *
-GNUNET_TRANSPORT_connect (struct GNUNET_SCHEDULER_Handle *sched,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_TRANSPORT_connect (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;
ret = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_Handle));
- ret->sched = sched;
+ if (self != NULL)
+ {
+ ret->self = *self;
+ ret->check_self = GNUNET_YES;
+ }
ret->cfg = cfg;
ret->cls = cls;
ret->rec = rec;
ret->nc_cb = nc;
ret->nd_cb = nd;
ret->reconnect_delay = GNUNET_TIME_UNIT_ZERO;
+ ret->neighbours = GNUNET_CONTAINER_multihashmap_create(STARTING_NEIGHBOURS_SIZE);
schedule_reconnect (ret);
return ret;
}
void
GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
{
- struct GNUNET_TRANSPORT_TransmitHandle *th;
- 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
+ /* FIXME: this flag is dubious, we should be able to do this
+ more cleanly; also, we should probably do 'disconnect'
+ callbacks for every connected peer here, i.e. by calling
+ the iterator with 'forget_neighbours' instead of 'delete_neighbours'.
+ */
+
handle->in_disconnect = GNUNET_YES;
- while (NULL != (n = handle->neighbours))
- {
- handle->neighbours = n->next;
- switch (n->transmit_stage)
- {
- case TS_NEW:
- case TS_TRANSMITTED:
- /* nothing to do */
- break;
- case TS_QUEUED:
- case TS_TRANSMITTED_QUEUED:
- th = &n->transmit_handle;
- if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (handle->sched,
- th->notify_delay_task);
- th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
- break;
- default:
- GNUNET_break (0);
- }
- GNUNET_free (n);
- }
+
+ GNUNET_assert (GNUNET_SYSERR !=
+ GNUNET_CONTAINER_multihashmap_iterate(handle->neighbours,
+ &delete_neighbours,
+ handle));
+ GNUNET_CONTAINER_multihashmap_destroy (handle->neighbours);
+
while (NULL != (hwl = handle->hwl_head))
{
handle->hwl_head = hwl->next;
/* Added because somehow a notify_delay_task is remaining scheduled and is ever so annoying */
while ( (NULL != (cm = handle->control_head)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Disconnect before control message sent!\n"));
+#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);
+ GNUNET_SCHEDULER_cancel (cm->notify_delay_task);
cm->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_CONTAINER_DLL_remove (handle->control_head,
if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (handle->sched, handle->reconnect_task);
+ GNUNET_SCHEDULER_cancel (handle->reconnect_task);
handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
}
if (handle->quota_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (handle->sched, handle->quota_task);
+ GNUNET_SCHEDULER_cancel (handle->quota_task);
handle->quota_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_free_non_null (handle->my_hello);
"Disconnecting from transport service for good.\n");
#endif
handle->client = NULL;
- GNUNET_CLIENT_disconnect (client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (client, GNUNET_YES);
}
GNUNET_free (handle);
}
struct NeighbourList *n;
struct GNUNET_PeerIdentity me;
uint16_t size;
+ uint32_t ats_count;
if (h->client == NULL)
{
GNUNET_free (h);
return;
}
- if (msg == NULL)
+ if (msg == NULL)
{
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
}
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT:
- if (size != sizeof (struct ConnectInfoMessage))
+
+ if (size < sizeof (struct ConnectInfoMessage))
{
GNUNET_break (0);
break;
}
cim = (const struct ConnectInfoMessage *) msg;
+ ats_count = ntohl (cim->ats_count);
+ if (size != sizeof (struct ConnectInfoMessage) + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information))
+ {
+ GNUNET_break (0);
+ break;
+ }
+
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiving `%s' message for `%4s'.\n",
#endif
n = neighbour_find (h, &cim->id);
if (n == NULL)
- n = neighbour_add (h,
- &cim->id);
+ n = neighbour_add (h, &cim->id);
if (n == NULL)
- return;
+ return;
GNUNET_break (n->is_connected == GNUNET_NO);
n->is_connected = GNUNET_YES;
+ /* FIXME */
if (h->nc_cb != NULL)
- h->nc_cb (h->cls, &n->id,
- GNUNET_TIME_relative_ntoh (cim->latency),
- ntohl (cim->distance));
+ h->nc_cb (h->cls, &n->id,
+ &cim->ats,ats_count);
+ /* FIXEND */
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT:
if (size != sizeof (struct DisconnectInfoMessage))
break;
}
dim = (const struct DisconnectInfoMessage *) msg;
+ GNUNET_break (ntohl (dim->reserved) == 0);
#if DEBUG_TRANSPORT_DISCONNECT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiving `%s' message for `%4s'.\n",
GNUNET_i2s (&dim->peer));
#endif
n = neighbour_find (h, &dim->peer);
- GNUNET_break (n != NULL);
+ GNUNET_break (n != NULL);
if (n != NULL)
neighbour_disconnect (n);
break;
break;
}
im = (const struct InboundMessage *) msg;
- imm = (const struct GNUNET_MessageHeader *) &im[1];
- if (ntohs (imm->size) + sizeof (struct InboundMessage) != size)
+ GNUNET_break (0 == ntohl (im->reserved));
+ ats_count = ntohl(im->ats_count);
+ //imm = (const struct GNUNET_MessageHeader *) &im[1];
+ imm = (const struct GNUNET_MessageHeader *) &((&(im->ats))[ats_count+1]);
+
+ if (ntohs (imm->size) + sizeof (struct InboundMessage) + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) != size)
{
GNUNET_break (0);
break;
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;
}
+ /* FIXME: */
if (h->rec != NULL)
- h->rec (h->cls, &im->peer, imm,
- GNUNET_TIME_relative_ntoh (im->latency), ntohl(im->distance));
+ h->rec (h->cls, &im->peer, imm,
+ &im->ats, ats_count);
+ /* ENDFIX */
break;
default:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
n = th->neighbour;
#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Triggering timeout for request to transmit to `%4s' (%d)\n",
GNUNET_i2s (&n->id),
n->transmit_stage);
-#endif
+#endif
notify = th->notify;
+ th->notify = NULL;
notify_cls = th->notify_cls;
switch (n->transmit_stage)
{
#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;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking transport service for transmission of %u bytes to peer `%4s' within %llu ms.\n",
size, GNUNET_i2s (target),
- (unsigned long long) timeout.value);
+ (unsigned long long) timeout.rel_value);
#endif
n = neighbour_find (handle, target);
if (n == NULL)
- n = neighbour_add (handle, target);
- if (n == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created neighbour entry for peer `%s'\n",
+ GNUNET_i2s (target));
+ n = neighbour_add (handle, target);
+
+ }
+ if (n == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Could not create neighbour entry for peer `%s'\n",
GNUNET_i2s (target));
return NULL;
}
+
+ /**
+ * 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);
+ }
+
switch (n->transmit_stage)
{
case TS_NEW:
th->notify_size = size + sizeof (struct OutboundMessage);
th->priority = priority;
th->notify_delay_task
- = GNUNET_SCHEDULER_add_delayed (handle->sched, timeout,
- &peer_transmit_timeout, th);
+ = GNUNET_SCHEDULER_add_delayed (timeout,
+ &peer_transmit_timeout, th);
schedule_transmission (handle);
return th;
}
{
struct NeighbourList *n;
+ th->notify = NULL;
n = th->neighbour;
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmission request of %u bytes to `%4s' was cancelled.\n",
+ "Transmission request of %u bytes to `%4s' was canceled.\n",
th->notify_size - sizeof (struct OutboundMessage),
GNUNET_i2s (&n->id));
#endif
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (th->notify_delay_task);
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ }
switch (n->transmit_stage)
{
case TS_NEW:
break;
case TS_QUEUED:
n->transmit_stage = TS_NEW;
- if (n->is_connected == GNUNET_NO)
+ if ( (n->in_disconnect == GNUNET_NO) &&
+ (n->is_connected == GNUNET_NO) )
neighbour_free (n);
break;
case TS_TRANSMITTED:
projects / oweals / gnunet.git / blobdiff