Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge pull request #149 from peerplays-network/feature/GRPH-114

Browse source 
[GRPH-114] Check the attacker/buggy client before updating items ids
This commit is contained in:
Alfredo Garcia 2019-11-11 09:50:46 -03:00 committed by GitHub
commit fccd856429
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/net/node.cpp
View file

@ -2649,11 +2649,6 @@ namespace graphene { namespace net { namespace detail {
if (!item_hashes_received.empty() && !originating_peer->ids_of_items_to_get.empty()) if (!item_hashes_received.empty() && !originating_peer->ids_of_items_to_get.empty())
assert(item_hashes_received.front() != originating_peer->ids_of_items_to_get.back()); assert(item_hashes_received.front() != originating_peer->ids_of_items_to_get.back());
// append the remaining items to the peer's list
boost::push_back(originating_peer->ids_of_items_to_get, item_hashes_received);
originating_peer->number_of_unfetched_item_ids = blockchain_item_ids_inventory_message_received.total_remaining_item_count;
// at any given time, there's a maximum number of blocks that can possibly be out there // at any given time, there's a maximum number of blocks that can possibly be out there
// [(now - genesis time) / block interval]. If they offer us more blocks than that, // [(now - genesis time) / block interval]. If they offer us more blocks than that,
// they must be an attacker or have a buggy client. // they must be an attacker or have a buggy client.
@ -2676,6 +2671,12 @@ namespace graphene { namespace net { namespace detail {
return; return;
} }
// append the remaining items to the peer's list
boost::push_back(originating_peer->ids_of_items_to_get, item_hashes_received);
originating_peer->number_of_unfetched_item_ids = blockchain_item_ids_inventory_message_received.total_remaining_item_count;
uint32_t new_number_of_unfetched_items = calculate_unsynced_block_count_from_all_peers(); uint32_t new_number_of_unfetched_items = calculate_unsynced_block_count_from_all_peers();
if (new_number_of_unfetched_items != _total_number_of_unfetched_items) if (new_number_of_unfetched_items != _total_number_of_unfetched_items)
_delegate->sync_status(blockchain_item_ids_inventory_message_received.item_type, _delegate->sync_status(blockchain_item_ids_inventory_message_received.item_type,