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

fix dht issue for platforms where char is unsigned. introduce assert

This commit is contained in:
Arvid Norberg 2013-06-23 08:07:39 +00:00
parent 59a83a92ee
commit 465bbbf406
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kademlia/node.cpp
View File

@ -128,7 +128,7 @@ bool node_impl::verify_token(std::string const& token, char const* info_hash
h1.update((char*)info_hash, sha1_hash::size);
sha1_hash h = h1.final();
if (std::equal(token.begin(), token.end(), (signed char*)&h[0]))
if (std::equal(token.begin(), token.end(), (char*)&h[0]))
return true;
hasher h2;
@ -136,7 +136,7 @@ bool node_impl::verify_token(std::string const& token, char const* info_hash
h2.update((char*)&m_secret[1], sizeof(m_secret[1]));
h2.update((char*)info_hash, sha1_hash::size);
h = h2.final();
if (std::equal(token.begin(), token.end(), (signed char*)&h[0]))
if (std::equal(token.begin(), token.end(), (char*)&h[0]))
return true;
return false;
}
@ -154,7 +154,8 @@ std::string node_impl::generate_token(udp::endpoint const& addr, char const* inf
h.update(info_hash, sha1_hash::size);
sha1_hash hash = h.final();
std::copy(hash.begin(), hash.begin() + 4, (signed char*)&token[0]);
std::copy(hash.begin(), hash.begin() + 4, (char*)&token[0]);
TORRENT_ASSERT(std::equal(token.begin(), token.end(), (char*)&hash[0]));
return token;
}

3
test/test_dht.cpp
View File

@ -122,7 +122,8 @@ void send_dht_msg(node_impl& node, char const* msg, udp::endpoint const& ep
char msg_buf[1500];
int size = bencode(msg_buf, e);
#if defined TORRENT_DEBUG && TORRENT_USE_IOSTREAM
std::cerr << "sending: " << e << "\n";
// this yields a lot of output. too much
// std::cerr << "sending: " << e << "\n";
#endif
lazy_entry decoded;