diff options
author | Riccardo Spagni <ric@spagni.net> | 2015-12-31 08:18:06 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2015-12-31 08:18:06 +0200 |
commit | 76a765c967145e1ed26712376814bd695f42153a (patch) | |
tree | 1e3f666d1b6a5646543d258c2962d8ffe35b705f /src/p2p/net_peerlist.h | |
parent | Merge pull request #578 (diff) | |
parent | blockchain: kill ioservice on scope end, rather than manually (diff) | |
download | monero-76a765c967145e1ed26712376814bd695f42153a.tar.xz |
Merge pull request #579
576effe blockchain: kill ioservice on scope end, rather than manually (moneromooo-monero)
ed5d017 miner: minor fixes on stop (moneromooo-monero)
b245215 core_tests: deinit core before destroying it (moneromooo-monero)
bc8a52e wallet: add a rescan_bc command and rescan_blockchain RPC (moneromooo-monero)
92ef6b5 wallet: protect against exceptions in the block pull thread (moneromooo-monero)
af21061 net_peerlist: move a couple functions from public to private (moneromooo-monero)
Diffstat (limited to 'src/p2p/net_peerlist.h')
-rw-r--r-- | src/p2p/net_peerlist.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/p2p/net_peerlist.h b/src/p2p/net_peerlist.h index 3d8b08ce6..03f508195 100644 --- a/src/p2p/net_peerlist.h +++ b/src/p2p/net_peerlist.h @@ -80,8 +80,6 @@ namespace nodetool bool set_peer_just_seen(peerid_type peer, const net_address& addr); bool set_peer_unreachable(const peerlist_entry& pr); bool is_ip_allowed(uint32_t ip); - void trim_white_peerlist(); - void trim_gray_peerlist(); private: @@ -166,6 +164,8 @@ namespace nodetool private: bool peers_indexed_from_old(const peers_indexed_old& pio, peers_indexed& pi); + void trim_white_peerlist(); + void trim_gray_peerlist(); friend class boost::serialization::access; epee::critical_section m_peerlist_lock; |