[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22391 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22391 - gnunet/src/transport |
Date: |
Fri, 29 Jun 2012 17:16:37 +0200 |
Author: wachs
Date: 2012-06-29 17:16:37 +0200 (Fri, 29 Jun 2012)
New Revision: 22391
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
- change for mantis 0002445
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2012-06-29 15:12:56 UTC
(rev 22390)
+++ gnunet/src/transport/gnunet-service-transport.c 2012-06-29 15:16:37 UTC
(rev 22391)
@@ -340,7 +340,6 @@
{
const char *transport_name = cls;
struct GNUNET_HELLO_Address address;
- int ret;
GNUNET_assert (strlen (transport_name) > 0);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p to peer `%s' ended \n",
@@ -354,13 +353,10 @@
address.address = NULL;
address.address_length = 0;
address.transport_name = transport_name;
- ret = GST_neighbours_session_terminated (peer, session);
- if (GNUNET_NO == ret)
- {
- /* This was a session currently not used by
- * neighbours so we have to try to destroy it here */
- GNUNET_ATS_address_destroyed (GST_ats, &address, session);
- }
+ GST_neighbours_session_terminated (peer, session);
+
+ /* Tell ATS that session has ended */
+ GNUNET_ATS_address_destroyed (GST_ats, &address, session);
}
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2012-06-29
15:12:56 UTC (rev 22390)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2012-06-29
15:16:37 UTC (rev 22391)
@@ -772,16 +772,8 @@
{
GST_validation_set_address_use (na->address, na->session, GNUNET_NO,
__LINE__);
GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, GNUNET_NO);
- GNUNET_ATS_address_destroyed (GST_ats, na->address, na->session);
}
- else
- {
- if (NULL != na->address)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "HACK: destroy address\n");
- GNUNET_ATS_address_destroyed (GST_ats, na->address, na->session);
- }
- }
+
na->ats_active = GNUNET_NO;
if (NULL != na->address)
{
@@ -2827,6 +2819,7 @@
break;
case S_DISCONNECT_FINISHED:
/* neighbour was freed and plugins told to terminate session */
+ return GNUNET_NO;
break;
default:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state
(n->state));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22391 - gnunet/src/transport,
gnunet <=