[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36705 - gnunet/src/rps
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36705 - gnunet/src/rps |
Date: |
Tue, 1 Dec 2015 00:39:02 +0100 |
Author: ch3
Date: 2015-12-01 00:39:02 +0100 (Tue, 01 Dec 2015)
New Revision: 36705
Modified:
gnunet/src/rps/gnunet-service-rps_view.c
Log:
-fixed bug in removal of peer in "view"
Signed-off-by: Julius Bunger <address@hidden>
Modified: gnunet/src/rps/gnunet-service-rps_view.c
===================================================================
--- gnunet/src/rps/gnunet-service-rps_view.c 2015-11-30 23:06:23 UTC (rev
36704)
+++ gnunet/src/rps/gnunet-service-rps_view.c 2015-11-30 23:39:02 UTC (rev
36705)
@@ -177,7 +177,8 @@
View_remove_peer (const struct GNUNET_PeerIdentity *peer)
{
uint32_t *index;
- uint32_t *index_swap;
+ uint32_t *swap_index;
+ uint32_t last_index;
if (GNUNET_NO == View_contains_peer (peer))
{
@@ -185,11 +186,14 @@
}
index = GNUNET_CONTAINER_multipeermap_get (mpm, peer);
GNUNET_assert (NULL != index);
- if (*index < (View_size () - 1) )
+ last_index = View_size () - 1;
+ if (*index < last_index)
{ /* Fill the 'gap' in the array with the last peer */
- array[*index] = array[(View_size () - 1)];
- index_swap = GNUNET_CONTAINER_multipeermap_get (mpm, &array[View_size ()]);
- *index_swap = *index;
+ array[*index] = array[last_index];
+ GNUNET_assert (GNUNET_YES == View_contains_peer (&array[last_index]));
+ swap_index = GNUNET_CONTAINER_multipeermap_get (mpm, &array[last_index]);
+ GNUNET_assert (NULL != swap_index);
+ *swap_index = *index;
GNUNET_free (index);
}
GNUNET_CONTAINER_multipeermap_remove_all (mpm, peer);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36705 - gnunet/src/rps,
gnunet <=