[GNUnet-SVN] [gnunet] branch master updated (75885ed26 -> e5bce382b)

[gnunet]

This is an automated email from the git hooks/post-receive script.

julius-buenger pushed a change to branch master
in repository gnunet.

    from 75885ed26 rps service: improve logging - log peer id
     new a53cfea7f rps profiler: destroy pending req and rep in right place
     new e5bce382b fix rps service: put peer id into structure once

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/rps/gnunet-rps-profiler.c          | 12 +++++-------
 src/rps/gnunet-service-rps_custommap.c |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index a06598764..49714872f 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -922,13 +922,11 @@ cancel_request (struct PendingReply *pending_rep)
 void
 clean_peer (unsigned peer_index)
 {
-  struct PendingReply *pending_rep;
   struct PendingRequest *pending_req;
 
-  pending_rep = rps_peers[peer_index].pending_rep_head;
-  while (NULL != (pending_rep = rps_peers[peer_index].pending_rep_head))
+  while (NULL != (pending_req = rps_peers[peer_index].pending_req_head))
   {
-    cancel_request (pending_rep);
+    cancel_pending_req (pending_req);
   }
   pending_req = rps_peers[peer_index].pending_req_head;
   rps_disconnect_adapter (&rps_peers[peer_index],
@@ -1273,7 +1271,7 @@ rps_disconnect_adapter (void *cls,
 {
   struct RPSPeer *peer = cls;
   struct GNUNET_RPS_Handle *h = op_result;
-  struct PendingRequest *pending_req;
+  struct PendingReply *pending_rep;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "disconnect_adapter (%u)\n",
@@ -1281,9 +1279,9 @@ rps_disconnect_adapter (void *cls,
   GNUNET_assert (NULL != peer);
   if (NULL != peer->rps_handle)
   {
-    while (NULL != (pending_req = peer->pending_req_head))
+    while (NULL != (pending_rep = peer->pending_rep_head))
     {
-      cancel_pending_req (pending_req);
+      cancel_request (pending_rep);
     }
     GNUNET_assert (h == peer->rps_handle);
     GNUNET_RPS_disconnect (h);
diff --git a/src/rps/gnunet-service-rps_custommap.c 
b/src/rps/gnunet-service-rps_custommap.c
index 42507655b..9e003eb39 100644
--- a/src/rps/gnunet-service-rps_custommap.c
+++ b/src/rps/gnunet-service-rps_custommap.c
@@ -213,7 +213,7 @@ CustomPeerMap_remove_peer (const struct CustomPeerMap 
*c_peer_map,
     GNUNET_assert (NULL != last_index);
     GNUNET_assert (CustomPeerMap_size (c_peer_map) == *last_index);
     GNUNET_CONTAINER_multihashmap32_put (c_peer_map->hash_map, *index, last_p,
-        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
     GNUNET_CONTAINER_multihashmap32_remove_all (c_peer_map->hash_map, 
*last_index);
     *last_index = *index;
   }

-- 
To stop receiving notification emails like this one, please contact
address@hidden