From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 15 May 2012 11:31:41 +0000 (+0000)
Subject: - improved fix for 2356
X-Git-Tag: initial-import-from-subversion-38251~13484
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83b0e40a3fe81c53f81ede882403a1fec033f522;p=oweals%2Fgnunet.git

- improved fix for 2356
---

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 5a0f748e0..86df7bf7b 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -2337,6 +2337,7 @@ master_task (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 		"Cleaning up connection to `%s' after sending DISCONNECT\n",
 		GNUNET_i2s (&n->id));
+    n->state = S_DISCONNECT_FINISHED;
     free_neighbour (n);
     return;
   case S_DISCONNECT_FINISHED:
@@ -2623,7 +2624,7 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
     free_address (&n->primary_address);
     break;
   case S_DISCONNECT_FINISHED:
-    GNUNET_assert (0);
+    /* neighbour was freed and plugins told to terminate session */
     break;
   default:
     GNUNET_break (0);