premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

forward port DHT routing table fix from RC_1_0

This commit is contained in:
arvidn 2015-08-22 15:24:49 +02:00
parent 746cd4c1a6
commit e7b8b6da49
3 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -73,6 +73,7 @@
* added support for hashing pieces in multiple threads
* improve DHT routing table to not create an unbalanced tree
* fix bug in uTP that would cause any connection taking more than one second
to connect be timed out (introduced in the vulnerability path)
* fixed falling back to sending UDP packets direct when socks proxy fails

6
src/kademlia/routing_table.cpp
View File

@ -719,8 +719,10 @@ routing_table::add_node_status_t routing_table::add_node_impl(node_entry e)
// can we split the bucket?
// only nodes that haven't failed can split the bucket, and we can only
// split the last bucket
bool can_split = (boost::next(i) == m_buckets.end() && m_buckets.size() < 159)
&& e.fail_count() == 0;
const bool can_split = (boost::next(i) == m_buckets.end()
&& m_buckets.size() < 159)
&& e.fail_count() == 0
&& (i == m_buckets.begin() || boost::prior(i)->live_nodes.size() > 1);
if (e.pinged() && e.fail_count() == 0)
{

44
test/test_dht.cpp
View File

@ -443,6 +443,7 @@ struct obs : dht::dht_observer
};
// TODO: test obfuscated_get_peers
// TODO: 3 split this test up into smaller test cases
TORRENT_TEST(dht)
{
dht_settings sett;
@ -1067,15 +1068,52 @@ TORRENT_TEST(dht)
// insert 256 nodes evenly distributed across the ID space.
// we expect to fill the top 5 buckets
for (int i = 0; i < 256; ++i)
for (int i = 255; i >= 0; --i)
{
// test a node with the same IP:port changing ID
add_and_replace(id, diff);
id[0] = i;
// in order to make this node-load a bit more realistic, start from
// distant nodes and work our way in closer to the node id
// the routing table will reject nodes that are too imbalanced (if all
// nodes are very close to our ID and none are far away, it's
// suspicious).
id[0] ^= i;
tbl.node_seen(id, rand_udp_ep(), 20 + (id[19] & 0xff));
// restore the first byte of the node ID
id[0] ^= i;
}
printf("num_active_buckets: %d\n", tbl.num_active_buckets());
// number of nodes per tree level (when adding 256 evenly distributed
// nodes):
// 0: 128
// 1: 64
// 2: 32
// 3: 16
// 4: 8
// i.e. no more than 5 levels
TEST_EQUAL(tbl.num_active_buckets(), 5);
#if defined TORRENT_DHT_VERBOSE_LOGGING || defined TORRENT_DEBUG
tbl.print_state(std::cerr);
#endif
}
{
sett.extended_routing_table = false;
node_id id = to_hash("1234876923549721020394873245098347598635");
routing_table tbl(id, 8, sett, &observer);
// insert nodes in the routing table that will force it to split
// and make sure we don't end up with a table completely out of balance
for (int i = 0; i < 32; ++i)
{
id[4] = i;
tbl.node_seen(id, rand_udp_ep(), 20 + (id[19] & 0xff));
}
printf("num_active_buckets: %d\n", tbl.num_active_buckets());
TEST_EQUAL(tbl.num_active_buckets(), 6);
TEST_EQUAL(tbl.num_active_buckets(), 2);
#if defined TORRENT_DEBUG
tbl.print_state(std::cerr);