Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Generating request message inside merge function.

Browse source
This commit is contained in:
clemahieu 2014-10-27 16:24:12 -05:00
commit 975e855ecb
2 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rai/core/core.cpp
View file

@ -367,8 +367,15 @@ void rai::network::receive_action (boost::system::error_code const & error, size
}
}
void rai::network::merge_peers (std::shared_ptr <std::vector <uint8_t>> const & bytes_a, std::array <rai::endpoint, 24> const & peers_a)
void rai::network::merge_peers (std::array <rai::endpoint, 24> const & peers_a)
{
rai::keepalive_req req_message;
client.peers.random_fill (req_message.peers);
std::shared_ptr <std::vector <uint8_t>> req_bytes (new std::vector <uint8_t>);
{
rai::vectorstream stream (*req_bytes);
req_message.serialize (stream);
}
for (auto i (peers_a.begin ()), j (peers_a.end ()); i != j; ++i) // Amplify attack, send to the same IP many times
{
if (!client.peers.contacting_peer (*i) && *i != endpoint ())
@ -379,7 +386,7 @@ void rai::network::merge_peers (std::shared_ptr <std::vector <uint8_t>> const &
}
auto & client_l (client);
auto endpoint (*i);
send_buffer (bytes_a->data (), bytes_a->size (), endpoint, [bytes_a, &client_l] (boost::system::error_code const & error, size_t size_a)
send_buffer (req_bytes->data (), req_bytes->size (), endpoint, [req_bytes, &client_l] (boost::system::error_code const & error, size_t size_a)
{
if (network_logging ())
{
@ -3635,14 +3642,7 @@ public:
}
}
});
rai::keepalive_req req_message;
req_message.peers = ack_message.peers;
std::shared_ptr <std::vector <uint8_t>> req_bytes (new std::vector <uint8_t>);
{
rai::vectorstream stream (*req_bytes);
req_message.serialize (stream);
}
client.network.merge_peers (req_bytes, message_a.peers);
client.network.merge_peers (message_a.peers);
if (network_keepalive_logging ())
{
client.log.add (boost::str (boost::format ("Sending keepalive ack to %1%") % sender));
@ -3654,14 +3654,7 @@ public:
{
client.log.add (boost::str (boost::format ("Received keepalive ack from %1%") % sender));
}
rai::keepalive_req req_message;
client.peers.random_fill (req_message.peers);
std::shared_ptr <std::vector <uint8_t>> req_bytes (new std::vector <uint8_t>);
{
rai::vectorstream stream (*req_bytes);
req_message.serialize (stream);
}
client.network.merge_peers (req_bytes, message_a.peers);
client.network.merge_peers (message_a.peers);
client.peers.incoming_from_peer (sender);
if (!known_peer && message_a.checksum != client.ledger.checksum (0, std::numeric_limits <rai::uint256_t>::max ()))
{

2
rai/core/core.hpp
View file

@ -442,7 +442,7 @@ namespace rai {
void rpc_action (boost::system::error_code const &, size_t);
void publish_block (rai::endpoint const &, std::unique_ptr <rai::block>);
void confirm_block (std::unique_ptr <rai::block>, uint64_t);
void merge_peers (std::shared_ptr <std::vector <uint8_t>> const &, std::array <rai::endpoint, 24> const &);
void merge_peers (std::array <rai::endpoint, 24> const &);
void send_keepalive (rai::endpoint const &);
void send_confirm_req (rai::endpoint const &, rai::block const &);
void send_buffer (uint8_t const *, size_t, rai::endpoint const &, std::function <void (boost::system::error_code const &, size_t)>);