[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12514 - gnunet/src/dht
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12514 - gnunet/src/dht |
Date: |
Wed, 11 Aug 2010 15:11:28 +0200 |
Author: nevans
Date: 2010-08-11 15:11:28 +0200 (Wed, 11 Aug 2010)
New Revision: 12514
Modified:
gnunet/src/dht/gnunet-service-dht.c
Log:
hopefull stop strict kademlia from being breadth first search of network
Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-08-11 12:21:06 UTC (rev 12513)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-08-11 13:11:28 UTC (rev 12514)
@@ -2093,6 +2093,7 @@
for (bc = lowest_bucket; bc < MAX_BUCKETS; bc++)
{
pos = k_buckets[bc].head;
+ count = 0;
while ((pos != NULL) && (count < bucket_size))
{
if (GNUNET_NO == GNUNET_CONTAINER_bloomfilter_test (bloom,
&pos->id.hashPubKey))
@@ -2104,6 +2105,7 @@
largest_distance = distance;
}
}
+ count++;
pos = pos->next;
}
}
@@ -2330,7 +2332,8 @@
message_context->bloom = GNUNET_CONTAINER_bloomfilter_init (NULL,
DHT_BLOOM_SIZE, DHT_BLOOM_K);
GNUNET_CONTAINER_bloomfilter_add (message_context->bloom,
&my_identity.hashPubKey);
- if ((stop_on_closest == GNUNET_YES) && (message_context->closest ==
GNUNET_YES) && (ntohs(msg->type) == GNUNET_MESSAGE_TYPE_DHT_PUT))
+ if (((stop_on_closest == GNUNET_YES) && (message_context->closest ==
GNUNET_YES) && (ntohs(msg->type) == GNUNET_MESSAGE_TYPE_DHT_PUT))
+ || ((strict_kademlia == GNUNET_YES) && (message_context->closest ==
GNUNET_YES)))
forward_count = 0;
#if DEBUG_DHT_ROUTING
@@ -2970,7 +2973,7 @@
if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains(all_known_peers,
&peer->hashPubKey))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%s:%s Received %s message for
peer %s, but already have peer in RT!", my_short_id, "DHT", "CORE CONNECT",
GNUNET_i2s(peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s:%s Received %s message for peer
%s, but already have peer in RT!", my_short_id, "DHT", "CORE CONNECT",
GNUNET_i2s(peer));
return;
}
@@ -3007,7 +3010,7 @@
if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_contains(all_known_peers,
&peer->hashPubKey))
{
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s:%s: do not have peer `%s' in
RT, can't disconnect!\n", my_short_id, "DHT", GNUNET_i2s(peer));
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s:%s: do not have peer `%s' in RT,
can't disconnect!\n", my_short_id, "DHT", GNUNET_i2s(peer));
return;
}
GNUNET_assert(GNUNET_CONTAINER_multihashmap_contains(all_known_peers,
&peer->hashPubKey));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12514 - gnunet/src/dht,
gnunet <=