From 0d300cd09af38c487ec107dc6ebcf6ebeaa0e252 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 9 Mar 2011 07:51:04 +0000 Subject: [PATCH] fixed test build and some clang warnings --- src/kademlia/traversal_algorithm.cpp | 8 ------- test/test_dht.cpp | 36 +++++++++++++++------------- test/test_fast_extension.cpp | 4 ++-- test/test_primitives.cpp | 2 +- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/kademlia/traversal_algorithm.cpp b/src/kademlia/traversal_algorithm.cpp index a3c5cc62b..15e6df0ec 100644 --- a/src/kademlia/traversal_algorithm.cpp +++ b/src/kademlia/traversal_algorithm.cpp @@ -280,14 +280,6 @@ void traversal_algorithm::done() m_results.clear(); } -namespace -{ - bool bitwise_nand(unsigned char lhs, unsigned char rhs) - { - return (lhs & rhs) == 0; - } -} - void traversal_algorithm::add_requests() { int results_target = m_num_target_nodes; diff --git a/test/test_dht.cpp b/test/test_dht.cpp index aa4fc59bc..07c87ecd9 100644 --- a/test/test_dht.cpp +++ b/test/test_dht.cpp @@ -69,11 +69,15 @@ boost::array generate_key() return ret; } +static const std::string no; + void send_dht_msg(node_impl& node, char const* msg, udp::endpoint const& ep , lazy_entry* reply, char const* t = "10", char const* info_hash = 0 - , char const* name = 0, std::string const* token = 0, int port = 0 - , std::string const* target = 0, entry const* item = 0, std::string const* signature = 0 - , std::string const* key = 0, std::string const* id = 0) + , char const* name = 0, std::string const token = std::string(), int port = 0 + , std::string const target = std::string(), entry const* item = 0 + , std::string const signature = std::string() + , std::string const key = std::string() + , std::string const id = std::string()) { // we're about to clear out the backing buffer // for this lazy_entry, so we better clear it now @@ -83,15 +87,15 @@ void send_dht_msg(node_impl& node, char const* msg, udp::endpoint const& ep e["t"] = t; e["y"] = "q"; entry::dictionary_type& a = e["a"].dict(); - a["id"] = id == 0 ? generate_next().to_string() : *id; + a["id"] = id.empty() ? generate_next().to_string() : id; if (info_hash) a["info_hash"] = info_hash; if (name) a["n"] = name; - if (token) a["token"] = *token; + if (!token.empty()) a["token"] = token; if (port) a["port"] = port; - if (target) a["target"] = *target; + if (!target.empty()) a["target"] = target; if (item) a["item"] = *item; - if (signature) a["sig"] = *signature; - if (key) a["key"] = *key; + if (!signature.empty()) a["sig"] = signature; + if (!key.empty()) a["key"] = key; char msg_buf[1500]; int size = bencode(msg_buf, e); // std::cerr << "sending: " << e << "\n"; @@ -154,8 +158,8 @@ void announce_items(node_impl& node, udp::endpoint const* eps if ((i % items[j].num_peers) == 0) continue; lazy_entry response; send_dht_msg(node, "get_item", eps[i], &response, "10", 0 - , 0, 0, 0, &items[j].target.to_string(), 0, 0 - , &std::string(&items[j].key[0], 64), &ids[i].to_string()); + , 0, no, 0, items[j].target.to_string(), 0, no + , std::string(&items[j].key[0], 64), ids[i].to_string()); key_desc_t desc[] = { @@ -191,8 +195,8 @@ void announce_items(node_impl& node, udp::endpoint const* eps } send_dht_msg(node, "announce_item", eps[i], &response, "10", 0 - , 0, &tokens[i], 0, &items[j].target.to_string(), &items[j].ent - , &std::string("0123456789012345678901234567890123456789012345678901234567890123")); + , 0, tokens[i], 0, items[j].target.to_string(), &items[j].ent + , std::string("0123456789012345678901234567890123456789012345678901234567890123")); key_desc_t desc2[] = @@ -219,8 +223,8 @@ void announce_items(node_impl& node, udp::endpoint const* eps { lazy_entry response; send_dht_msg(node, "get_item", eps[0], &response, "10", 0 - , 0, 0, 0, &items[j].target.to_string(), 0, 0 - , &std::string(&items[j].key[0], 64), &ids[0].to_string()); + , 0, no, 0, items[j].target.to_string(), 0, no + , std::string(&items[j].key[0], 64), ids[0].to_string()); key_desc_t desc[] = { @@ -261,7 +265,7 @@ void nop(address, int, address) {} int test_main() { io_service ios; - alert_manager al(ios); + alert_manager al(ios, 100); dht_settings sett; sett.max_torrents = 4; sett.max_feed_items = 4; @@ -356,7 +360,7 @@ int test_main() // ====== announce ====== - send_dht_msg(node, "announce_peer", source, &response, "10", "01010101010101010101", "test", &token, 8080); + send_dht_msg(node, "announce_peer", source, &response, "10", "01010101010101010101", "test", token, 8080); dht::key_desc_t ann_desc[] = { {"y", lazy_entry::string_t, 1, 0}, diff --git a/test/test_fast_extension.cpp b/test/test_fast_extension.cpp index 3e023178c..0101e6bd9 100644 --- a/test/test_fast_extension.cpp +++ b/test/test_fast_extension.cpp @@ -228,7 +228,7 @@ void test_reject_fast() int len = read_message(s, recv_buffer); print_message(recv_buffer, len); int msg = recv_buffer[0]; - if (recv_buffer[0] != 0x6) continue; + if (msg != 0x6) continue; using namespace libtorrent::detail; char* ptr = recv_buffer + 1; @@ -292,7 +292,7 @@ void test_respect_suggest() print_message(recv_buffer, len); int msg = recv_buffer[0]; fail_counter--; - if (recv_buffer[0] != 0x6) continue; + if (msg != 0x6) continue; using namespace libtorrent::detail; char* ptr = recv_buffer + 1; diff --git a/test/test_primitives.cpp b/test/test_primitives.cpp index df430d560..15c541a1d 100644 --- a/test/test_primitives.cpp +++ b/test/test_primitives.cpp @@ -645,7 +645,7 @@ int test_main() TEST_CHECK(errors::reserved129 == 129); TEST_CHECK(errors::reserved159 == 159); - TEST_CHECK(errors::reserved109 == 109); + TEST_CHECK(errors::reserved110 == 110); { // test session state load/restore