From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 15 May 2012 12:46:22 +0000 (+0000)
Subject: - fix for mantis 2350
X-Git-Tag: initial-import-from-subversion-38251~13483
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=61ce2675585cee27c115addff49540fc9e6fb617;p=oweals%2Fgnunet.git

- fix for mantis 2350
---

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 86df7bf7b..7dc9d32b9 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -1006,7 +1006,6 @@ disconnect_neighbour (struct NeighbourMapEntry *n)
     n->state = S_DISCONNECT;
     break;   
   case S_CONNECTED:
-  case S_RECONNECT_ATS:
   case S_RECONNECT_BLACKLIST:
   case S_RECONNECT_SENT:
   case S_CONNECTED_SWITCHING_BLACKLIST:
@@ -1021,6 +1020,15 @@ disconnect_neighbour (struct NeighbourMapEntry *n)
     disconnect_notify_cb (callback_cls, &n->id);
     n->state = S_DISCONNECT;
     break;
+  case S_RECONNECT_ATS:
+    /* ATS address request timeout, disconnect without sending disconnect message */
+    GNUNET_STATISTICS_set (GST_stats,
+                           gettext_noop ("# peers connected"),
+                           --neighbours_connected,
+                           GNUNET_NO);
+    disconnect_notify_cb (callback_cls, &n->id);
+    n->state = S_DISCONNECT;
+    break;
   case S_DISCONNECT:
     /* already disconnected, ignore */
     break;