[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35889 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35889 - gnunet/src/cadet |
Date: |
Mon, 8 Jun 2015 22:23:17 +0200 |
Author: grothoff
Date: 2015-06-08 22:23:17 +0200 (Mon, 08 Jun 2015)
New Revision: 35889
Modified:
gnunet/src/cadet/gnunet-service-cadet_connection.c
gnunet/src/cadet/gnunet-service-cadet_peer.c
Log:
-run unregister even if path is NULL, do check uniqueness
Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c 2015-06-08 19:59:01 UTC
(rev 35888)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c 2015-06-08 20:23:17 UTC
(rev 35889)
@@ -2736,7 +2736,7 @@
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 @@
{
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)
Modified: gnunet/src/cadet/gnunet-service-cadet_peer.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_peer.c 2015-06-08 19:59:01 UTC
(rev 35888)
+++ gnunet/src/cadet/gnunet-service-cadet_peer.c 2015-06-08 20:23:17 UTC
(rev 35889)
@@ -1962,7 +1962,7 @@
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));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35889 - gnunet/src/cadet,
gnunet <=