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

[gnunet]

Author: supriti
Date: 2014-09-22 17:21:30 +0200 (Mon, 22 Sep 2014)
New Revision: 34303

Modified:
   gnunet/src/dht/gnunet-service-xdht_neighbours.c
   gnunet/src/dht/gnunet_dht_profiler.c
Log:
X-Vine: Fixes


Modified: gnunet/src/dht/gnunet-service-xdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht_neighbours.c     2014-09-22 15:12:15 UTC 
(rev 34302)
+++ gnunet/src/dht/gnunet-service-xdht_neighbours.c     2014-09-22 15:21:30 UTC 
(rev 34303)
@@ -2413,7 +2413,6 @@
   struct Closest_Peer successor;
   struct GNUNET_PeerIdentity best_known_dest;
   struct GNUNET_HashCode intermediate_trail_id;
-  struct GNUNET_PeerIdentity next_hop;
   uint64_t key_value;
   
   memcpy (&key_value, key, sizeof (uint64_t));
@@ -2435,6 +2434,7 @@
   }
     
 #if ENABLE_MALICIOUS
+  struct GNUNET_PeerIdentity next_hop;
   if (0 != GNUNET_CRYPTO_cmp_peer_identity (&successor.best_known_destination,
                                             &successor.next_hop))
   {

Modified: gnunet/src/dht/gnunet_dht_profiler.c
===================================================================
--- gnunet/src/dht/gnunet_dht_profiler.c        2014-09-22 15:12:15 UTC (rev 
34302)
+++ gnunet/src/dht/gnunet_dht_profiler.c        2014-09-22 15:21:30 UTC (rev 
34303)
@@ -1351,9 +1351,14 @@
   for (cnt = 0; cnt < num_peers && ac_cnt < n_active; cnt++)
   {
     if ((GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100) >=
-        PUT_PROBABILITY) || (a_ctx[ac_cnt].mc != NULL))
+        PUT_PROBABILITY))
       continue;
     
+#if ENABLE_MALICIOUS
+    if(a_ctx[ac_cnt].mc != NULL)
+      continue;
+#endif
+     
     a_ctx[cnt].ac = &a_ac[ac_cnt];
     a_ac[ac_cnt].ctx = &a_ctx[cnt];
     ac_cnt++;