-run unregister even if path is NULL, do check uniqueness

2 files changed, 3 insertions, 3 deletions

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 54c82a837..e39017675 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -2736,7 +2736,7 @@ GCC_new (const struct GNUNET_CADET_Hash *cid,
   c->own_pos = own_pos;
   c->path = p;
   p->c = c;
-
+  GNUNET_assert (NULL != p);
   if (GNUNET_OK != register_neighbors (c))
   {
     if (0 == own_pos)
@@ -2782,8 +2782,8 @@ GCC_destroy (struct CadetConnection *c)
   {
     connection_cancel_queues (c, GNUNET_YES);
     connection_cancel_queues (c, GNUNET_NO);
-    unregister_neighbors (c);
   }
+  unregister_neighbors (c);
 
   /* Cancel maintainance task (keepalive/timeout) */
   if (NULL != c->fwd_fc.poll_msg)
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index e5f6c3a26..41f7a363d 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -1962,7 +1962,7 @@ GCP_add_connection (struct CadetPeer *peer,
                  GNUNET_CONTAINER_multihashmap_put (peer->connections,
                                                     GCC_get_h (c),
                                                     c,
-                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
+                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        " now has %u connections.\n",
        GNUNET_CONTAINER_multihashmap_size (peer->connections));