projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backup errno
[oweals/gnunet.git]
/
src
/
transport
/
transport_api.c
diff --git
a/src/transport/transport_api.c
b/src/transport/transport_api.c
index dab244e4572dca951b6503f3c56cb711363c746e..8d08f82d9d3f516796604a662dcc9b977b3992af 100644
(file)
--- a/
src/transport/transport_api.c
+++ b/
src/transport/transport_api.c
@@
-203,7
+203,7
@@
struct GNUNET_TRANSPORT_TransmitHandle
* Function to call when notify_size bytes are available
* for transmission.
*/
* Function to call when notify_size bytes are available
* for transmission.
*/
- GNUNET_
NETWORK
_TransmitReadyNotify notify;
+ GNUNET_
CONNECTION
_TransmitReadyNotify notify;
/**
* Closure for notify.
/**
* Closure for notify.
@@
-278,7
+278,7
@@
struct GNUNET_TRANSPORT_Handle
/**
* Handle to our registration with the client for notification.
*/
/**
* Handle to our registration with the client for notification.
*/
- struct GNUNET_
NETWORK
_TransmitHandle *network_handle;
+ struct GNUNET_
CONNECTION
_TransmitHandle *network_handle;
/**
* Linked list of transmit handles that are waiting for the
/**
* Linked list of transmit handles that are waiting for the
@@
-313,7
+313,7
@@
struct GNUNET_TRANSPORT_Handle
/**
* My configuration.
*/
/**
* My configuration.
*/
- struct GNUNET_CONFIGURATION_Handle *cfg;
+
const
struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* Linked list of the current neighbours of this peer.
/**
* Linked list of the current neighbours of this peer.
@@
-390,8
+390,15
@@
transport_notify_ready (void *cls, size_t size, void *buf)
GNUNET_assert (n->transmit_handle == th);
n->transmit_handle = NULL;
}
GNUNET_assert (n->transmit_handle == th);
n->transmit_handle = NULL;
}
+ 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;
+ }
GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
GNUNET_free (th);
GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
GNUNET_free (th);
+ if (h->connect_ready_head != NULL) schedule_transmission (h); /* FIXME: is this ok? */
return 0;
}
#if DEBUG_TRANSPORT
return 0;
}
#if DEBUG_TRANSPORT
@@
-405,13
+412,11
@@
transport_notify_ready (void *cls, size_t size, void *buf)
do
{
th = h->connect_ready_head;
do
{
th = h->connect_ready_head;
- if (th->notify_delay_task != GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK)
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
{
- /* remove existing time out task (only applies if
- this is not the first iteration of the loop) */
GNUNET_SCHEDULER_cancel (h->sched,
th->notify_delay_task);
GNUNET_SCHEDULER_cancel (h->sched,
th->notify_delay_task);
- th->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_assert (th->notify_size <= size);
if (th->next != NULL)
}
GNUNET_assert (th->notify_size <= size);
if (th->next != NULL)
@@
-459,13
+464,13
@@
schedule_transmission (struct GNUNET_TRANSPORT_Handle *h)
th = h->connect_ready_head;
if (th == NULL)
return; /* no request pending */
th = h->connect_ready_head;
if (th == NULL)
return; /* no request pending */
- if (th->notify_delay_task != GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK)
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
/* remove existing time out task, will be integrated
with transmit_ready notification! */
GNUNET_SCHEDULER_cancel (h->sched,
th->notify_delay_task);
{
/* remove existing time out task, will be integrated
with transmit_ready notification! */
GNUNET_SCHEDULER_cancel (h->sched,
th->notify_delay_task);
- th->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
h->transmission_scheduled = GNUNET_YES;
h->network_handle = GNUNET_CLIENT_notify_transmit_ready (h->client,
}
h->transmission_scheduled = GNUNET_YES;
h->network_handle = GNUNET_CLIENT_notify_transmit_ready (h->client,
@@
-529,10
+534,10
@@
remove_from_any_list (struct GNUNET_TRANSPORT_TransmitHandle *th)
struct GNUNET_TRANSPORT_Handle *h;
h = th->handle;
struct GNUNET_TRANSPORT_Handle *h;
h = th->handle;
- if (th->notify_delay_task != GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK)
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
{
GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
- th->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
if (th->prev == NULL)
{
}
if (th->prev == NULL)
{
@@
-569,11
+574,11
@@
try_connect (struct GNUNET_TRANSPORT_TransmitHandle *th);
* TransmitHandle.
*/
static void
* TransmitHandle.
*/
static void
-transmit_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+
peer_
transmit_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
{
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
- th->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
if (th->neighbour != NULL)
th->neighbour->transmit_handle = NULL;
#if DEBUG_TRANSPORT
if (th->neighbour != NULL)
th->neighbour->transmit_handle = NULL;
#if DEBUG_TRANSPORT
@@
-605,7
+610,7
@@
schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h,
size_t size,
int at_head,
struct GNUNET_TIME_Relative timeout,
size_t size,
int at_head,
struct GNUNET_TIME_Relative timeout,
- GNUNET_
NETWORK
_TransmitReadyNotify notify,
+ GNUNET_
CONNECTION
_TransmitReadyNotify notify,
void *notify_cls)
{
struct GNUNET_TRANSPORT_TransmitHandle *th;
void *notify_cls)
{
struct GNUNET_TRANSPORT_TransmitHandle *th;
@@
-620,9
+625,9
@@
schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h,
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
timeout,
timeout,
- &transmit_timeout, th);
+ &
peer_
transmit_timeout, th);
if (at_head)
{
th->next = h->connect_ready_head;
if (at_head)
{
th->next = h->connect_ready_head;
@@
-785,7
+790,7
@@
hello_wait_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
struct HelloWaitList *pos;
struct HelloWaitList *prev;
struct HelloWaitList *pos;
struct HelloWaitList *prev;
- hwl->task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ hwl->task = GNUNET_SCHEDULER_NO_TASK;
if (GNUNET_TIME_absolute_get_remaining (hwl->timeout).value > 0)
{
#if DEBUG_TRANSPORT
if (GNUNET_TIME_absolute_get_remaining (hwl->timeout).value > 0)
{
#if DEBUG_TRANSPORT
@@
-797,7
+802,7
@@
hello_wait_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
hwl->task = GNUNET_SCHEDULER_add_delayed (hwl->handle->sched,
GNUNET_YES,
GNUNET_SCHEDULER_PRIORITY_KEEP,
hwl->task = GNUNET_SCHEDULER_add_delayed (hwl->handle->sched,
GNUNET_YES,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_absolute_get_remaining (hwl->timeout),
&hello_wait_timeout, hwl);
return;
GNUNET_TIME_absolute_get_remaining (hwl->timeout),
&hello_wait_timeout, hwl);
return;
@@
-857,7
+862,7
@@
GNUNET_TRANSPORT_get_hello (struct GNUNET_TRANSPORT_Handle *handle,
hwl->task = GNUNET_SCHEDULER_add_delayed (handle->sched,
GNUNET_YES,
GNUNET_SCHEDULER_PRIORITY_KEEP,
hwl->task = GNUNET_SCHEDULER_add_delayed (handle->sched,
GNUNET_YES,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
timeout,
&hello_wait_timeout, hwl);
return;
timeout,
&hello_wait_timeout, hwl);
return;
@@
-979,7
+984,7
@@
request_connect (void *cls, size_t size, void *buf)
struct TryConnectMessage *tcm;
struct GNUNET_TRANSPORT_Handle *h;
struct TryConnectMessage *tcm;
struct GNUNET_TRANSPORT_Handle *h;
- GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK);
+ GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_TASK);
h = th->handle;
if (buf == NULL)
{
h = th->handle;
if (buf == NULL)
{
@@
-989,6
+994,11
@@
request_connect (void *cls, size_t size, void *buf)
"TRY_CONNECT",
GNUNET_i2s(&th->target));
#endif
"TRY_CONNECT",
GNUNET_i2s(&th->target));
#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;
+ }
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
return 0;
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
return 0;
@@
-1008,10
+1018,10
@@
request_connect (void *cls, size_t size, void *buf)
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_absolute_get_remaining
(th->timeout),
GNUNET_TIME_absolute_get_remaining
(th->timeout),
- &transmit_timeout, th);
+ &
peer_
transmit_timeout, th);
insert_transmit_handle (&h->connect_wait_head, th);
return sizeof (struct TryConnectMessage);
}
insert_transmit_handle (&h->connect_wait_head, th);
return sizeof (struct TryConnectMessage);
}
@@
-1028,7
+1038,7
@@
request_connect (void *cls, size_t size, void *buf)
static void
try_connect (struct GNUNET_TRANSPORT_TransmitHandle *th)
{
static void
try_connect (struct GNUNET_TRANSPORT_TransmitHandle *th)
{
- GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK);
+ GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_TASK);
schedule_control_transmit (th->handle,
sizeof (struct TryConnectMessage),
GNUNET_NO,
schedule_control_transmit (th->handle,
sizeof (struct TryConnectMessage),
GNUNET_NO,
@@
-1050,7
+1060,7
@@
try_connect_task (void *cls,
{
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
{
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
- th->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
try_connect (th);
}
try_connect (th);
}
@@
-1103,18
+1113,22
@@
remove_neighbour (struct GNUNET_TRANSPORT_Handle *h,
if (GNUNET_TIME_absolute_get_remaining (th->timeout).value <= CONNECT_RETRY_TIMEOUT.value)
{
/* signal error */
if (GNUNET_TIME_absolute_get_remaining (th->timeout).value <= CONNECT_RETRY_TIMEOUT.value)
{
/* signal error */
- GNUNET_assert (GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK == th->notify_delay_task);
- transmit_timeout (th, NULL);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == th->notify_delay_task);
+ peer_transmit_timeout (th, NULL);
}
else
{
}
else
{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Connection with `%4s' failed, will keep trying for %llu ms to deliver message\n"),
+ GNUNET_i2s (peer),
+ GNUNET_TIME_absolute_get_remaining (th->timeout).value);
/* try again in a bit */
/* try again in a bit */
- GNUNET_assert (GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK == th->notify_delay_task);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == th->notify_delay_task);
th->notify_delay_task
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
th->notify_delay_task
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
CONNECT_RETRY_TIMEOUT,
&try_connect_task,
th);
CONNECT_RETRY_TIMEOUT,
&try_connect_task,
th);
@@
-1136,6
+1150,9
@@
reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
struct GNUNET_TRANSPORT_TransmitHandle *pos;
struct NeighbourList *n;
struct GNUNET_TRANSPORT_TransmitHandle *pos;
struct NeighbourList *n;
+ fprintf (stderr,
+ "Trying to reconnect to transport!\n");
+
/* Forget about all neighbours that we used to be connected
to */
while (NULL != (n = h->neighbours))
/* Forget about all neighbours that we used to be connected
to */
while (NULL != (n = h->neighbours))
@@
-1144,7
+1161,7
@@
reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
#endif
GNUNET_assert (h->client == NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
#endif
GNUNET_assert (h->client == NULL);
- h->reconnect_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ 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,
h->client = GNUNET_CLIENT_connect (h->sched, "transport", h->cfg);
GNUNET_assert (h->client != NULL);
/* make sure we don't send "START" twice,
@@
-1189,12
+1206,12
@@
schedule_reconnect (struct GNUNET_TRANSPORT_Handle *h)
h->reconnect_delay.value);
#endif
GNUNET_assert (h->client == NULL);
h->reconnect_delay.value);
#endif
GNUNET_assert (h->client == NULL);
- GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK);
+ GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
h->reconnect_task
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_DEFAULT,
h->reconnect_task
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
h->reconnect_delay, &reconnect, h);
h->reconnect_delay = GNUNET_TIME_UNIT_SECONDS;
}
h->reconnect_delay, &reconnect, h);
h->reconnect_delay = GNUNET_TIME_UNIT_SECONDS;
}
@@
-1217,7
+1234,7
@@
transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
{
struct GNUNET_TRANSPORT_TransmitHandle *th = cls;
- th->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
schedule_request (th);
}
schedule_request (th);
}
@@
-1252,10
+1269,10
@@
schedule_request (struct GNUNET_TRANSPORT_TransmitHandle *th)
h = th->handle;
n = th->neighbour;
h = th->handle;
n = th->neighbour;
- if (th->notify_delay_task != GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK)
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
{
GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
- th->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
/* check outgoing quota */
duration = GNUNET_TIME_absolute_get_duration (n->last_quota_update);
}
/* check outgoing quota */
duration = GNUNET_TIME_absolute_get_duration (n->last_quota_update);
@@
-1298,7
+1315,7
@@
schedule_request (struct GNUNET_TRANSPORT_TransmitHandle *th)
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
duration, &transmit_ready, th);
return;
}
duration, &transmit_ready, th);
return;
}
@@
-1320,9
+1337,9
@@
schedule_request (struct GNUNET_TRANSPORT_TransmitHandle *th)
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_absolute_get_remaining
GNUNET_TIME_absolute_get_remaining
- (th->timeout), &transmit_timeout, th);
+ (th->timeout), &
peer_
transmit_timeout, th);
return;
}
n->transmit_ok = GNUNET_NO;
return;
}
n->transmit_ok = GNUNET_NO;
@@
-1392,10
+1409,10
@@
add_neighbour (struct GNUNET_TRANSPORT_Handle *h,
"Found pending request for `%4s' will trigger it now.\n",
GNUNET_i2s (&pos->target));
#endif
"Found pending request for `%4s' will trigger it now.\n",
GNUNET_i2s (&pos->target));
#endif
- if (pos->notify_delay_task != GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK)
+ if (pos->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (h->sched, pos->notify_delay_task);
{
GNUNET_SCHEDULER_cancel (h->sched, pos->notify_delay_task);
- pos->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ pos->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
schedule_request (pos);
}
}
schedule_request (pos);
}
@@
-1430,7
+1447,7
@@
add_neighbour (struct GNUNET_TRANSPORT_Handle *h,
*/
struct GNUNET_TRANSPORT_Handle *
GNUNET_TRANSPORT_connect (struct GNUNET_SCHEDULER_Handle *sched,
*/
struct GNUNET_TRANSPORT_Handle *
GNUNET_TRANSPORT_connect (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_CONFIGURATION_Handle *cfg,
+
const
struct GNUNET_CONFIGURATION_Handle *cfg,
void *cls,
GNUNET_TRANSPORT_ReceiveCallback rec,
GNUNET_TRANSPORT_NotifyConnect nc,
void *cls,
GNUNET_TRANSPORT_ReceiveCallback rec,
GNUNET_TRANSPORT_NotifyConnect nc,
@@
-1484,21
+1501,23
@@
GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
struct GNUNET_CLIENT_Connection *client;
#if DEBUG_TRANSPORT
struct GNUNET_CLIENT_Connection *client;
#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transport disconnect called!\n");
#endif
while (NULL != (th = handle->connect_ready_head))
{
handle->connect_ready_head = th->next;
#endif
while (NULL != (th = handle->connect_ready_head))
{
handle->connect_ready_head = th->next;
+ GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_TASK);
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
}
while (NULL != (th = handle->connect_wait_head))
{
handle->connect_wait_head = th->next;
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
}
while (NULL != (th = handle->connect_wait_head))
{
handle->connect_wait_head = th->next;
- if (th->notify_delay_task != GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK)
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (handle->sched, th->notify_delay_task);
{
GNUNET_SCHEDULER_cancel (handle->sched, th->notify_delay_task);
- th->notify_delay_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
}
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
@@
-1519,10
+1538,10
@@
GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
hwl->rec (hwl->rec_cls, GNUNET_TIME_UNIT_ZERO, NULL, NULL);
GNUNET_free (hwl);
}
hwl->rec (hwl->rec_cls, GNUNET_TIME_UNIT_ZERO, NULL, NULL);
GNUNET_free (hwl);
}
- if (handle->reconnect_task != GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK)
+ if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (handle->sched, handle->reconnect_task);
{
GNUNET_SCHEDULER_cancel (handle->sched, handle->reconnect_task);
- handle->reconnect_task = GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_free_non_null (handle->my_hello);
handle->my_hello = NULL;
}
GNUNET_free_non_null (handle->my_hello);
handle->my_hello = NULL;
@@
-1573,19
+1592,19
@@
demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
#endif
if (h->network_handle != NULL)
{
#endif
if (h->network_handle != NULL)
{
- GNUNET_
NETWORK
_notify_transmit_ready_cancel (h->network_handle);
+ GNUNET_
CONNECTION
_notify_transmit_ready_cancel (h->network_handle);
h->network_handle = NULL;
h->transmission_scheduled = GNUNET_NO;
th = h->connect_ready_head;
/* add timeout again, we cancelled the transmit_ready task! */
h->network_handle = NULL;
h->transmission_scheduled = GNUNET_NO;
th = h->connect_ready_head;
/* add timeout again, we cancelled the transmit_ready task! */
- GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK);
+ GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_TASK);
th->notify_delay_task
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
th->notify_delay_task
= GNUNET_SCHEDULER_add_delayed (h->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
+ GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_absolute_get_remaining(th->timeout),
GNUNET_TIME_absolute_get_remaining(th->timeout),
- &transmit_timeout,
+ &
peer_
transmit_timeout,
th);
}
GNUNET_CLIENT_disconnect (h->client);
th);
}
GNUNET_CLIENT_disconnect (h->client);
@@
-1692,7
+1711,7
@@
demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
GNUNET_SCHEDULER_cancel (h->sched,
n->transmit_handle->notify_delay_task);
n->transmit_handle->notify_delay_task =
GNUNET_SCHEDULER_cancel (h->sched,
n->transmit_handle->notify_delay_task);
n->transmit_handle->notify_delay_task =
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK;
+ GNUNET_SCHEDULER_NO_TASK;
GNUNET_assert (GNUNET_YES == n->received_ack);
schedule_request (n->transmit_handle);
}
GNUNET_assert (GNUNET_YES == n->received_ack);
schedule_request (n->transmit_handle);
}
@@
-1768,7
+1787,7
@@
demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
struct ClientTransmitWrapper
{
struct ClientTransmitWrapper
{
- GNUNET_
NETWORK
_TransmitReadyNotify notify;
+ GNUNET_
CONNECTION
_TransmitReadyNotify notify;
void *notify_cls;
struct GNUNET_TRANSPORT_TransmitHandle *th;
};
void *notify_cls;
struct GNUNET_TRANSPORT_TransmitHandle *th;
};
@@
-1856,7
+1875,7
@@
GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle
*target, size_t size,
unsigned int priority,
struct GNUNET_TIME_Relative timeout,
*target, size_t size,
unsigned int priority,
struct GNUNET_TIME_Relative timeout,
- GNUNET_
NETWORK
_TransmitReadyNotify
+ GNUNET_
CONNECTION
_TransmitReadyNotify
notify, void *notify_cls)
{
struct GNUNET_TRANSPORT_TransmitHandle *pos;
notify, void *notify_cls)
{
struct GNUNET_TRANSPORT_TransmitHandle *pos;
@@
-1927,8
+1946,8
@@
GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle
= GNUNET_SCHEDULER_add_delayed (handle->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
= GNUNET_SCHEDULER_add_delayed (handle->sched,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_
PREREQUISITE_
TASK,
- timeout, &transmit_timeout, th);
+ GNUNET_SCHEDULER_NO_TASK,
+ timeout, &
peer_
transmit_timeout, th);
return th;
}
return th;
}
@@
-1943,8
+1962,7
@@
GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle
/**
/**
- * Cancel the specified transmission-ready
- * notification.
+ * Cancel the specified transmission-ready notification.
*/
void
GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct
*/
void
GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct
@@
-1964,11
+1982,12
@@
GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct
h = th->handle;
if ((h->connect_ready_head == NULL) && (h->network_handle != NULL))
{
h = th->handle;
if ((h->connect_ready_head == NULL) && (h->network_handle != NULL))
{
- GNUNET_
NETWORK
_notify_transmit_ready_cancel (h->network_handle);
+ GNUNET_
CONNECTION
_notify_transmit_ready_cancel (h->network_handle);
h->network_handle = NULL;
h->transmission_scheduled = GNUNET_NO;
}
GNUNET_free (th->notify_cls);
h->network_handle = NULL;
h->transmission_scheduled = GNUNET_NO;
}
GNUNET_free (th->notify_cls);
+ GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_TASK);
GNUNET_free (th);
}
GNUNET_free (th);
}