From 5d8feafc118ee85ead99e5f84b202882e371ef6c Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 3 May 2010 05:51:01 +0000 Subject: [PATCH] add flag to client_test to turn off DHT --- examples/client_test.cpp | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/examples/client_test.cpp b/examples/client_test.cpp index 2fb5aed4d..031c91d80 100644 --- a/examples/client_test.cpp +++ b/examples/client_test.cpp @@ -768,6 +768,7 @@ int main(int argc, char* argv[]) " -A allowed pieces set size\n" " -R number of blocks per read cache line\n" " -O Disallow disk job reordering\n" + " -H Don't start DHT\n" " " "\n\n" "TORRENT is a path to a .torrent file\n" @@ -787,6 +788,7 @@ int main(int argc, char* argv[]) settings.volatile_read_cache = true; int refresh_delay = 1; + bool start_dht = true; std::deque events; @@ -813,19 +815,6 @@ int main(int argc, char* argv[]) ses.load_state(e); } -#ifndef TORRENT_DISABLE_DHT - settings.use_dht_as_fallback = false; - - ses.add_dht_router(std::make_pair( - std::string("router.bittorrent.com"), 6881)); - ses.add_dht_router(std::make_pair( - std::string("router.utorrent.com"), 6881)); - ses.add_dht_router(std::make_pair( - std::string("router.bitcomet.com"), 6881)); - - ses.start_dht(); -#endif - ses.start_lsd(); ses.start_upnp(); ses.start_natpmp(); @@ -938,6 +927,7 @@ int main(int argc, char* argv[]) case 'w': settings.urlseed_wait_retry = atoi(arg); break; case 't': poll_interval = atoi(arg); break; case 'F': refresh_delay = atoi(arg); break; + case 'H': start_dht = false; --i; break; case 'x': { /* @@ -996,6 +986,22 @@ int main(int argc, char* argv[]) ses.listen_on(std::make_pair(listen_port, listen_port + 10) , bind_to_interface.c_str()); + if (start_dht) + { +#ifndef TORRENT_DISABLE_DHT + settings.use_dht_as_fallback = false; + + ses.add_dht_router(std::make_pair( + std::string("router.bittorrent.com"), 6881)); + ses.add_dht_router(std::make_pair( + std::string("router.utorrent.com"), 6881)); + ses.add_dht_router(std::make_pair( + std::string("router.bitcomet.com"), 6881)); + + ses.start_dht(); + } +#endif + ses.set_settings(settings); // main loop