*/
struct HelloWaitList *hwl_head;
- /**
- * My scheduler.
- */
- struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* My configuration.
*/
struct NeighbourList *next;
struct GNUNET_TIME_Relative retry_time;
struct GNUNET_TIME_Relative duration;
+ GNUNET_CONNECTION_TransmitReadyNotify notify;
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;
/* check outgoing quota */
duration = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
th->notify_size - sizeof (struct OutboundMessage));
- if (th->timeout.value < duration.value)
+ struct GNUNET_TIME_Absolute 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.value,
+ duration.rel_value,
GNUNET_i2s (&n->id));
#endif
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->transmit_stage = TS_NEW;
- if (NULL != th->notify)
- GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
+ if (NULL != (notify = th->notify))
+ {
+ th->notify = NULL;
+ GNUNET_assert (0 == notify (th->notify_cls, 0, NULL));
+ }
continue;
}
- if (duration.value > 0)
+ if (duration.rel_value > 0)
{
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
(unsigned int) n->out_tracker.available_bytes_per_s__,
(unsigned int) th->notify_size - sizeof (struct OutboundMessage),
GNUNET_i2s (&n->id),
- duration.value);
+ duration.rel_value);
#endif
retry_time = GNUNET_TIME_relative_min (retry_time,
duration);
ret = th;
}
if (ret == NULL)
- h->quota_task = GNUNET_SCHEDULER_add_delayed (h->sched,
- retry_time,
+ h->quota_task = GNUNET_SCHEDULER_add_delayed (retry_time,
"a_transmit_ready,
h);
return ret;
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,
{
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 long long) GNUNET_TIME_absolute_get_remaining (th->timeout).rel_value,
GNUNET_i2s (&n->id));
#endif
if (mret != 0)
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);
+ 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);
}
if (buf == NULL)
{
- GNUNET_SCHEDULER_add_continuation (sqc->handle->sched,
- sqc->cont,
+ GNUNET_SCHEDULER_add_continuation (sqc->cont,
sqc->cont_cls,
GNUNET_SCHEDULER_REASON_TIMEOUT);
GNUNET_free (sqc);
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);
struct NeighbourList *prev;
struct NeighbourList *pos;
+ GNUNET_assert (n->transmit_handle.notify == NULL);
h = n->h;
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
#endif
GNUNET_break (n->is_connected == GNUNET_YES);
n->is_connected = GNUNET_NO;
- if (h->nc_cb != NULL)
+ 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);
+
}
"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);
#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;
}
* @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)
+static void
+send_request_connect_message(struct GNUNET_TRANSPORT_Handle *h, struct NeighbourList *n)
{
struct TransportRequestConnectMessage *trcm;
* 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 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,
ret->self = *self;
ret->check_self = GNUNET_YES;
}
- ret->sched = sched;
ret->cfg = cfg;
ret->cls = cls;
ret->rec = rec;
th = &n->transmit_handle;
if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (handle->sched,
- th->notify_delay_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));
#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);
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",
break;
}
im = (const struct InboundMessage *) msg;
+ GNUNET_break (0 == ntohl (im->reserved));
imm = (const struct GNUNET_MessageHeader *) &im[1];
if (ntohs (imm->size) + sizeof (struct InboundMessage) != size)
{
n->transmit_stage);
#endif
notify = th->notify;
+ th->notify = NULL;
notify_cls = th->notify_cls;
switch (n->transmit_stage)
{
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' 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)
{
th->notify_size = size + sizeof (struct OutboundMessage);
th->priority = priority;
th->notify_delay_task
- = GNUNET_SCHEDULER_add_delayed (handle->sched, timeout,
+ = 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,
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:
projects / oweals / gnunet.git / blobdiff