[GNUnet-SVN] r35702 - gnunet/src/dht

[gnunet]

Author: arthur
Date: 2015-05-01 10:51:08 +0200 (Fri, 01 May 2015)
New Revision: 35702

Modified:
   gnunet/src/dht/gnunet-service-wdht_neighbours.c
Log:
Adding a function pick_random_friend ()


Modified: gnunet/src/dht/gnunet-service-wdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-wdht_neighbours.c     2015-05-01 08:26:15 UTC 
(rev 35701)
+++ gnunet/src/dht/gnunet-service-wdht_neighbours.c     2015-05-01 08:51:08 UTC 
(rev 35702)
@@ -805,13 +805,13 @@
 {
   struct GNUNET_MessageHeader *payload;
 
-  payload = GNUNET_malloc(sizeof(struct GNUNET_MessageHeader) + data_size);
+  payload = GNUNET_malloc (sizeof (struct GNUNET_MessageHeader) + data_size);
   payload->size = data_size;
   payload->type = GNUNET_MESSAGE_TYPE_WDHT_GET_RESULT;
 
   forward_message_on_trail (NULL /* FIXME: put something right */,
                             trail_id,
-                            0/* FIXME: put something right */,
+                            0 /* FIXME: put something right */,
                             &my_identity,
                             put_path,
                             put_path_length,
@@ -875,9 +875,23 @@
 static struct FriendInfo *
 pick_random_friend ()
 {
-  /* FIXME: in my opinion, if have to pick a random friend from the friend_map
-     but i can't find a function to get a random friend from a mutlipeer_map */
-  /* return GNUNET_CONTAINER_multipeermap_get_random (friends_peermap); */
+  GNUNET_CONTAINER_PeerMapIterator *it;
+  if (0 != GNUNET_CONTAINER_multipeermap_get_random (friends_peermap,
+                                                     *it,
+                                                     NULL) ){
+    static struct FriendInfo **friend;
+    struct GNUNET_PeerIdentity *key;
+
+    /* FIXME: i am not sure of this one */
+    key = NULL;
+
+    if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (it,
+                                                                  key,
+                                                                  (void *) 
friend))
+    {
+      return *friend;
+    }
+  }
   return NULL;
 }
 
@@ -1205,7 +1219,8 @@
   const struct RandomWalkResponseMessage *rwrm;
 
   rwrm = (const struct RandomWalkResponseMessage *) message;
-  // 1) lookup trail => find Finger entry => fill in 'destination' and mark 
valid, move to end of sorted array, mark unsorted, update links from 'trails'
+  // 1) lookup trail => find Finger entry => fill in 'destination' and mark 
valid, move to end of sorted array,
+  //mark unsorted, update links from 'trails'
   /*
    * Steps :
    *  1 check if we are the correct layer