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 fe32459d48c7f98caef1d0020479b37e58669017..8d08f82d9d3f516796604a662dcc9b977b3992af 100644
(file)
--- a/
src/transport/transport_api.c
+++ b/
src/transport/transport_api.c
@@
-574,7
+574,7
@@
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;
@@
-627,7
+627,7
@@
schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h,
GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
timeout,
GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
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;
@@
-1021,7
+1021,7
@@
request_connect (void *cls, size_t size, void *buf)
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_absolute_get_remaining
(th->timeout),
GNUNET_SCHEDULER_NO_TASK,
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);
}
@@
-1114,7
+1114,7
@@
remove_neighbour (struct GNUNET_TRANSPORT_Handle *h,
{
/* signal error */
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == th->notify_delay_task);
{
/* signal error */
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == th->notify_delay_task);
- transmit_timeout (th, NULL);
+ peer_transmit_timeout (th, NULL);
}
else
{
}
else
{
@@
-1150,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))
@@
-1336,7
+1339,7
@@
schedule_request (struct GNUNET_TRANSPORT_TransmitHandle *th)
GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_absolute_get_remaining
GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
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;
@@
-1601,7
+1604,7
@@
demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_absolute_get_remaining(th->timeout),
GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_absolute_get_remaining(th->timeout),
- &transmit_timeout,
+ &
peer_
transmit_timeout,
th);
}
GNUNET_CLIENT_disconnect (h->client);
th);
}
GNUNET_CLIENT_disconnect (h->client);
@@
-1944,7
+1947,7
@@
GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK,
- timeout, &transmit_timeout, th);
+ timeout, &
peer_
transmit_timeout, th);
return th;
}
return th;
}