[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36083 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36083 - gnunet/src/cadet |
Date: |
Wed, 15 Jul 2015 13:45:50 +0200 |
Author: grothoff
Date: 2015-07-15 13:45:50 +0200 (Wed, 15 Jul 2015)
New Revision: 36083
Modified:
gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
-need to fully unregister from neighbours, as otherwise assertion fails if
identical connection is added
Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c 2015-07-15 11:45:16 UTC
(rev 36082)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c 2015-07-15 11:45:50 UTC
(rev 36083)
@@ -1694,9 +1694,15 @@
if (NULL == c->path)
return;
if (NULL != c->next_peer)
+ {
GCP_remove_connection (c->next_peer, c);
+ c->next_peer = NULL;
+ }
if (NULL != c->prev_peer)
+ {
GCP_remove_connection (c->prev_peer, c);
+ c->prev_peer = NULL;
+ }
}
@@ -3266,16 +3272,7 @@
c));
/* Cancel queue in the direction that just died. */
connection_cancel_queues (c, ! fwd);
- if (fwd)
- {
- GCP_remove_connection (c->prev_peer, c);
- c->prev_peer = NULL;
- }
- else
- {
- GCP_remove_connection (c->next_peer, c);
- c->next_peer = NULL;
- }
+ unregister_neighbors (c);
GNUNET_assert (NULL != ( (fwd) ? c->next_peer : c->prev_peer) );
GCC_check_connections ();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36083 - gnunet/src/cadet,
gnunet <=