From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 17 Feb 2010 14:20:12 +0000 (+0000)
Subject: fixes
X-Git-Tag: initial-import-from-subversion-38251~22689
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=956c30fff91409e2355ebf4f0015976d2e636868;p=oweals%2Fgnunet.git

fixes
---

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index b879a31c5..b07d565f1 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -3194,6 +3194,11 @@ handle_transport_notify_disconnect (void *cls,
               "Peer `%4s' disconnected from us.\n", GNUNET_i2s (peer));
 #endif
   n = find_neighbour (peer);
+  if (n == NULL)
+    {
+      GNUNET_break (0);
+      return;
+    }
   GNUNET_break (n->is_connected);
   cnm.header.size = htons (sizeof (struct DisconnectNotifyMessage));
   cnm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT);
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 337adc364..a4282607f 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -1464,7 +1464,7 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
                   "DISCONNECT",
 		  GNUNET_i2s (&dim->peer));
 #endif
-      n = neighbour_find (h, &cim->id);
+      n = neighbour_find (h, &dim->id);
       GNUNET_break (n != NULL);
       if (n != NULL)
 	neighbour_disconnect (n);      
diff --git a/src/util/server_nc.c b/src/util/server_nc.c
index 61775c6a1..88de62c63 100644
--- a/src/util/server_nc.c
+++ b/src/util/server_nc.c
@@ -220,8 +220,8 @@ GNUNET_SERVER_notification_context_destroy (struct GNUNET_SERVER_NotificationCon
   while (NULL != (pos = nc->clients))
     {
       nc->clients = pos->next;
-      GNUNET_SERVER_receive_done (pos->client, GNUNET_NO);
       GNUNET_SERVER_client_drop (pos->client); 
+      GNUNET_SERVER_receive_done (pos->client, GNUNET_NO);
       while (NULL != (pml = pos->pending_head))
 	{
 	  pos->pending_head = pml->next;