-
-
- integer() string() list() dict() type() -
- operator[] -
- find_key() +
- entry -
- torrent_info
-
-
- torrent_info() -
- set_comment() set_piece_size() set_creator() set_hash() add_tracker() add_file() -
- create_torrent() -
- begin_files() end_files() rbegin_files() rend_files() -
- num_files() file_at() -
- map_block() -
- map_file() -
- url_seeds() -
- print() -
- trackers() -
- total_size() piece_length() piece_size() num_pieces() -
- hash_for_piece() info_hash() -
- name() comment() creation_date() creator() -
- priv() set_priv() -
- nodes() -
- add_node() +
- torrent_info
-
+
- torrent_info() +
- set_comment() set_piece_size() set_creator() set_hash() add_tracker() add_file() +
- create_torrent() +
- begin_files() end_files() rbegin_files() rend_files() +
- num_files() file_at() +
- map_block() +
- map_file() +
- url_seeds() +
- print() +
- trackers() +
- total_size() piece_length() piece_size() num_pieces() +
- hash_for_piece() info_hash() +
- name() comment() creation_date() creator() +
- priv() set_priv() +
- nodes() +
- add_node()
- - torrent_handle
-
-
- file_progress() -
- save_path() -
- move_storage() -
- force_reannounce() -
- connect_peer() -
- set_ratio() -
- set_upload_limit() set_download_limit() -
- set_sequenced_download_threshold() -
- set_peer_upload_limit() set_peer_download_limit() -
- pause() resume() is_paused() -
- is_seed() -
- has_metadata() -
- set_tracker_login() -
- trackers() replace_trackers() -
- add_url_seed() -
- use_interface() -
- info_hash() -
- set_max_uploads() set_max_connections() -
- write_resume_data() -
- metadata() -
- status() -
- get_download_queue() -
- get_peer_info() -
- get_torrent_info() -
- is_valid() +
- torrent_handle
-
+
- file_progress() +
- save_path() +
- move_storage() +
- force_reannounce() +
- connect_peer() +
- set_ratio() +
- set_upload_limit() set_download_limit() +
- set_sequenced_download_threshold() +
- set_peer_upload_limit() set_peer_download_limit() +
- pause() resume() is_paused() +
- is_seed() +
- has_metadata() +
- set_tracker_login() +
- trackers() replace_trackers() +
- add_url_seed() +
- use_interface() +
- info_hash() +
- set_max_uploads() set_max_connections() +
- write_resume_data() +
- metadata() +
- status() +
- get_download_queue() +
- get_peer_info() +
- get_torrent_info() +
- is_valid()
- - torrent_status -
- peer_info -
- session_settings -
- ip_filter
-
-
- ip_filter() -
- add_rule() -
- access() -
- export_filter() +
- torrent_status +
- peer_info +
- session_settings +
- ip_filter -
- big_number -
- hasher -
- fingerprint -
- free functions
-
-
- identify_client() -
- client_fingerprint() -
- bdecode() bencode() +
- big_number +
- hasher +
- fingerprint +
- free functions -
- alerts
-
-
- listen_failed_alert -
- file_error_alert -
- tracker_announce_alert -
- tracker_alert -
- tracker_reply_alert -
- tracker_warning_alert -
- url_seed_alert -
- hash_failed_alert -
- peer_ban_alert -
- peer_error_alert -
- invalid_request_alert -
- torrent_finished_alert -
- metadata_failed_alert -
- metadata_received_alert -
- fastresume_rejected_alert -
- dispatcher +
- alerts
-
+
- listen_failed_alert +
- file_error_alert +
- tracker_announce_alert +
- tracker_alert +
- tracker_reply_alert +
- tracker_warning_alert +
- url_seed_alert +
- hash_failed_alert +
- peer_ban_alert +
- peer_error_alert +
- invalid_request_alert +
- torrent_finished_alert +
- metadata_failed_alert +
- metadata_received_alert +
- fastresume_rejected_alert +
- dispatcher
- - exceptions
-
-
- invalid_handle -
- duplicate_torrent -
- invalid_encoding -
- type_error -
- invalid_torrent_file +
- exceptions -
- fast resume
-
-
- file format +
- fast resume -
- threads -
- storage allocation
-
-
- full allocation -
- compact allocation +
- threads +
- storage allocation -
- extensions
-
-
- chat messages -
- metadata from peers -
- HTTP seeding +
- extensions -
- filename checks -
- acknowledgments +
- filename checks +
- acknowledgments
@@ -274,7 +275,8 @@ class session: public boost::noncopyable entry dht_state() const; void add_dht_node(std::pair<std::string , int> const& node); - + void add_dht_router(std::pair<std::string + , int> const& node); };+Once it's created, the session object will spawn the main thread that will do all the work. @@ -547,7 +549,6 @@ void start_dht(entry const& startup_state); void stop_dht(); void set_dht_settings(dht_settings const& settings); entry dht_state() const; -void add_dht_node(std::pair<std::string, int> const& node);
These functions are not available in case TORRENT_DISABLE_DHT is @@ -595,6 +596,25 @@ that are ready to replace a failing node, it will be replaced immediately, this limit is only used to clear out nodes that don't have any node that can replace them.
+add_dht_node() add_dht_router()
++
++void add_dht_node(std::pair<std::string, int> const& node); +void add_dht_router(std::pair<std::string, int> const& node); +
+add_dht_node takes a host name and port pair. That endpoint will be +pinged, and if a valid DHT reply is received, the node will be added to +the routing table.
+add_dht_router adds the given endpoint to a list of DHT router nodes. +If a search is ever made while the routing table is empty, those nodes will +be used as backups. Nodes in the router node list will also never be added +to the regular routing table, which effectively means they are only used +for bootstrapping, to keep the load off them.
+An example routing node that you could typically add is +router.bittorrent.com.
+entry
@@ -2458,7 +2478,7 @@ struct peer_error_alert: alertdiff --git a/docs/manual.rst b/docs/manual.rst index 971053a31..0347d0cdb 100755 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -120,7 +120,8 @@ The ``session`` class has the following synopsis:: entry dht_state() const; void add_dht_node(std::pairinvalid_request_alert
This is a debug alert that is generated by an incoming invalid piece request. The handle -is a handle to the torrent the peer is a member of. ìp is the address of the peer and the +is a handle to the torrent the peer is a member of. Ïp is the address of the peer and the request is the actual incoming request from the peer. The alert is generated as severity level debug.
@@ -3051,7 +3071,7 @@ boost::filesystem::path::default_name_check(boost::filesystem::native);
Big thanks to Michael Wojciechowski and Peter Koeleman for making the autotools scripts.
Thanks to Reimond Retz for bugfixes, suggestions and testing
-Thanks to University of Umeå for providing development and test hardware.
+Thanks to University of Ume for providing development and test hardware.
Project is hosted by sourceforge.
(dht_state_file) , std::istream_iterator ()); - ses.start_dht(dht_state); - } - catch (std::exception&) - { - ses.start_dht(); - ses.add_dht_node(std::make_pair(std::string("router.bittorrent.com") - , 6881)); } + catch (std::exception&) {} + ses.start_dht(); + 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)); #endif ses.set_max_half_open_connections(half_open_limit); diff --git a/include/libtorrent/kademlia/dht_tracker.hpp b/include/libtorrent/kademlia/dht_tracker.hpp index 2c35a5105..d447d4b23 100644 --- a/include/libtorrent/kademlia/dht_tracker.hpp +++ b/include/libtorrent/kademlia/dht_tracker.hpp @@ -67,7 +67,8 @@ namespace libtorrent { namespace dht void add_node(udp::endpoint node); void add_node(std::pair f); void find_node(node_id const& id, boost::function< void(std::vector const&)> f); + void add_router_node(udp::endpoint router); void incoming(msg const& m); diff --git a/include/libtorrent/kademlia/routing_table.hpp b/include/libtorrent/kademlia/routing_table.hpp index 96449bda1..1b4abbf37 100644 --- a/include/libtorrent/kademlia/routing_table.hpp +++ b/include/libtorrent/kademlia/routing_table.hpp @@ -156,6 +156,15 @@ public: , dht_settings const& settings); void node_failed(node_id const& id); + + // adds an endpoint that will never be added to + // the routing table + void add_router_node(udp::endpoint router); + + // iterates over the router nodes added + typedef std::set m_socket; tcp::endpoint m_remote; - + // this is the torrent this connection is // associated with. If the connection is an // incoming conncetion, this is set to zero diff --git a/include/libtorrent/session.hpp b/include/libtorrent/session.hpp index 27a0da2f8..5f13f6d21 100755 --- a/include/libtorrent/session.hpp +++ b/include/libtorrent/session.hpp @@ -382,6 +382,7 @@ namespace libtorrent void set_dht_settings(dht_settings const& settings); entry dht_state() const; void add_dht_node(std::pair