diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:26:58 +0100 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:26:58 +0100 |
| commit | f4a6bc79d9a751480597aa007a1c6d315604f856 (patch) | |
| tree | 6cd77005a74333cef7d9b0d62e311177417c2d0a /src/p2p | |
| parent | Merge pull request #3252 (diff) | |
| parent | keccak: fix mdlen bounds sanity checking (diff) | |
| download | monero-f4a6bc79d9a751480597aa007a1c6d315604f856.tar.xz | |
Merge pull request #3226
e4646379 keccak: fix mdlen bounds sanity checking (moneromooo-monero)
2e3e90ac pass large parameters by const ref, not value (moneromooo-monero)
61defd89 blockchain: sanity check number of precomputed hash of hash blocks (moneromooo-monero)
9af6b2d1 ringct: fix infinite loop in unused h2b function (moneromooo-monero)
8cea8d0c simplewallet: double check a new multisig wallet is multisig (moneromooo-monero)
9b98a6ac threadpool: catch exceptions in dtor, to avoid terminate (moneromooo-monero)
24803ed9 blockchain_export: fix buffer overflow in exporter (moneromooo-monero)
f3f7da62 perf_timer: rewrite to make it clear there is no division by zero (moneromooo-monero)
c6ea3df0 performance_tests: remove add_arg call stray extra param (moneromooo-monero)
fa6b4566 fuzz_tests: fix an uninitialized var in setup (moneromooo-monero)
03887f11 keccak: fix sanity check bounds test (moneromooo-monero)
ad11db91 blockchain_db: initialize m_open in base class ctor (moneromooo-monero)
bece67f9 miner: restore std::cout precision after modification (moneromooo-monero)
1aabd14c db_lmdb: check hard fork info drop succeeded (moneromooo-monero)
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/net_node.h | 2 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h index 568c650cc..9ebefbca6 100644 --- a/src/p2p/net_node.h +++ b/src/p2p/net_node.h @@ -217,7 +217,7 @@ namespace nodetool void add_upnp_port_mapping(uint32_t port); void delete_upnp_port_mapping(uint32_t port); template<class t_callback> - bool try_ping(basic_node_data& node_data, p2p_connection_context& context, t_callback cb); + bool try_ping(basic_node_data& node_data, p2p_connection_context& context, const t_callback &cb); bool try_get_support_flags(const p2p_connection_context& context, std::function<void(p2p_connection_context&, const uint32_t&)> f); bool make_expected_connections_count(PeerType peer_type, size_t expected_connections); void cache_connect_fail_info(const epee::net_utils::network_address& addr); diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index ee7e62768..ea7fc51ee 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -1505,7 +1505,7 @@ namespace nodetool } //----------------------------------------------------------------------------------- template<class t_payload_net_handler> template<class t_callback> - bool node_server<t_payload_net_handler>::try_ping(basic_node_data& node_data, p2p_connection_context& context, t_callback cb) + bool node_server<t_payload_net_handler>::try_ping(basic_node_data& node_data, p2p_connection_context& context, const t_callback &cb) { if(!node_data.my_port) return false; |