From 7af38ba05af44ee1a90e56d2c15428b6820ee78a Mon Sep 17 00:00:00 2001 From: "pavel.pimenov" Date: Fri, 30 Jun 2017 21:03:34 +0300 Subject: [PATCH] add const and static --- src/kademlia/node.cpp | 40 +++++++++++++++++------------------- src/kademlia/rpc_manager.cpp | 2 +- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/kademlia/node.cpp b/src/kademlia/node.cpp index a5cc18ba2..a53101b2a 100644 --- a/src/kademlia/node.cpp +++ b/src/kademlia/node.cpp @@ -781,7 +781,7 @@ void node::incoming_request(msg const& m, entry& e) e["y"] = "r"; e["t"] = m.message.dict_find_string_value("t").to_string(); - key_desc_t const top_desc[] = { + static key_desc_t const top_desc[] = { {"q", bdecode_node::string_t, 0, 0}, {"ro", bdecode_node::int_t, 0, key_desc_t::optional}, {"a", bdecode_node::dict_t, 0, key_desc_t::parse_children}, @@ -798,9 +798,9 @@ void node::incoming_request(msg const& m, entry& e) e["ip"] = endpoint_to_bytes(m.addr); - bdecode_node arg_ent = top_level[2]; - bool read_only = top_level[1] && top_level[1].int_value() != 0; - node_id id(top_level[3].string_ptr()); + bdecode_node const arg_ent = top_level[2]; + bool const read_only = top_level[1] && top_level[1].int_value() != 0; + node_id const id(top_level[3].string_ptr()); // if this nodes ID doesn't match its IP, tell it what // its IP is with an error @@ -833,7 +833,7 @@ void node::incoming_request(msg const& m, entry& e) } else if (query == "get_peers") { - key_desc_t const msg_desc[] = { + static key_desc_t const msg_desc[] = { {"info_hash", bdecode_node::string_t, 20, 0}, {"noseed", bdecode_node::int_t, 0, key_desc_t::optional}, {"scrape", bdecode_node::int_t, 0, key_desc_t::optional}, @@ -855,14 +855,12 @@ void node::incoming_request(msg const& m, entry& e) // always return nodes as well as peers write_nodes_entries(info_hash, msg_keys[3], reply); - bool noseed = false; - bool scrape = false; - if (msg_keys[1] && msg_keys[1].int_value() != 0) noseed = true; - if (msg_keys[2] && msg_keys[2].int_value() != 0) scrape = true; + bool const noseed = msg_keys[1] && msg_keys[1].int_value() != 0; + bool const scrape = msg_keys[2] && msg_keys[2].int_value() != 0; // If our storage is full we want to withhold the write token so that // announces will spill over to our neighbors. This widens the // perimeter of nodes which store peers for this torrent - bool full = lookup_peers(info_hash, reply, noseed, scrape, m.addr.address()); + bool const full = lookup_peers(info_hash, reply, noseed, scrape, m.addr.address()); if (!full) reply["token"] = generate_token(m.addr, info_hash); #ifndef TORRENT_DISABLE_LOGGING @@ -875,7 +873,7 @@ void node::incoming_request(msg const& m, entry& e) } else if (query == "find_node") { - key_desc_t const msg_desc[] = { + static key_desc_t const msg_desc[] = { {"target", bdecode_node::string_t, 20, 0}, {"want", bdecode_node::list_t, 0, key_desc_t::optional}, }; @@ -889,13 +887,13 @@ void node::incoming_request(msg const& m, entry& e) } m_counters.inc_stats_counter(counters::dht_find_node_in); - sha1_hash target(msg_keys[0].string_ptr()); + sha1_hash const target(msg_keys[0].string_ptr()); write_nodes_entries(target, msg_keys[1], reply); } else if (query == "announce_peer") { - key_desc_t const msg_desc[] = { + static key_desc_t const msg_desc[] = { {"info_hash", bdecode_node::string_t, 20, 0}, {"port", bdecode_node::int_t, 0, 0}, {"token", bdecode_node::string_t, 0, 0}, @@ -926,7 +924,7 @@ void node::incoming_request(msg const& m, entry& e) return; } - sha1_hash info_hash(msg_keys[0].string_ptr()); + sha1_hash const info_hash(msg_keys[0].string_ptr()); if (m_observer) m_observer->announce(info_hash, m.addr.address(), port); @@ -946,9 +944,9 @@ void node::incoming_request(msg const& m, entry& e) // the table get a chance to add it. m_table.node_seen(id, m.addr, 0xffff); - tcp::endpoint addr = tcp::endpoint(m.addr.address(), std::uint16_t(port)); - string_view name = msg_keys[3] ? msg_keys[3].string_value() : string_view(); - bool seed = msg_keys[4] && msg_keys[4].int_value(); + tcp::endpoint const addr = tcp::endpoint(m.addr.address(), std::uint16_t(port)); + string_view const name = msg_keys[3] ? msg_keys[3].string_value() : string_view(); + bool const seed = msg_keys[4] && msg_keys[4].int_value(); m_storage.announce_peer(info_hash, addr, name, seed); } @@ -956,7 +954,7 @@ void node::incoming_request(msg const& m, entry& e) { // the first 2 entries are for both mutable and // immutable puts - static const key_desc_t msg_desc[] = { + static key_desc_t const msg_desc[] = { {"token", bdecode_node::string_t, 0, 0}, {"v", bdecode_node::none_t, 0, 0}, {"seq", bdecode_node::int_t, 0, key_desc_t::optional}, @@ -979,7 +977,7 @@ void node::incoming_request(msg const& m, entry& e) m_counters.inc_stats_counter(counters::dht_put_in); // is this a mutable put? - bool mutable_put = (msg_keys[2] && msg_keys[3] && msg_keys[4]); + bool const mutable_put = (msg_keys[2] && msg_keys[3] && msg_keys[4]); // public key (only set if it's a mutable put) char const* pub_key = nullptr; @@ -1139,7 +1137,7 @@ void node::incoming_request(msg const& m, entry& e) } else if (query == "sample_infohashes") { - key_desc_t const msg_desc[] = { + static key_desc_t const msg_desc[] = { {"target", bdecode_node::string_t, 20, 0}, {"want", bdecode_node::list_t, 0, key_desc_t::optional}, }; @@ -1177,7 +1175,7 @@ void node::incoming_request(msg const& m, entry& e) } } - sha1_hash target(target_ent.string_ptr()); + sha1_hash const target(target_ent.string_ptr()); // always return nodes as well as peers write_nodes_entries(target, arg_ent.dict_find_list("want"), reply); return; diff --git a/src/kademlia/rpc_manager.cpp b/src/kademlia/rpc_manager.cpp index edc507ab7..b5a0626c8 100644 --- a/src/kademlia/rpc_manager.cpp +++ b/src/kademlia/rpc_manager.cpp @@ -350,7 +350,7 @@ bool rpc_manager::incoming(msg const& m, node_id* id) return false; } - node_id nid = node_id(node_id_ent.string_ptr()); + node_id const nid = node_id(node_id_ent.string_ptr()); if (m_settings.enforce_node_id && !verify_id(nid, m.addr.address())) { o->timeout();