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

merged dht node ID change from RC_0_16

This commit is contained in:
Arvid Norberg 2014-01-11 08:08:43 +00:00
parent 1179c137d6
commit 86b68e65e4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/kademlia/node_id.cpp
View File

@ -131,11 +131,11 @@ node_id generate_id_impl(address const& ip_, boost::uint32_t r)
for (int i = 0; i < num_octets; ++i)
ip[i] &= mask[i];
boost::uint8_t rand = r & 0x7;
ip[0] |= (r & 0x7) << 5;
boost::crc_32_type crc;
// this is the crc32c (Castagnoli) polynomial
boost::crc_optimal<32, 0x1EDC6F41, 0xFFFFFFFF, 0xFFFFFFFF, true, true> crc;
crc.process_block(ip, ip + num_octets);
crc.process_byte(rand);
boost::uint32_t c = crc.checksum();
node_id id;

14
test/test_dht.cpp
View File

@ -628,8 +628,8 @@ int test_main()
// this is one of the test vectors from:
// http://libtorrent.org/dht_sec.html
source = udp::endpoint(address::from_string("124.31.75.21"), 20);
node_id nid = to_hash("d2a6dfc70c5d6a4ec8a88e4c6ab4c28b95eee401");
source = udp::endpoint(address::from_string("124.31.75.21"), 1);
node_id nid = to_hash("5fbfbff10c5d6a4ec8a88e4c6ab4c28b95eee401");
send_dht_request(node, "find_node", source, &response, "10", 0, 0, std::string()
, 0, "0101010101010101010101010101010101010101", 0, false, false, std::string(), std::string(), -1, 0, &nid);
@ -1346,11 +1346,11 @@ int test_main()
boost::uint8_t prefixes[][3] =
{
{ 0xd2, 0xa6, 0xdf },
{ 0x51, 0xd0, 0x29 },
{ 0xfd, 0x33, 0x4a },
{ 0x6a, 0xa1, 0x69 },
{ 0xeb, 0x64, 0x34 }
{ 0x5f, 0xbf, 0xbf },
{ 0x5a, 0x3c, 0xe9 },
{ 0xa5, 0xd4, 0x32 },
{ 0x1b, 0x03, 0x21 },
{ 0xe5, 0x6f, 0x6c }
};
for (int i = 0; i < 5; ++i)