X-Vine: Fixes

2 files changed, 7 insertions, 2 deletions

diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c
index b36f7c657..c7e99c2e7 100644
--- a/src/dht/gnunet-service-xdht_neighbours.c
+++ b/src/dht/gnunet-service-xdht_neighbours.c
@@ -2413,7 +2413,6 @@ GDS_NEIGHBOURS_handle_get(const struct GNUNET_HashCode *key,
   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 @@ GDS_NEIGHBOURS_handle_get(const struct GNUNET_HashCode *key,
   }
     
 #if ENABLE_MALICIOUS
+  struct GNUNET_PeerIdentity next_hop;
   if (0 != GNUNET_CRYPTO_cmp_peer_identity (&successor.best_known_destination,
                                             &successor.next_hop))
   {
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c
index 592e31bfe..f23a22f07 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -1351,9 +1351,14 @@ test_run (void *cls,
   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++;