wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

merged fix from 0.16

This commit is contained in:
Arvid Norberg 2012-06-05 03:35:15 +00:00
parent 985d96f237
commit ccfaa0327e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kademlia/node_id.cpp
View File

@ -102,9 +102,9 @@ node_id generate_id_impl(address const& ip_, boost::uint32_t r)
{
boost::uint8_t* ip = 0;
const static uint8_t v4mask[] = { 0x03, 0x0f, 0x3f, 0xff };
const static uint8_t v6mask[] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
uint8_t const* mask = 0;
const static boost::uint8_t v4mask[] = { 0x03, 0x0f, 0x3f, 0xff };
const static boost::uint8_t v6mask[] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
boost::uint8_t const* mask = 0;
int num_octets = 0;
address_v4::bytes_type b4;
@ -131,7 +131,7 @@ node_id generate_id_impl(address const& ip_, boost::uint32_t r)
hasher h;
h.update((char*)ip, num_octets);
uint8_t rand = r & 0x7;
boost::uint8_t rand = r & 0x7;
h.update((char*)&r, 1);
node_id id = h.final();
for (int i = 4; i < 19; ++i) id[i] = random();
@ -142,9 +142,9 @@ node_id generate_id_impl(address const& ip_, boost::uint32_t r)
node_id generate_random_id()
{
char random[20];
for (int i = 0; i < 20; ++i) random[i] = libtorrent::random();
return hasher(random, 20).final();
char r[20];
for (int i = 0; i < 20; ++i) r[i] = random();
return hasher(r, 20).final();
}
// verifies whether a node-id matches the IP it's used from