[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35340 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35340 - gnunet/src/transport |
Date: |
Tue, 3 Mar 2015 22:59:04 +0100 |
Author: grothoff
Date: 2015-03-03 22:59:04 +0100 (Tue, 03 Mar 2015)
New Revision: 35340
Modified:
gnunet/src/transport/gnunet-service-transport_ats.c
Log:
possible fix for #3690
Modified: gnunet/src/transport/gnunet-service-transport_ats.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_ats.c 2015-03-02 20:38:01 UTC
(rev 35339)
+++ gnunet/src/transport/gnunet-service-transport_ats.c 2015-03-03 21:59:04 UTC
(rev 35340)
@@ -80,6 +80,12 @@
*/
struct GNUNET_SCHEDULER_Task *unblock_task;
+ /**
+ * Set to #GNUNET_YES if the address has expired but we could
+ * not yet remove it because we still have a valid session.
+ */
+ int expired;
+
};
@@ -330,7 +336,8 @@
/* destroy session and address */
if ( (NULL == session) ||
(GNUNET_NO ==
- GNUNET_ATS_address_del_session (ai->ar, session)) )
+ GNUNET_ATS_address_del_session (ai->ar,
+ session)) )
GNUNET_ATS_address_destroy (ai->ar);
ai->ar = NULL;
@@ -534,7 +541,8 @@
GNUNET_break (0);
return;
}
- ai = find_ai (address, session);
+ ai = find_ai (address,
+ session);
if (NULL == ai)
{
/* We sometimes create sessions just for sending a PING,
@@ -555,18 +563,20 @@
GNUNET_i2s (&address->peer));
if (NULL == ai->ar)
{
- /* If ATS doesn't know about the address/session, and this
- was an inbound session that expired, then we must forget
- about the address as well. Otherwise, we are done as
- we have set `ai->session` to NULL already. */
- if (GNUNET_YES ==
- GNUNET_HELLO_address_check_option (address,
- GNUNET_HELLO_ADDRESS_INFO_INBOUND))
+ /* If ATS doesn't know about the address/session, and this was an
+ inbound session or one that expired, then we must forget about
+ the address as well. Otherwise, we are done as we have set
+ `ai->session` to NULL already. */
+ if ( (GNUNET_YES == ai->expired) ||
+ (GNUNET_YES ==
+ GNUNET_HELLO_address_check_option (address,
+
GNUNET_HELLO_ADDRESS_INFO_INBOUND)) )
GST_ats_expire_address (address);
return;
}
if (GNUNET_YES ==
- GNUNET_ATS_address_del_session (ai->ar, session))
+ GNUNET_ATS_address_del_session (ai->ar,
+ session))
{
ai->ar = NULL;
GST_ats_expire_address (address);
@@ -689,11 +699,23 @@
GNUNET_assert (0);
return;
}
+ if (NULL != ai->unblock_task)
+ {
+ GNUNET_SCHEDULER_cancel (ai->unblock_task);
+ ai->unblock_task = NULL;
+ num_blocked--;
+ }
+ if (NULL != ai->session)
+ {
+ ai->expired = GNUNET_YES;
+ GNUNET_ATS_address_destroy (ai->ar);
+ ai->ar = NULL;
+ return;
+ }
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_remove (p2a,
&address->peer,
ai));
- GNUNET_break (NULL == ai->session);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Telling ATS to destroy address from peer %s\n",
GNUNET_i2s (&address->peer));
@@ -710,12 +732,6 @@
GNUNET_ATS_address_destroy (ai->ar);
ai->ar = NULL;
}
- if (NULL != ai->unblock_task)
- {
- GNUNET_SCHEDULER_cancel (ai->unblock_task);
- ai->unblock_task = NULL;
- num_blocked--;
- }
publish_p2a_stat_update ();
GNUNET_HELLO_address_free (ai->address);
GNUNET_free (ai);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35340 - gnunet/src/transport,
gnunet <=