[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18070 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18070 - gnunet/src/transport |
Date: |
Wed, 9 Nov 2011 13:42:42 +0100 |
Author: grothoff
Date: 2011-11-09 13:42:42 +0100 (Wed, 09 Nov 2011)
New Revision: 18070
Modified:
gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
clean up, asserts, FIXME
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-11-09
11:56:08 UTC (rev 18069)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-11-09
12:42:42 UTC (rev 18070)
@@ -1247,6 +1247,7 @@
if (n->state == S_CONNECTED)
{
/* mark old address as no longer used */
+ GNUNET_assert (NULL != n->address);
GST_validation_set_address_use (&n->id,
n->address,
n->session,
@@ -1472,9 +1473,9 @@
{
struct NeighbourMapEntry *n;
- // This can happen during shutdown
if (neighbours == NULL)
{
+ /* This can happen during shutdown */
return;
}
@@ -1488,17 +1489,22 @@
return;
if (session != n->session)
return; /* doesn't affect us */
-
+ if (n->state == S_CONNECTED)
+ GST_validation_set_address_use (&n->id,
+ n->address,
+ n->session,
+ GNUNET_NO);
n->session = NULL;
if (NULL != n->address)
{
GNUNET_HELLO_address_free (n->address);
n->address = NULL;
}
-
+
/* not connected anymore anyway, shouldn't matter */
if ((S_CONNECTED != n->state) && (!is_connecting (n)))
return;
+ // FIXME: n->state = S_FAST_RECONNECT;
/* We are connected, so ask ATS to switch addresses */
GNUNET_SCHEDULER_cancel (n->timeout_task);
@@ -1509,7 +1515,7 @@
if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (n->ats_suggest);
n->ats_suggest =
- GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel,
+ GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, &ats_suggest_cancel,
n);
GNUNET_ATS_suggest_address (GST_ats, peer);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18070 - gnunet/src/transport,
gnunet <=