[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18141 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18141 - gnunet/src/transport |
Date: |
Tue, 15 Nov 2011 09:07:14 +0100 |
Author: grothoff
Date: 2011-11-15 09:07:14 +0100 (Tue, 15 Nov 2011)
New Revision: 18141
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
asserts for 1903:
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2011-11-14 22:40:18 UTC
(rev 18140)
+++ gnunet/src/transport/gnunet-service-transport.c 2011-11-15 08:07:14 UTC
(rev 18141)
@@ -336,6 +336,7 @@
const char *transport_name = cls;
struct GNUNET_HELLO_Address address;
+ GNUNET_assert (strlen(transport_name) > 0);
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %X to peer `%s' ended \n",
session, GNUNET_i2s (peer));
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-11-14
22:40:18 UTC (rev 18140)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-11-15
08:07:14 UTC (rev 18141)
@@ -471,7 +471,7 @@
n->state = S_NOT_CONNECTED;
/* destroying address */
-
+ GNUNET_assert (strlen(n->address->transport_name) > 0);
GNUNET_ATS_address_destroyed (GST_ats, n->address, n->session);
/* request new address */
@@ -1142,7 +1142,10 @@
struct NeighbourMapEntry *n = lookup_neighbour (&cc->address->peer);
if (GNUNET_YES != success)
+ {
+ GNUNET_assert (strlen(cc->address->transport_name) > 0);
GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
+ }
if ( (NULL == neighbours) ||
(NULL == n) ||
(n->state == S_DISCONNECT))
@@ -1172,9 +1175,6 @@
n->session);
#endif
change_state (n, S_NOT_CONNECTED);
-
- GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
-
if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (n->ats_suggest);
n->ats_suggest =
@@ -1225,6 +1225,7 @@
GNUNET_i2s (&n->id),
GST_plugins_a2s (n->address), n->session);
#endif
+ GNUNET_assert (strlen(cc->address->transport_name) > 0);
GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
@@ -1333,7 +1334,7 @@
n->session);
#endif
change_state (n, S_NOT_CONNECTED);
-
+ GNUNET_assert (strlen(cc->address->transport_name) > 0);
GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
@@ -1342,7 +1343,6 @@
GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel,
n);
GNUNET_ATS_suggest_address (GST_ats, &n->id);
-
GNUNET_HELLO_address_free (cc->address);
GNUNET_free (cc);
}
@@ -1394,7 +1394,9 @@
if ( (session == NULL) && (0 == address->address_length) )
{
GNUNET_break_op (0);
- GNUNET_ATS_address_destroyed (GST_ats, address, session);
+ /* FIXME: is this actually possible? When does this happen? */
+ if (strlen(address->transport_name) > 0)
+ GNUNET_ATS_address_destroyed (GST_ats, address, session);
GNUNET_ATS_suggest_address (GST_ats, peer);
return GNUNET_NO;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18141 - gnunet/src/transport,
gnunet <=