| relevance 4 | ../src/http_tracker_connection.cpp:479 | this is a bug. if the info-hash contains a 0, this will fail! |
this is a bug. if the info-hash contains a 0, this will
+fail!../src/http_tracker_connection.cpp:479 if (failure)
+ {
+ resp.failure_reason = failure->string_value();
+ ec.assign(errors::tracker_failure, get_libtorrent_category());
+ return resp;
+ }
+
+ lazy_entry const* warning = e.dict_find_string("warning message");
+ if (warning)
+ resp.warning_message = warning->string_value();
+
+ if (scrape_request)
+ {
+ lazy_entry const* files = e.dict_find_dict("files");
+ if (files == 0)
+ {
+ ec.assign(errors::invalid_files_entry, get_libtorrent_category());
+ return resp;
+ }
+
+ lazy_entry const* scrape_data = files->dict_find_dict(
+ scrape_ih.to_string().c_str());
+
+ if (scrape_data == 0)
+ {
+ ec.assign(errors::invalid_hash_entry, get_libtorrent_category());
+ return resp;
+ }
+
+ resp.complete = int(scrape_data->dict_find_int_value("complete", -1));
+ resp.incomplete = int(scrape_data->dict_find_int_value("incomplete", -1));
+ resp.downloaded = int(scrape_data->dict_find_int_value("downloaded", -1));
+ resp.downloaders = int(scrape_data->dict_find_int_value("downloaders", -1));
+
+ return resp;
+ }
+
+ // look for optional scrape info
+ resp.complete = int(e.dict_find_int_value("complete", -1));
+ resp.incomplete = int(e.dict_find_int_value("incomplete", -1));
+ resp.downloaded = int(e.dict_find_int_value("downloaded", -1));
+
+ lazy_entry const* peers_ent = e.dict_find("peers");
+ if (peers_ent && peers_ent->type() == lazy_entry::string_t)
+ {
+ char const* peers = peers_ent->string_ptr();
+ int len = peers_ent->string_length();
+ resp.peers4.reserve(len / 6);
+ for (int i = 0; i < len; i += 6)
+ {
+ if (len - i < 6) break;
+ | ||
| relevance 4 | ../src/session_impl.cpp:479 | in order to support SSL over uTP, the utp_socket manager either needs to be able to receive packets on multiple ports, or we need to peek into the first few bytes the payload stream of a socket to determine whether or not it's an SSL connection. (The former is simpler but won't do as well with NATs) |
in order to support SSL over uTP, the utp_socket manager either
needs to be able to receive packets on multiple ports, or we need to
peek into the first few bytes the payload stream of a socket to determine
whether or not it's an SSL connection. (The former is simpler but won't
-do as well with NATs)../src/session_impl.cpp:480 , m_optimistic_unchoke_time_scaler(0)
+do as well with NATs)../src/session_impl.cpp:479 , m_optimistic_unchoke_time_scaler(0)
, m_disconnect_time_scaler(90)
, m_auto_scrape_time_scaler(180)
, m_next_explicit_cache_torrent(0)
@@ -60,10 +112,6 @@ do as well with NATs)../src/session_impl.cpp:480../src/session_impl.cpp:480| relevance 4 | ../src/torrent.cpp:9560 | this logic doesn't work for seeding torrents that are not ticked |
|
this logic doesn't work for seeding torrents that are not ticked../src/torrent.cpp:9560 {
+ m_udp_socket.subscribe(this);
+
+#ifdef TORRENT_REQUEST_LOGGING
+ char log_filename[200];
+ | ||
| relevance 4 | ../src/torrent.cpp:9647 | this logic doesn't work for seeding torrents that are not ticked |
this logic doesn't work for seeding torrents that are not ticked../src/torrent.cpp:9647 {
i = m_connections.begin() + idx;
--idx;
}
@@ -132,7 +184,7 @@ do as well with NATs)../src/session_impl.cpp:480| relevance 4 | ../src/kademlia/refresh.cpp:93 | when bootstrapping against our own IP completes, continue to issue another bootstrap against the deepest, non-full bucket. when it completes, issue a bootstrap against one bucket above it, and so on until the bootstrap lookup against the top level bucket (bucket 0) completes. That's when the bootstrap is done |
|
when bootstrapping against our own IP completes,
+ | ||
| relevance 4 | ../src/kademlia/refresh.cpp:93 | when bootstrapping against our own IP completes, continue to issue another bootstrap against the deepest, non-full bucket. when it completes, issue a bootstrap against one bucket above it, and so on until the bootstrap lookup against the top level bucket (bucket 0) completes. That's when the bootstrap is done |
when bootstrapping against our own IP completes,
continue to issue another bootstrap against the deepest,
non-full bucket. when it completes, issue a bootstrap against
one bucket above it, and so on until the bootstrap lookup
@@ -175,7 +227,109 @@ void bootstrap::done()
} } // namespace libtorrent::dht
- | ||
| relevance 3 | ../src/disk_io_thread.cpp:242 | it would be nice to have the number of threads be set dynamically |
it would be nice to have the number of threads be set dynamically../src/disk_io_thread.cpp:242 std::pair<block_cache::iterator, block_cache::iterator> pieces
+ | ||
| relevance 3 | ../test/test_dht.cpp:436 | test obfuscated_get_peers |
test obfuscated_get_peers../test/test_dht.cpp:436 g_got_peers.insert(g_got_peers.end(), peers.begin(), peers.end());
+}
+
+std::vector<dht::item> g_got_items;
+dht::item g_put_item;
+int g_put_count;
+
+bool get_item_cb(dht::item& i)
+{
+ if (!i.empty())
+ g_got_items.push_back(i);
+ if (!g_put_item.empty())
+ {
+ i = g_put_item;
+ g_put_count++;
+ return true;
+ }
+ return false;
+}
+
+int test_main()
+ {
+ dht_settings sett;
+ sett.max_torrents = 4;
+ sett.max_dht_items = 4;
+ sett.enforce_node_id = false;
+ address ext = address::from_string("236.0.0.1");
+ mock_socket s;
+ print_alert ad;
+ counters cnt;
+ dht::node_impl node(&ad, &s, sett, node_id(0), ext, 0, cnt);
+
+ // DHT should be running on port 48199 now
+ lazy_entry response;
+ lazy_entry const* parsed[11];
+ char error_string[200];
+ bool ret;
+
+ // ====== ping ======
+ udp::endpoint source(address::from_string("10.0.0.1"), 20);
+ send_dht_request(node, "ping", source, &response, "10");
+
+ dht::key_desc_t pong_desc[] = {
+ {"y", lazy_entry::string_t, 1, 0},
+ {"t", lazy_entry::string_t, 2, 0},
+ {"r", lazy_entry::dict_t, 0, key_desc_t::parse_children},
+ {"id", lazy_entry::string_t, 20, key_desc_t::last_child},
+ };
+
+ fprintf(stderr, "msg: %s\n", print_entry(response).c_str());
+ ret = dht::verify_message(&response, pong_desc, parsed, 4, error_string, sizeof(error_string));
+ | ||
| relevance 3 | ../test/test_transfer.cpp:284 | factor out the disk-full test into its own unit test |
factor out the disk-full test into its own unit test../test/test_transfer.cpp:284 print_alerts(ses1, "ses1", true, true, true, &on_alert);
+ print_alerts(ses2, "ses2", true, true, true, &on_alert);
+
+ if (i % 10 == 0)
+ {
+ print_ses_rate(i / 10.f, &st1, &st2);
+ }
+
+ if (!test_move_storage && st2.progress > 0.25f)
+ {
+ test_move_storage = true;
+ tor1.move_storage("tmp1_transfer_moved");
+ tor2.move_storage("tmp2_transfer_moved");
+ std::cerr << "moving storage" << std::endl;
+ }
+
+ // wait 10 loops before we restart the torrent. This lets
+ // us catch all events that failed (and would put the torrent
+ // back into upload mode) before we restart it.
+
+ if (test_disk_full && st2.upload_mode && ++upload_mode_timer > 10)
+ {
+ test_disk_full = false;
+ ((test_storage*)tor2.get_storage_impl())->set_limit(16 * 1024 * 1024);
+
+ // if we reset the upload mode too soon, there may be more disk
+ // jobs failing right after, putting us back in upload mode. So,
+ // give the disk some time to fail all disk jobs before resetting
+ // upload mode to false
+ test_sleep(500);
+
+ // then we need to drain the alert queue, so the peer_disconnects
+ // counter doesn't get incremented by old alerts
+ print_alerts(ses1, "ses1", true, true, true, &on_alert);
+ print_alerts(ses2, "ses2", true, true, true, &on_alert);
+
+ tor2.set_upload_mode(false);
+
+ // at this point we probably disconnected the seed
+ // so we need to reconnect as well
+ fprintf(stderr, "%s: reconnecting peer\n", time_now_string());
+ error_code ec;
+ tor2.connect_peer(tcp::endpoint(address::from_string("127.0.0.1", ec)
+ , ses1.listen_port()));
+
+ TEST_CHECK(tor2.status().is_finished == false);
+ fprintf(stderr, "disconnects: %d\n", peer_disconnects);
+ TEST_CHECK(peer_disconnects >= 2);
+ fprintf(stderr, "%s: discovered disk full mode. Raise limit and disable upload-mode\n", time_now_string());
+ peer_disconnects = 0;
+ continue;
+ | ||
| relevance 3 | ../src/disk_io_thread.cpp:242 | it would be nice to have the number of threads be set dynamically |
it would be nice to have the number of threads be set dynamically../src/disk_io_thread.cpp:242 std::pair<block_cache::iterator, block_cache::iterator> pieces
= m_disk_cache.all_pieces();
TORRENT_ASSERT(pieces.first == pieces.second);
#endif
@@ -226,63 +380,63 @@ void bootstrap::done()
m_threads.resize(m_num_threads);
}
}
- | ||
| relevance 3 | ../src/peer_connection.cpp:1729 | we should probably use ses.m_allowed_upload_slots here instead to work with auto-unchoke logic |
we should probably use ses.m_allowed_upload_slots here instead
-to work with auto-unchoke logic../src/peer_connection.cpp:1729
- if (t->graceful_pause())
- {
-#if defined TORRENT_VERBOSE_LOGGING
- peer_log("DID NOT UNCHOKE [ graceful pause mode ]");
-#endif
+ | ||
| relevance 3 | ../src/peer_connection.cpp:1796 | we should probably use ses.m_allowed_upload_slots here instead to work with auto-unchoke logic |
we should probably use ses.m_allowed_upload_slots here instead
+to work with auto-unchoke logic../src/peer_connection.cpp:1796#endif
+ write_unchoke();
return;
}
- if (is_choked())
+ maybe_unchoke_this_peer();
+ }
+
+ void peer_connection::maybe_unchoke_this_peer()
+ {
+ TORRENT_ASSERT(is_single_thread());
+ if (ignore_unchoke_slots())
{
- if (ignore_unchoke_slots())
- {
#ifdef TORRENT_VERBOSE_LOGGING
- peer_log("ABOUT TO UNCHOKE [ peer ignores unchoke slots ]");
-#endif
- // if this peer is expempted from the choker
- // just unchoke it immediately
- send_unchoke();
- }
- else if (m_ses.num_uploads() < m_settings.get_int(settings_pack::unchoke_slots_limit)
- || m_settings.get_int(settings_pack::unchoke_slots_limit) < 0)
- {
- // if the peer is choked and we have upload slots left,
- // then unchoke it. Another condition that has to be met
- // is that the torrent doesn't keep track of the individual
- // up/down ratio for each peer (ratio == 0) or (if it does
- // keep track) this particular connection isn't a leecher.
- // If the peer was choked because it was leeching, don't
- // unchoke it again.
- // The exception to this last condition is if we're a seed.
- // In that case we don't care if people are leeching, they
- // can't pay for their downloads anyway.
- m_ses.unchoke_peer(*this);
- }
-#if defined TORRENT_VERBOSE_LOGGING
- else
- {
- peer_log("DID NOT UNCHOKE [ the number of uploads (%d) "
- "is more than or equal to the limit (%d) ]"
- , m_ses.num_uploads(), m_settings.get_int(settings_pack::unchoke_slots_limit));
- }
+ peer_log("ABOUT TO UNCHOKE [ peer ignores unchoke slots ]");
#endif
+ // if this peer is expempted from the choker
+ // just unchoke it immediately
+ send_unchoke();
}
+ else if (m_ses.preemptive_unchoke())
+ {
+ // if the peer is choked and we have upload slots left,
+ // then unchoke it. Another condition that has to be met
+ // is that the torrent doesn't keep track of the individual
+ // up/down ratio for each peer (ratio == 0) or (if it does
+ // keep track) this particular connection isn't a leecher.
+ // If the peer was choked because it was leeching, don't
+ // unchoke it again.
+ // The exception to this last condition is if we're a seed.
+ // In that case we don't care if people are leeching, they
+ // can't pay for their downloads anyway.
+
+ boost::shared_ptr<torrent> t = m_torrent.lock();
+ TORRENT_ASSERT(t);
+
+ t->unchoke_peer(*this);
+ }
+#if defined TORRENT_VERBOSE_LOGGING
else
{
- // the reason to send an extra unchoke message here is that
- // because of the handshake-round-trip optimization, we may
- // end up sending an unchoke before the other end sends us
- // an interested message. This may confuse clients, not reacting
- // to the first unchoke, and then not check whether it's unchoked
- | ||
| relevance 3 | ../src/peer_connection.cpp:3059 | since we throw away the queue entry once we issue the disk job, this may happen. Instead, we should keep the queue entry around, mark it as having been requested from disk and once the disk job comes back, discard it if it has been cancelled. Maybe even be able to cancel disk jobs? |
since we throw away the queue entry once we issue
+ peer_log("DID NOT UNCHOKE [ the number of uploads (%d) "
+ "is more than or equal to the limit (%d) ]"
+ , m_ses.num_uploads(), m_settings.get_int(settings_pack::unchoke_slots_limit));
+ }
+#endif
+ }
+
+ // -----------------------------
+ // ------ NOT INTERESTED -------
+ // -----------------------------
+ | ||
| relevance 3 | ../src/peer_connection.cpp:3133 | since we throw away the queue entry once we issue the disk job, this may happen. Instead, we should keep the queue entry around, mark it as having been requested from disk and once the disk job comes back, discard it if it has been cancelled. Maybe even be able to cancel disk jobs? |
since we throw away the queue entry once we issue
the disk job, this may happen. Instead, we should keep the
queue entry around, mark it as having been requested from
disk and once the disk job comes back, discard it if it has
-been cancelled. Maybe even be able to cancel disk jobs?../src/peer_connection.cpp:3059
+been cancelled. Maybe even be able to cancel disk jobs?../src/peer_connection.cpp:3133
std::vector<peer_request>::iterator i
= std::find(m_requests.begin(), m_requests.end(), r);
@@ -314,6 +468,7 @@ been cancelled. Maybe even be able to cancel disk jobs?../src/peer_conn
void peer_connection::incoming_dht_port(int listen_port)
{
+ TORRENT_ASSERT(is_single_thread());
INVARIANT_CHECK;
#ifdef TORRENT_VERBOSE_LOGGING
@@ -331,11 +486,10 @@ been cancelled. Maybe even be able to cancel disk jobs?../src/peer_conn
void peer_connection::incoming_have_all()
{
- INVARIANT_CHECK;
-
- | ||
| relevance 3 | ../src/peer_connection.cpp:4756 | instead of using settings_pack::request_timeout, use m_rtt.mean() + m_rtt.avg_deviation() * 2 or something like that. the configuration option could hopefully be removed |
instead of using settings_pack::request_timeout, use
+ TORRENT_ASSERT(is_single_thread());
+ | ||
| relevance 3 | ../src/peer_connection.cpp:4867 | instead of using settings_pack::request_timeout, use m_rtt.mean() + m_rtt.avg_deviation() * 2 or something like that. the configuration option could hopefully be removed |
instead of using settings_pack::request_timeout, use
m_rtt.mean() + m_rtt.avg_deviation() * 2 or something like that.
-the configuration option could hopefully be removed../src/peer_connection.cpp:4756 // don't bother disconnect peers we haven't been interested
+the configuration option could hopefully be removed../src/peer_connection.cpp:4867 // don't bother disconnect peers we haven't been interested
// in (and that hasn't been interested in us) for a while
// unless we have used up all our connection slots
if (may_timeout
@@ -376,17 +530,17 @@ the configuration option could hopefully be removed../src/peer_connecti
if (m_statistics.download_payload_rate() > m_download_rate_peak)
{
m_download_rate_peak = m_statistics.download_payload_rate();
-#ifndef TORRENT_DISABLE_GEO_IP
- if (peer_info_struct())
- {
- std::pair<const int, int>* as_stats = peer_info_struct()->inet_as;
- if (as_stats && as_stats->second < m_download_rate_peak)
- as_stats->second = m_download_rate_peak;
- }
-#endif
}
if (is_disconnecting()) return;
- | ||
| relevance 3 | ../src/piece_picker.cpp:3166 | it would be nice if this could be folded into lock_piece() the main distinction is that this also maintains the m_num_passed counter and the passed_hash_check member |
it would be nice if this could be folded into lock_piece()
+
+ if (!t->ready_for_connections()) return;
+
+ update_desired_queue_size();
+
+ if (m_desired_queue_size == m_max_out_request_queue
+ && t->alerts().should_post<performance_alert>())
+ {
+ | ||
| relevance 3 | ../src/piece_picker.cpp:3166 | it would be nice if this could be folded into lock_piece() the main distinction is that this also maintains the m_num_passed counter and the passed_hash_check member |
it would be nice if this could be folded into lock_piece()
the main distinction is that this also maintains the m_num_passed
counter and the passed_hash_check member../src/piece_picker.cpp:3166 int state = m_piece_map[piece].state;
if (state == piece_pos::piece_open) return;
@@ -439,7 +593,7 @@ counter and the passed_hash_check member../src/piece_picker.cpp:3166 | ||
| relevance 3 | ../src/resolver.cpp:39 | the first places to use this resolver is the http_connection/http_tracker_connection and udp_tracker_connection. make sure to prefer cache on shutdown |
the first places to use this resolver is the
+ | ||
| relevance 3 | ../src/resolver.cpp:39 | the first places to use this resolver is the http_connection/http_tracker_connection and udp_tracker_connection. make sure to prefer cache on shutdown |
the first places to use this resolver is the
http_connection/http_tracker_connection and udp_tracker_connection.
make sure to prefer cache on shutdown../src/resolver.cpp:39THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -492,9 +646,9 @@ namespace libtorrent
}
h(ec, ce.addresses);
- | ||
| relevance 3 | ../src/session_impl.cpp:5701 | it would be really nice to update these counters as they are incremented. This depends on the session being ticked, which has a fairly coarse grained resolution |
it would be really nice to update these counters
+ | ||
| relevance 3 | ../src/session_impl.cpp:5535 | it would be really nice to update these counters as they are incremented. This depends on the session being ticked, which has a fairly coarse grained resolution |
it would be really nice to update these counters
as they are incremented. This depends on the session
-being ticked, which has a fairly coarse grained resolution../src/session_impl.cpp:5701 t->status(&alert->status.back(), ~torrent_handle::query_accurate_download_counters);
+being ticked, which has a fairly coarse grained resolution../src/session_impl.cpp:5535 t->status(&alert->status.back(), ~torrent_handle::query_accurate_download_counters);
t->clear_in_state_update();
}
state_updates.clear();
@@ -545,8 +699,8 @@ being ticked, which has a fairly coarse grained resolution../src/sessio
for (int i = 0; i < counters::num_counters; ++i)
values[i] = m_stats_counters[i];
- | ||
| relevance 3 | ../src/session_impl.cpp:7160 | If socket jobs could be higher level, to include RC4 encryption and decryption, we would offload the main thread even more |
If socket jobs could be higher level, to include RC4 encryption and decryption,
-we would offload the main thread even more../src/session_impl.cpp:7160 {
+ | ||
| relevance 3 | ../src/session_impl.cpp:7002 | If socket jobs could be higher level, to include RC4 encryption and decryption, we would offload the main thread even more |
If socket jobs could be higher level, to include RC4 encryption and decryption,
+we would offload the main thread even more../src/session_impl.cpp:7002 {
int num_threads = m_settings.get_int(settings_pack::network_threads);
int num_pools = num_threads > 0 ? num_threads : 1;
while (num_pools > m_net_thread_pool.size())
@@ -597,7 +751,7 @@ we would offload the main thread even more../src/session_impl.cpp:7160<
, end(m_connections.end()); i != end; ++i)
{
int type = (*i)->type();
- | ||
| relevance 3 | ../src/torrent.cpp:1083 | if any other peer has a busy request to this block, we need to cancel it too |
if any other peer has a busy request to this block, we need to cancel it too../src/torrent.cpp:1083#endif
+ | ||
| relevance 3 | ../src/torrent.cpp:1084 | if any other peer has a busy request to this block, we need to cancel it too |
if any other peer has a busy request to this block, we need to cancel it too../src/torrent.cpp:1084#endif
TORRENT_ASSERT(j->piece >= 0);
@@ -648,7 +802,7 @@ we would offload the main thread even more../src/session_impl.cpp:7160<
alerts().post_alert(file_error_alert(j->error.ec
, resolve_filename(j->error.file), j->error.operation_str(), get_handle()));
if (c) c->disconnect(errors::no_memory, peer_connection_interface::op_file);
- | ||
| relevance 3 | ../src/torrent.cpp:7604 | if peer is a really good peer, maybe we shouldn't disconnect it |
if peer is a really good peer, maybe we shouldn't disconnect it../src/torrent.cpp:7604#if defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+ | ||
| relevance 3 | ../src/torrent.cpp:7686 | if peer is a really good peer, maybe we shouldn't disconnect it |
if peer is a really good peer, maybe we shouldn't disconnect it../src/torrent.cpp:7686#if defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
debug_log("incoming peer (%d)", int(m_connections.size()));
#endif
@@ -699,9 +853,9 @@ we would offload the main thread even more../src/session_impl.cpp:7160<
if (m_abort) return false;
if (!m_connections.empty()) return true;
- | ||
| relevance 3 | ../src/web_peer_connection.cpp:586 | just make this peer not have the pieces associated with the file we just requested. Only when it doesn't have any of the file do the following |
just make this peer not have the pieces
+ | ||
| relevance 3 | ../src/web_peer_connection.cpp:596 | just make this peer not have the pieces associated with the file we just requested. Only when it doesn't have any of the file do the following |
just make this peer not have the pieces
associated with the file we just requested. Only
-when it doesn't have any of the file do the following../src/web_peer_connection.cpp:586 {
+when it doesn't have any of the file do the following../src/web_peer_connection.cpp:596 {
++m_num_responses;
if (m_parser.connection_close())
@@ -752,10 +906,10 @@ when it doesn't have any of the file do the following../src/web_peer_co
{
// we should not try this server again.
t->remove_web_seed(this, errors::missing_location, op_bittorrent, 2);
- | ||
| relevance 3 | ../include/libtorrent/block_cache.hpp:212 | could this be a scoped_array instead? does cached_piece_entry really need to be copyable? cached_piece_entry does need to be copyable since it's part of a container, but it's possible it could be a raw pointer or boost::unique_ptr perhaps |
could this be a scoped_array instead? does cached_piece_entry really need to be copyable?
-cached_piece_entry does need to be copyable since it's part of a container, but it's possible
-it could be a raw pointer or boost::unique_ptr perhaps../include/libtorrent/block_cache.hpp:212 // on this piece to complete. These are executed at that point.
- tailqueue read_jobs;
+ | ||
| relevance 3 | ../include/libtorrent/block_cache.hpp:209 | could this be a scoped_array instead? does cached_piece_entry really need to be copyable? cached_piece_entry does need to be copyable since it's part of a container, but it's possible it could be a raw pointer or boost::unique_ptr perhaps |
could this be a scoped_array instead? does cached_piece_entry
+really need to be copyable? cached_piece_entry does need to be
+copyable since it's part of a container, but it's possible it could be
+a raw pointer or boost::unique_ptr perhaps../include/libtorrent/block_cache.hpp:209 tailqueue read_jobs;
int get_piece() const { return piece; }
void* get_storage() const { return storage.get(); }
@@ -774,12 +928,13 @@ it could be a raw pointer or boost::unique_ptr perhaps../include/libtor
// the pointers to the block data. If this is a ghost
// cache entry, there won't be any data here
+
boost::shared_array<cached_block_entry> blocks;
// the last time a block was written to this piece
// plus the minimum amount of time the block is guaranteed
// to stay in the cache
- | ||
| relevance 3 | ../include/libtorrent/disk_io_thread.hpp:537 | turn these counters and gauges into session_stats counters (which also would need to be thread safe) |
turn these counters and gauges into session_stats
+ | ||
| relevance 3 | ../include/libtorrent/disk_io_thread.hpp:537 | turn these counters and gauges into session_stats counters (which also would need to be thread safe) |
turn these counters and gauges into session_stats
counters (which also would need to be thread safe)../include/libtorrent/disk_io_thread.hpp:537 void* m_userdata;
// the last time we expired write blocks from the cache
@@ -831,7 +986,7 @@ counters (which also would need to be thread safe)../include/libtorrent
// when it's OK to exit the main loop of the disk thread
boost::atomic<int> m_num_blocked_jobs;
- | ||
| relevance 3 | ../include/libtorrent/policy.hpp:104 | this class should be renamed peer_list |
this class should be renamed peer_list../include/libtorrent/policy.hpp:104 int min_reconnect_time;
+ | ||
| relevance 3 | ../include/libtorrent/policy.hpp:104 | this class should be renamed peer_list |
this class should be renamed peer_list../include/libtorrent/policy.hpp:104 int min_reconnect_time;
// the number of iterations over the peer list for this operation
int loop_counter;
@@ -882,7 +1037,7 @@ counters (which also would need to be thread safe)../include/libtorrent
// called when an incoming connection is accepted
// false means the connection was refused or failed
- | ||
| relevance 3 | ../include/libtorrent/session.hpp:210 | could the fingerprint be a setting as well? And should the settings_pack be optional? |
could the fingerprint be a setting as well? And should the
+ | ||
| relevance 3 | ../include/libtorrent/session.hpp:210 | could the fingerprint be a setting as well? And should the settings_pack be optional? |
could the fingerprint be a setting as well? And should the
settings_pack be optional?../include/libtorrent/session.hpp:210 //
// see apply_settings().
class TORRENT_EXPORT session: public boost::noncopyable
@@ -934,7 +1089,59 @@ settings_pack be optional?../include/libtorrent/session.hpp:210 | ||
| relevance 2 | ../src/disk_io_thread.cpp:844 | should this be allocated on the stack? |
should this be allocated on the stack?../src/disk_io_thread.cpp:844 // if we're also flushing the read cache, this piece
+ | ||
| relevance 3 | ../include/libtorrent/torrent_info.hpp:221 | this type should be different from the one used by torrent. It should not include internal state. |
this type should be different from the one used by torrent. It
+should not include internal state.../include/libtorrent/torrent_info.hpp:221 && !updating;
+ }
+#endif
+
+ // returns true if we can announec to this tracker now.
+ // The current time is passed in as ``now``. The ``is_seed``
+ // argument is necessary because once we become a seed, we
+ // need to announce right away, even if the re-announce timer
+ // hasn't expired yet.
+ bool can_announce(ptime now, bool is_seed) const;
+
+ // returns true if the last time we tried to announce to this
+ // tracker succeeded, or if we haven't tried yet.
+ bool is_working() const
+ { return fails == 0; }
+
+ // trims whitespace characters from the beginning of the URL.
+ void trim();
+ };
+
+
+ // the web_seed_entry holds information about a web seed (also known
+ // as URL seed or HTTP seed). It is essentially a URL with some state
+ // associated with it. For more information, see `BEP 17`_ and `BEP 19`_.
+ struct web_seed_entry
+ {
+ // http seeds are different from url seeds in the
+ // protocol they use. http seeds follows the original
+ // http seed spec. by John Hoffman
+ enum type_t { url_seed, http_seed };
+
+ typedef std::vector<std::pair<std::string, std::string> > headers_t;
+
+ web_seed_entry(std::string const& url_, type_t type_
+ , std::string const& auth_ = std::string()
+ , headers_t const& extra_headers_ = headers_t());
+
+ // URL and type comparison
+ bool operator==(web_seed_entry const& e) const
+ { return url == e.url && type == e.type; }
+
+ // URL and type less-than comparison
+ bool operator<(web_seed_entry const& e) const
+ {
+ if (url < e.url) return true;
+ if (url > e.url) return false;
+ return type < e.type;
+ }
+
+ // The URL of the web seed
+ std::string url;
+ | ||
| relevance 2 | ../src/disk_io_thread.cpp:844 | should this be allocated on the stack? |
should this be allocated on the stack?../src/disk_io_thread.cpp:844 // if we're also flushing the read cache, this piece
// should be removed as soon as all write jobs finishes
// otherwise it will turn into a read piece
}
@@ -985,7 +1192,7 @@ settings_pack be optional?../include/libtorrent/session.hpp:210 | ||
| relevance 2 | ../src/disk_io_thread.cpp:885 | we're not flushing the read cache at all? |
we're not flushing the read cache at all?../src/disk_io_thread.cpp:885 // from disk_io_thread::do_delete, which is a fence job and should
+ | ||
| relevance 2 | ../src/disk_io_thread.cpp:885 | we're not flushing the read cache at all? |
we're not flushing the read cache at all?../src/disk_io_thread.cpp:885 // from disk_io_thread::do_delete, which is a fence job and should
// have any other jobs active, i.e. there should not be any references
// keeping pieces or blocks alive
if ((flags & flush_delete_cache) && (flags & flush_expect_clear))
@@ -1036,7 +1243,7 @@ settings_pack be optional?../include/libtorrent/session.hpp:210 | ||
| relevance 2 | ../src/file.cpp:1491 | use vm_copy here, if available, and if buffers are aligned |
use vm_copy here, if available, and if buffers are aligned../src/file.cpp:1491 CloseHandle(native_handle());
+ | ||
| relevance 2 | ../src/file.cpp:1491 | use vm_copy here, if available, and if buffers are aligned |
use vm_copy here, if available, and if buffers are aligned../src/file.cpp:1491 CloseHandle(native_handle());
m_path.clear();
#else
if (m_file_handle != INVALID_HANDLE_VALUE)
@@ -1066,7 +1273,7 @@ settings_pack be optional?../include/libtorrent/session.hpp:210 | ||
| relevance 2 | ../src/file.cpp:1502 | use vm_copy here, if available, and if buffers are aligned |
use vm_copy here, if available, and if buffers are aligned../src/file.cpp:1502 }
+ | ||
| relevance 2 | ../src/file.cpp:1502 | use vm_copy here, if available, and if buffers are aligned |
use vm_copy here, if available, and if buffers are aligned../src/file.cpp:1502 }
// defined in storage.cpp
int bufs_size(file::iovec_t const* bufs, int num_bufs);
@@ -1117,7 +1324,7 @@ settings_pack be optional?../include/libtorrent/session.hpp:210 | ||
| relevance 2 | ../src/session_impl.cpp:2568 | use bind_to_device in udp_socket |
use bind_to_device in udp_socket../src/session_impl.cpp:2568 if (m_listen_sockets.empty() && ec)
+ | ||
| relevance 2 | ../src/session_impl.cpp:2422 | use bind_to_device in udp_socket |
use bind_to_device in udp_socket../src/session_impl.cpp:2422 if (m_listen_sockets.empty() && ec)
{
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
char msg[200];
@@ -1168,8 +1375,8 @@ settings_pack be optional?../include/libtorrent/session.hpp:210 | ||
| relevance 2 | ../src/session_impl.cpp:4600 | make a list for torrents that want to be announced on the DHT so we don't have to loop over all torrents, just to find the ones that want to announce |
make a list for torrents that want to be announced on the DHT so we
-don't have to loop over all torrents, just to find the ones that want to announce../src/session_impl.cpp:4600 if (!m_dht_torrents.empty())
+ | ||
| relevance 2 | ../src/session_impl.cpp:4435 | make a list for torrents that want to be announced on the DHT so we don't have to loop over all torrents, just to find the ones that want to announce |
make a list for torrents that want to be announced on the DHT so we
+don't have to loop over all torrents, just to find the ones that want to announce../src/session_impl.cpp:4435 if (!m_dht_torrents.empty())
{
boost::shared_ptr<torrent> t;
do
@@ -1220,7 +1427,7 @@ don't have to loop over all torrents, just to find the ones that want to announc
if (m_torrents.empty()) return;
if (m_next_lsd_torrent == m_torrents.end())
- | ||
| relevance 2 | ../src/torrent.cpp:701 | post alert |
post alert../src/torrent.cpp:701 state_updated();
+ | ||
| relevance 2 | ../src/torrent.cpp:702 | post alert |
post alert../src/torrent.cpp:702 state_updated();
set_state(torrent_status::downloading);
@@ -1271,8 +1478,8 @@ don't have to loop over all torrents, just to find the ones that want to announc
TORRENT_ASSERT(piece >= 0);
TORRENT_ASSERT(m_verified.get_bit(piece) == false);
++m_num_verified;
- | ||
| relevance 2 | ../src/torrent.cpp:4648 | abort lookups this torrent has made via the session host resolver interface |
abort lookups this torrent has made via the
-session host resolver interface../src/torrent.cpp:4648 // files belonging to the torrents
+ | ||
| relevance 2 | ../src/torrent.cpp:4693 | abort lookups this torrent has made via the session host resolver interface |
abort lookups this torrent has made via the
+session host resolver interface../src/torrent.cpp:4693 // files belonging to the torrents
disconnect_all(errors::torrent_aborted, peer_connection_interface::op_bittorrent);
// post a message to the main thread to destruct
@@ -1323,7 +1530,7 @@ session host resolver interface../src/torrent.cpp:4648| relevance 2 | ../src/udp_tracker_connection.cpp:64 | it would be nice to not have a dependency on session_impl here |
|
it would be nice to not have a dependency on session_impl here../src/udp_tracker_connection.cpp:64#pragma warning(pop)
+ | ||
| relevance 2 | ../src/udp_tracker_connection.cpp:64 | it would be nice to not have a dependency on session_impl here |
it would be nice to not have a dependency on session_impl here../src/udp_tracker_connection.cpp:64#pragma warning(pop)
#endif
#include "libtorrent/tracker_manager.hpp"
@@ -1374,9 +1581,9 @@ namespace libtorrent
if (port == -1) port = protocol == "http" ? 80 : 443;
if (ec)
- | ||
| relevance 2 | ../src/web_peer_connection.cpp:645 | create a mapping of file-index to redirection URLs. Use that to form URLs instead. Support to reconnect to a new server without destructing this peer_connection |
create a mapping of file-index to redirection URLs. Use that to form
+ | ||
| relevance 2 | ../src/web_peer_connection.cpp:655 | create a mapping of file-index to redirection URLs. Use that to form URLs instead. Support to reconnect to a new server without destructing this peer_connection |
create a mapping of file-index to redirection URLs. Use that to form
URLs instead. Support to reconnect to a new server without destructing this
-peer_connection../src/web_peer_connection.cpp:645 == dl_target);
+peer_connection../src/web_peer_connection.cpp:655 == dl_target);
#endif
return;
}
@@ -1427,7 +1634,7 @@ peer_connection../src/web_peer_connection.cpp:645| relevance 2 | ../src/kademlia/dos_blocker.cpp:68 | make these limits configurable |
|
make these limits configurable../src/kademlia/dos_blocker.cpp:68 bool dos_blocker::incoming(address addr, ptime now)
+ | ||
| relevance 2 | ../src/kademlia/dos_blocker.cpp:68 | make these limits configurable |
make these limits configurable../src/kademlia/dos_blocker.cpp:68 bool dos_blocker::incoming(address addr, ptime now)
{
node_ban_entry* match = 0;
node_ban_entry* min = m_ban_nodes;
@@ -1478,7 +1685,7 @@ peer_connection../src/web_peer_connection.cpp:645| relevance 2 | ../src/kademlia/node.cpp:67 | make this configurable in dht_settings |
|
make this configurable in dht_settings../src/kademlia/node.cpp:67#include "libtorrent/kademlia/routing_table.hpp"
+ | ||
| relevance 2 | ../src/kademlia/node.cpp:67 | make this configurable in dht_settings |
make this configurable in dht_settings../src/kademlia/node.cpp:67#include "libtorrent/kademlia/routing_table.hpp"
#include "libtorrent/kademlia/node.hpp"
#include "libtorrent/kademlia/dht_observer.hpp"
@@ -1529,7 +1736,7 @@ void purge_peers(std::set<peer_entry>& peers)
void nop() {}
- | ||
| relevance 2 | ../src/kademlia/node_id.cpp:133 | this could be optimized if SSE 4.2 is available. It could also be optimized given that we have a fixed length |
this could be optimized if SSE 4.2 is
+ | ||
| relevance 2 | ../src/kademlia/node_id.cpp:133 | this could be optimized if SSE 4.2 is available. It could also be optimized given that we have a fixed length |
this could be optimized if SSE 4.2 is
available. It could also be optimized given
that we have a fixed length../src/kademlia/node_id.cpp:133 b6 = ip_.to_v6().to_bytes();
ip = &b6[0];
@@ -1582,7 +1789,7 @@ bool verify_id(node_id const& nid, address const& source_ip)
if (is_local(source_ip)) return true;
node_id h = generate_id_impl(source_ip, nid[19]);
- | ||
| relevance 2 | ../include/libtorrent/enum_net.hpp:137 | this could be done more efficiently by just looking up the interface with the given name, maybe even with if_nametoindex() |
this could be done more efficiently by just looking up
+ | ||
| relevance 2 | ../include/libtorrent/enum_net.hpp:137 | this could be done more efficiently by just looking up the interface with the given name, maybe even with if_nametoindex() |
this could be done more efficiently by just looking up
the interface with the given name, maybe even with if_nametoindex()../include/libtorrent/enum_net.hpp:137
address ip = address::from_string(device_name, ec);
if (!ec)
@@ -1634,7 +1841,7 @@ the interface with the given name, maybe even with if_nametoindex()../i
// returns true if the given device exists
TORRENT_EXTRA_EXPORT bool has_interface(char const* name, io_service& ios
- | ||
| relevance 2 | ../include/libtorrent/intrusive_ptr_base.hpp:44 | remove this class and transition over to using shared_ptr and make_shared instead |
remove this class and transition over to using shared_ptr and
+ | ||
| relevance 2 | ../include/libtorrent/intrusive_ptr_base.hpp:44 | remove this class and transition over to using shared_ptr and make_shared instead |
remove this class and transition over to using shared_ptr and
make_shared instead../include/libtorrent/intrusive_ptr_base.hpp:44CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
@@ -1686,7 +1893,7 @@ namespace libtorrent
intrusive_ptr_base(): m_refs(0) {}
- | ||
| relevance 2 | ../include/libtorrent/settings_pack.hpp:70 | add an API to query a settings_pack as well |
add an API to query a settings_pack as well../include/libtorrent/settings_pack.hpp:70 | ||
| relevance 2 | ../include/libtorrent/settings_pack.hpp:71 | maybe convert all bool types into int-types as well |
maybe convert all bool types into int-types as well../include/libtorrent/settings_pack.hpp:71{
+ | ||
| relevance 2 | ../include/libtorrent/settings_pack.hpp:70 | add an API to query a settings_pack as well |
add an API to query a settings_pack as well../include/libtorrent/settings_pack.hpp:70 | ||
| relevance 2 | ../include/libtorrent/settings_pack.hpp:71 | maybe convert all bool types into int-types as well |
maybe convert all bool types into int-types as well../include/libtorrent/settings_pack.hpp:71{
namespace aux { struct session_impl; struct session_settings; }
struct settings_pack;
@@ -1737,7 +1944,58 @@ namespace libtorrent
{
string_type_base = 0x0000,
int_type_base = 0x4000,
- | ||
| relevance 2 | ../include/libtorrent/torrent.hpp:1188 | replace all usage of this with m_ses.get_resolver() |
replace all usage of this with m_ses.get_resolver()../include/libtorrent/torrent.hpp:1188
+ | ||
| relevance 2 | ../include/libtorrent/socks5_stream.hpp:129 | fix error messages to use custom error_code category |
fix error messages to use custom error_code category../include/libtorrent/socks5_stream.hpp:129 | ||
| relevance 2 | ../include/libtorrent/socks5_stream.hpp:130 | add async_connect() that takes a hostname and port as well |
add async_connect() that takes a hostname and port as well../include/libtorrent/socks5_stream.hpp:130 if (m_dst_name.size() > 255)
+ m_dst_name.resize(255);
+ }
+
+ void close(error_code& ec)
+ {
+ m_hostname.clear();
+ m_dst_name.clear();
+ proxy_base::close(ec);
+ }
+
+#ifndef BOOST_NO_EXCEPTIONS
+ void close()
+ {
+ m_hostname.clear();
+ m_dst_name.clear();
+ proxy_base::close();
+ }
+#endif
+
+ template <class Handler>
+ void async_connect(endpoint_type const& endpoint, Handler const& handler)
+ {
+ // make sure we don't try to connect to INADDR_ANY. binding is fine,
+ // and using a hostname is fine on SOCKS version 5.
+ TORRENT_ASSERT(m_command == socks5_bind
+ || endpoint.address() != address()
+ || (!m_dst_name.empty() && m_version == 5));
+
+ m_remote_endpoint = endpoint;
+
+ // the connect is split up in the following steps:
+ // 1. resolve name of proxy server
+ // 2. connect to proxy server
+ // 3. if version == 5:
+ // 3.1 send SOCKS5 authentication method message
+ // 3.2 read SOCKS5 authentication response
+ // 3.3 send username+password
+ // 4. send SOCKS command message
+
+ // to avoid unnecessary copying of the handler,
+ // store it in a shaed_ptr
+ boost::shared_ptr<handler_type> h(new handler_type(handler));
+
+#if defined TORRENT_ASIO_DEBUGGING
+ add_outstanding_async("socks5_stream::name_lookup");
+#endif
+ tcp::resolver::query q(m_hostname, to_string(m_port).elems);
+ m_resolver.async_resolve(q, boost::bind(
+ &socks5_stream::name_lookup, this, _1, _2, h));
+ }
+ | ||
| relevance 2 | ../include/libtorrent/torrent.hpp:1195 | replace all usage of this with m_ses.get_resolver() |
replace all usage of this with m_ses.get_resolver()../include/libtorrent/torrent.hpp:1195
// The list of web seeds in this torrent. Seeds
// with fatal errors are removed from the set
std::list<web_seed_entry> m_web_seeds;
@@ -1762,8 +2020,8 @@ namespace libtorrent
// this vector is allocated lazily. If no file priorities are
// ever changed, this remains empty. Any unallocated slot
// implicitly means the file has priority 1.
- | ||
| relevance 2 | ../include/libtorrent/torrent_info.hpp:303 | there may be some opportunities to optimize the size if torrent_info. specifically to turn some std::string and std::vector into pointers |
there may be some opportunities to optimize the size if torrent_info.
-specifically to turn some std::string and std::vector into pointers../include/libtorrent/torrent_info.hpp:303 bool resolving;
+ | ||
| relevance 2 | ../include/libtorrent/torrent_info.hpp:306 | there may be some opportunities to optimize the size if torrent_info. specifically to turn some std::string and std::vector into pointers |
there may be some opportunities to optimize the size if torrent_info.
+specifically to turn some std::string and std::vector into pointers../include/libtorrent/torrent_info.hpp:306 bool resolving;
// if the user wanted to remove this while
// we were resolving it. In this case, we set
@@ -1814,7 +2072,7 @@ specifically to turn some std::string and std::vector into pointers../i
#ifndef BOOST_NO_EXCEPTIONS
torrent_info(lazy_entry const& torrent_file, int flags = 0);
torrent_info(char const* buffer, int size, int flags = 0);
- | ||
| relevance 2 | ../include/libtorrent/aux_/session_interface.hpp:108 | the IP voting mechanism should be factored out to its own class, not part of the session |
the IP voting mechanism should be factored out
+ | ||
| relevance 2 | ../include/libtorrent/aux_/session_interface.hpp:108 | the IP voting mechanism should be factored out to its own class, not part of the session |
the IP voting mechanism should be factored out
to its own class, not part of the session../include/libtorrent/aux_/session_interface.hpp:108 class port_filter;
struct settings_pack;
struct torrent_peer_allocator_interface;
@@ -1866,8 +2124,8 @@ namespace libtorrent { namespace aux
virtual void remove_torrent_impl(boost::shared_ptr<torrent> tptr, int options) = 0;
// ip and port filter
- | ||
| relevance 1 | ../src/http_seed_connection.cpp:111 | in chunked encoding mode, this assert won't hold. the chunk headers should be subtracted from the receive_buffer_size |
in chunked encoding mode, this assert won't hold.
-the chunk headers should be subtracted from the receive_buffer_size../src/http_seed_connection.cpp:111 boost::optional<piece_block_progress>
+ | ||
| relevance 1 | ../src/http_seed_connection.cpp:124 | in chunked encoding mode, this assert won't hold. the chunk headers should be subtracted from the receive_buffer_size |
in chunked encoding mode, this assert won't hold.
+the chunk headers should be subtracted from the receive_buffer_size../src/http_seed_connection.cpp:124 boost::optional<piece_block_progress>
http_seed_connection::downloading_piece_progress() const
{
if (m_requests.empty())
@@ -1918,8 +2176,8 @@ the chunk headers should be subtracted from the receive_buffer_size../s
std::string request;
request.reserve(400);
- | ||
| relevance 1 | ../src/session_impl.cpp:6512 | report the proper address of the router as the source IP of this understanding of our external address, instead of the empty address |
report the proper address of the router as the source IP of
-this understanding of our external address, instead of the empty address../src/session_impl.cpp:6512 void session_impl::on_port_mapping(int mapping, address const& ip, int port
+ | ||
| relevance 1 | ../src/session_impl.cpp:6353 | report the proper address of the router as the source IP of this understanding of our external address, instead of the empty address |
report the proper address of the router as the source IP of
+this understanding of our external address, instead of the empty address../src/session_impl.cpp:6353 void session_impl::on_port_mapping(int mapping, address const& ip, int port
, error_code const& ec, int map_transport)
{
TORRENT_ASSERT(is_single_thread());
@@ -1970,9 +2228,9 @@ this understanding of our external address, instead of the empty address | ||
| relevance 1 | ../src/session_impl.cpp:7672 | we only need to do this if our global IPv4 address has changed since the DHT (currently) only supports IPv4. Since restarting the DHT is kind of expensive, it would be nice to not do it unnecessarily |
we only need to do this if our global IPv4 address has changed
+ | ||
| relevance 1 | ../src/session_impl.cpp:7514 | we only need to do this if our global IPv4 address has changed since the DHT (currently) only supports IPv4. Since restarting the DHT is kind of expensive, it would be nice to not do it unnecessarily |
we only need to do this if our global IPv4 address has changed
since the DHT (currently) only supports IPv4. Since restarting the DHT
-is kind of expensive, it would be nice to not do it unnecessarily../src/session_impl.cpp:7672#endif
+is kind of expensive, it would be nice to not do it unnecessarily../src/session_impl.cpp:7514#endif
if (!m_external_ip.cast_vote(ip, source_type, source)) return;
@@ -2023,11 +2281,11 @@ is kind of expensive, it would be nice to not do it unnecessarily../src
, boost::function<void(char*)> const& handler)
{
return m_disk_thread.async_allocate_disk_buffer(category, handler);
- | ||
| relevance 1 | ../src/torrent.cpp:1142 | make this depend on the error and on the filesystem the files are being downloaded to. If the error is no_space_left_on_device and the filesystem doesn't support sparse files, only zero the priorities of the pieces that are at the tails of all files, leaving everything up to the highest written piece in each file |
make this depend on the error and on the filesystem the
+ | ||
| relevance 1 | ../src/torrent.cpp:1143 | make this depend on the error and on the filesystem the files are being downloaded to. If the error is no_space_left_on_device and the filesystem doesn't support sparse files, only zero the priorities of the pieces that are at the tails of all files, leaving everything up to the highest written piece in each file |
make this depend on the error and on the filesystem the
files are being downloaded to. If the error is no_space_left_on_device
and the filesystem doesn't support sparse files, only zero the priorities
of the pieces that are at the tails of all files, leaving everything
-up to the highest written piece in each file../src/torrent.cpp:1142 alerts().post_alert(file_error_alert(j->error.ec
+up to the highest written piece in each file../src/torrent.cpp:1143 alerts().post_alert(file_error_alert(j->error.ec
, resolve_filename(j->error.file), j->error.operation_str(), get_handle()));
// put the torrent in an error-state
@@ -2078,8 +2336,8 @@ up to the highest written piece in each file../src/torrent.cpp:1142 | ||
| relevance 1 | ../src/torrent.cpp:6774 | save the send_stats state instead of throwing them away it may pose an issue when downgrading though |
save the send_stats state instead of throwing them away
-it may pose an issue when downgrading though../src/torrent.cpp:6774 for (int k = 0; k < bits; ++k)
+ | ||
| relevance 1 | ../src/torrent.cpp:6845 | save the send_stats state instead of throwing them away it may pose an issue when downgrading though |
save the send_stats state instead of throwing them away
+it may pose an issue when downgrading though../src/torrent.cpp:6845 for (int k = 0; k < bits; ++k)
v |= (i->info[j*8+k].state == piece_picker::block_info::state_finished)
? (1 << k) : 0;
bitmask.append(1, v);
@@ -2130,9 +2388,9 @@ it may pose an issue when downgrading though../src/torrent.cpp:6774 | ||
| relevance 1 | ../src/torrent.cpp:7852 | should disconnect all peers that have the pieces we have not just seeds. It would be pretty expensive to check all pieces for all peers though |
should disconnect all peers that have the pieces we have
+ | ||
| relevance 1 | ../src/torrent.cpp:7934 | should disconnect all peers that have the pieces we have not just seeds. It would be pretty expensive to check all pieces for all peers though |
should disconnect all peers that have the pieces we have
not just seeds. It would be pretty expensive to check all pieces
-for all peers though../src/torrent.cpp:7852 set_state(torrent_status::finished);
+for all peers though../src/torrent.cpp:7934 set_state(torrent_status::finished);
set_queue_position(-1);
m_became_finished = m_ses.session_time();
@@ -2183,7 +2441,7 @@ for all peers though../src/torrent.cpp:7852| relevance 1 | ../src/kademlia/node.cpp:827 | find_node should write directly to the response entry |
|
find_node should write directly to the response entry../src/kademlia/node.cpp:827 TORRENT_LOG(node) << " values: " << reply["values"].list().size();
+ | ||
| relevance 1 | ../src/kademlia/node.cpp:835 | find_node should write directly to the response entry |
find_node should write directly to the response entry../src/kademlia/node.cpp:835 TORRENT_LOG(node) << " values: " << reply["values"].list().size();
}
#endif
}
@@ -2234,7 +2492,7 @@ for all peers though../src/torrent.cpp:7852| relevance 1 | ../include/libtorrent/ip_voter.hpp:122 | instead, have one instance per possible subnet, global IPv4, global IPv6, loopback, 192.168.x.x, 10.x.x.x, etc. |
|
instead, have one instance per possible subnet, global IPv4, global IPv6, loopback, 192.168.x.x, 10.x.x.x, etc.../include/libtorrent/ip_voter.hpp:122 // away all the votes and started from scratch, in case
+ | ||
| relevance 1 | ../include/libtorrent/ip_voter.hpp:122 | instead, have one instance per possible subnet, global IPv4, global IPv6, loopback, 192.168.x.x, 10.x.x.x, etc. |
instead, have one instance per possible subnet, global IPv4, global IPv6, loopback, 192.168.x.x, 10.x.x.x, etc.../include/libtorrent/ip_voter.hpp:122 // away all the votes and started from scratch, in case
// our IP has changed
ptime m_last_rotate;
};
@@ -2261,7 +2519,7 @@ for all peers though../src/torrent.cpp:7852| relevance 1 | ../include/libtorrent/web_peer_connection.hpp:121 | if we make this be a disk_buffer_holder instead we would save a copy sometimes use allocate_disk_receive_buffer and release_disk_receive_buffer |
|
if we make this be a disk_buffer_holder instead
+ | ||
| relevance 1 | ../include/libtorrent/web_peer_connection.hpp:121 | if we make this be a disk_buffer_holder instead we would save a copy sometimes use allocate_disk_receive_buffer and release_disk_receive_buffer |
if we make this be a disk_buffer_holder instead
we would save a copy sometimes
use allocate_disk_receive_buffer and release_disk_receive_buffer../include/libtorrent/web_peer_connection.hpp:121
// returns the block currently being
@@ -2314,7 +2572,556 @@ use allocate_disk_receive_buffer and release_disk_receive_buffer../incl
};
}
- | ||
| relevance 0 | ../src/block_cache.cpp:884 | it's somewhat expensive to iterate over this linked list. Presumably because of the random access of memory. It would be nice if pieces with no evictable blocks weren't in this list |
it's somewhat expensive
+ | ||
| relevance 0 | ../test/test_block_cache.cpp:472 | test try_evict_blocks |
test try_evict_blocks../test/test_block_cache.cpp:472 | ||
| relevance 0 | ../test/test_block_cache.cpp:473 | test evicting volatile pieces, to see them be removed |
test evicting volatile pieces, to see them be removed../test/test_block_cache.cpp:473 | ||
| relevance 0 | ../test/test_block_cache.cpp:474 | test evicting dirty pieces |
test evicting dirty pieces../test/test_block_cache.cpp:474 | ||
| relevance 0 | ../test/test_block_cache.cpp:475 | test free_piece |
test free_piece../test/test_block_cache.cpp:475 | ||
| relevance 0 | ../test/test_block_cache.cpp:476 | test abort_dirty |
test abort_dirty../test/test_block_cache.cpp:476 | ||
| relevance 0 | ../test/test_block_cache.cpp:477 | test unaligned reads |
test unaligned reads../test/test_block_cache.cpp:477 // it's supposed to be a cache hit
+ TEST_CHECK(ret >= 0);
+ // return the reference to the buffer we just read
+ RETURN_BUFFER;
+
+ tailqueue jobs;
+ bc.clear(jobs);
+}
+
+int test_main()
+{
+ test_write();
+ test_flush();
+ test_insert();
+ test_evict();
+ test_arc_promote();
+ test_arc_unghost();
+ test_iovec();
+ test_unaligned_read();
+
+ return 0;
+ }
+
+ | ||
| relevance 0 | ../test/test_metadata_extension.cpp:73 | it would be nice to test reversing which session is making the connection as well |
it would be nice to test reversing
+which session is making the connection as well../test/test_metadata_extension.cpp:73
+void test_transfer(int flags
+ , boost::shared_ptr<libtorrent::torrent_plugin> (*constructor)(libtorrent::torrent*, void*)
+ , int timeout)
+{
+ using namespace libtorrent;
+ namespace lt = libtorrent;
+
+ fprintf(stderr, "test transfer: timeout=%d %s%s%s\n"
+ , timeout
+ , (flags & clear_files) ? "clear-files " : ""
+ , (flags & disconnect) ? "disconnect " : ""
+ , (flags & full_encryption) ? "encryption " : "");
+
+ // these are declared before the session objects
+ // so that they are destructed last. This enables
+ // the sessions to destruct in parallel
+ session_proxy p1;
+ session_proxy p2;
+
+ lt::session ses1(fingerprint("LT", 0, 1, 0, 0), std::make_pair(48100, 49000), "0.0.0.0", 0);
+ lt::session ses2(fingerprint("LT", 0, 1, 0, 0), std::make_pair(49100, 50000), "0.0.0.0", 0);
+ ses1.add_extension(constructor);
+ ses2.add_extension(constructor);
+ torrent_handle tor1;
+ torrent_handle tor2;
+
+ settings_pack pack;
+ pack.set_int(settings_pack::out_enc_policy, settings_pack::pe_forced);
+ pack.set_int(settings_pack::in_enc_policy, settings_pack::pe_forced);
+ pack.set_bool(settings_pack::prefer_rc4, flags & full_encryption);
+ ses1.apply_settings(pack);
+ ses2.apply_settings(pack);
+
+ lt::session* downloader = &ses2;
+ lt::session* seed = &ses1;
+
+ if (flags & reverse)
+ {
+ std::swap(downloader, seed);
+ }
+
+ boost::tie(tor1, tor2, ignore) = setup_transfer(seed, downloader, NULL, flags & clear_files, true, true, "_meta");
+
+ for (int i = 0; i < timeout * 10; ++i)
+ {
+ // make sure this function can be called on
+ // torrents without metadata
+ if ((flags & disconnect) == 0) tor2.status();
+ print_alerts(*seed, "seed", false, true);
+ print_alerts(*downloader, "downloader", false, true);
+ | ||
| relevance 0 | ../test/test_policy.cpp:419 | test applying a port_filter |
test applying a port_filter../test/test_policy.cpp:419 | ||
| relevance 0 | ../test/test_policy.cpp:420 | test erasing peers |
test erasing peers../test/test_policy.cpp:420 | ||
| relevance 0 | ../test/test_policy.cpp:421 | test using port and ip filter |
test using port and ip filter../test/test_policy.cpp:421 | ||
| relevance 0 | ../test/test_policy.cpp:422 | test incrementing failcount (and make sure we no longer consider the peer a connect canidate) |
test incrementing failcount (and make sure we no longer consider the peer a connect canidate)../test/test_policy.cpp:422 | ||
| relevance 0 | ../test/test_policy.cpp:423 | test max peerlist size |
test max peerlist size../test/test_policy.cpp:423 | ||
| relevance 0 | ../test/test_policy.cpp:424 | test logic for which connection to keep when receiving an incoming connection to the same peer as we just made an outgoing connection to |
test logic for which connection to keep when receiving an incoming connection to the same peer as we just made an outgoing connection to../test/test_policy.cpp:424 | ||
| relevance 0 | ../test/test_policy.cpp:425 | test update_peer_port with allow_multiple_connections_per_ip |
test update_peer_port with allow_multiple_connections_per_ip../test/test_policy.cpp:425 | ||
| relevance 0 | ../test/test_policy.cpp:426 | test set_seed |
test set_seed../test/test_policy.cpp:426 | ||
| relevance 0 | ../test/test_policy.cpp:427 | test has_peer |
test has_peer../test/test_policy.cpp:427 | ||
| relevance 0 | ../test/test_policy.cpp:428 | test insert_peer with a full list |
test insert_peer with a full list../test/test_policy.cpp:428 | ||
| relevance 0 | ../test/test_policy.cpp:429 | test add i2p peers |
test add i2p peers../test/test_policy.cpp:429 | ||
| relevance 0 | ../test/test_policy.cpp:430 | test allow_i2p_mixed |
test allow_i2p_mixed../test/test_policy.cpp:430 | ||
| relevance 0 | ../test/test_policy.cpp:431 | test insert_peer failing |
test insert_peer failing../test/test_policy.cpp:431 | ||
| relevance 0 | ../test/test_policy.cpp:432 | test IPv6 |
test IPv6../test/test_policy.cpp:432 | ||
| relevance 0 | ../test/test_policy.cpp:433 | test connect_to_peer() failing |
test connect_to_peer() failing../test/test_policy.cpp:433 | ||
| relevance 0 | ../test/test_policy.cpp:434 | test connection_closed |
test connection_closed../test/test_policy.cpp:434 | ||
| relevance 0 | ../test/test_policy.cpp:435 | test recalculate connect candidates |
test recalculate connect candidates../test/test_policy.cpp:435 | ||
| relevance 0 | ../test/test_policy.cpp:436 | add tests here |
add tests here../test/test_policy.cpp:436 for (int i = 0; i < 100; ++i)
+ {
+ torrent_peer* peer = p.add_peer(rand_tcp_ep(), 0, 0, &st);
+ TEST_EQUAL(st.erased.size(), 0);
+ st.erased.clear();
+ TEST_CHECK(peer);
+ if (peer == NULL || st.erased.size() > 0)
+ {
+ fprintf(stderr, "unexpected rejection of peer: %d in list. added peer %p, erased peers %d\n"
+ , p.num_peers(), peer, int(st.erased.size()));
+ }
+ }
+ TEST_EQUAL(p.num_peers(), 100);
+
+ // trigger the eviction of one peer
+ torrent_peer* peer = p.add_peer(rand_tcp_ep(), 0, 0, &st);
+ // we either removed an existing peer, or rejected this one
+ TEST_CHECK(st.erased.size() == 1 || peer == NULL);
+ }
+
+
+ return 0;
+}
+
+ | ||
| relevance 0 | ../test/test_primitives.cpp:213 | test the case where we have > 120 samples (and have the base delay actually be updated) |
test the case where we have > 120 samples (and have the base delay actually be updated)../test/test_primitives.cpp:213 | ||
| relevance 0 | ../test/test_primitives.cpp:214 | test the case where a sample is lower than the history entry but not lower than the base |
test the case where a sample is lower than the history entry but not lower than the base../test/test_primitives.cpp:214 TEST_CHECK(!filter.find(k3));
+ TEST_CHECK(filter.find(k4));
+
+ // test timestamp_history
+ {
+ timestamp_history h;
+ TEST_EQUAL(h.add_sample(0x32, false), 0);
+ TEST_EQUAL(h.base(), 0x32);
+ TEST_EQUAL(h.add_sample(0x33, false), 0x1);
+ TEST_EQUAL(h.base(), 0x32);
+ TEST_EQUAL(h.add_sample(0x3433, false), 0x3401);
+ TEST_EQUAL(h.base(), 0x32);
+ TEST_EQUAL(h.add_sample(0x30, false), 0);
+ TEST_EQUAL(h.base(), 0x30);
+
+ // test that wrapping of the timestamp is properly handled
+ h.add_sample(0xfffffff3, false);
+ TEST_EQUAL(h.base(), 0xfffffff3);
+
+
+ }
+
+ // test error codes
+ TEST_CHECK(error_code(errors::http_error).message() == "HTTP error");
+ TEST_CHECK(error_code(errors::missing_file_sizes).message() == "missing or invalid 'file sizes' entry");
+ TEST_CHECK(error_code(errors::unsupported_protocol_version).message() == "unsupported protocol version");
+ TEST_CHECK(error_code(errors::no_i2p_router).message() == "no i2p router is set up");
+ TEST_CHECK(error_code(errors::http_parse_error).message() == "Invalid HTTP header");
+ TEST_CHECK(error_code(errors::error_code_max).message() == "Unknown error");
+
+ TEST_CHECK(error_code(errors::unauthorized, get_http_category()).message() == "401 Unauthorized");
+ TEST_CHECK(error_code(errors::service_unavailable, get_http_category()).message() == "503 Service Unavailable");
+
+ // test snprintf
+
+ char msg[10];
+ snprintf(msg, sizeof(msg), "too %s format string", "long");
+ TEST_CHECK(strcmp(msg, "too long ") == 0);
+
+ std::string path;
+ sanitize_append_path_element(path, "a...", 4);
+ TEST_EQUAL(path, "a");
+
+ path.clear();
+ sanitize_append_path_element(path, "a ", 4);
+ TEST_EQUAL(path, "a");
+
+ path.clear();
+ sanitize_append_path_element(path, "a...b", 5);
+ TEST_EQUAL(path, "a...b");
+
+ | ||
| relevance 0 | ../test/test_rss.cpp:136 | verify some key state is saved in 'state' |
verify some key state is saved in 'state'../test/test_rss.cpp:136 feed_status st;
+ f->get_feed_status(&st);
+ TEST_CHECK(!st.error);
+
+ print_feed(st);
+
+ TEST_CHECK(st.items.size() == expect.num_items);
+ if (st.items.size() > 0)
+ {
+ TEST_CHECK(st.items[0].url == expect.first_url);
+ TEST_CHECK(st.items[0].size == expect.first_size);
+ TEST_CHECK(st.items[0].title == expect.first_title);
+ }
+
+ entry state;
+ f->save_state(state);
+
+ fprintf(stderr, "feed_state:\n");
+ std::cerr << state.to_string() << "\n";
+
+}
+
+int test_main()
+{
+ std::string root_dir = parent_path(current_working_directory());
+
+ test_feed(combine_path(root_dir, "eztv.xml"), rss_expect(30, "http://torrent.zoink.it/The.Daily.Show.2012.02.16.(HDTV-LMAO)[VTV].torrent", "The Daily Show 2012-02-16 [HDTV - LMAO]", 183442338));
+ test_feed(combine_path(root_dir, "cb.xml"), rss_expect(50, "http://www.clearbits.net/get/1911-norbergfestival-2011.torrent", "Norbergfestival 2011", 1160773632));
+ test_feed(combine_path(root_dir, "kat.xml"), rss_expect(25, "http://kat.ph/torrents/benito-di-paula-1975-benito-di-paula-lp-rip-ogg-at-500-jarax4u-t6194897/", "Benito Di Paula - 1975 - Benito Di Paula (LP Rip OGG at 500) [jarax4u]", 168773863));
+ test_feed(combine_path(root_dir, "mn.xml"), rss_expect(20, "http://www.mininova.org/get/13203100", "Dexcell - January TwentyTwelve Mix", 137311179));
+ test_feed(combine_path(root_dir, "pb.xml"), rss_expect(60, "magnet:?xt=urn:btih:FD4CDDB7BBE722D17A018EFD875EB0695ED7159C&dn=Thompson+Twins+-+1989+-+Big+Trash+%5BMP3%5D", "Thompson Twins - 1989 - Big Trash [MP3]", 100160904));
+ test_feed(combine_path(root_dir, "fg.xml"), rss_expect(15, "http://torrage.com/torrent/470BCD2007011E9F31556B36E199D03D948A1A52.torrent", "Top.Gear.S20E04.1080i.ts", -1));
+ return 0;
+}
+
+ | ||
| relevance 0 | ../test/test_ssl.cpp:344 | test using a signed certificate with the wrong info-hash in DN |
test using a signed certificate with the wrong info-hash in DN../test/test_ssl.cpp:344 // in verifying peers
+ ctx.set_verify_mode(context::verify_none, ec);
+ if (ec)
+ {
+ fprintf(stderr, "Failed to set SSL verify mode: %s\n"
+ , ec.message().c_str());
+ TEST_CHECK(!ec);
+ return false;
+ }
+
+ std::string certificate = combine_path("..", combine_path("ssl", "peer_certificate.pem"));
+ std::string private_key = combine_path("..", combine_path("ssl", "peer_private_key.pem"));
+ std::string dh_params = combine_path("..", combine_path("ssl", "dhparams.pem"));
+
+ if (flags & invalid_certificate)
+ {
+ certificate = combine_path("..", combine_path("ssl", "invalid_peer_certificate.pem"));
+ private_key = combine_path("..", combine_path("ssl", "invalid_peer_private_key.pem"));
+ }
+
+
+ if (flags & (valid_certificate | invalid_certificate))
+ {
+ fprintf(stderr, "set_password_callback\n");
+ ctx.set_password_callback(boost::bind(&password_callback, _1, _2, "test"), ec);
+ if (ec)
+ {
+ fprintf(stderr, "Failed to set certificate password callback: %s\n"
+ , ec.message().c_str());
+ TEST_CHECK(!ec);
+ return false;
+ }
+ fprintf(stderr, "use_certificate_file \"%s\"\n", certificate.c_str());
+ ctx.use_certificate_file(certificate, context::pem, ec);
+ if (ec)
+ {
+ fprintf(stderr, "Failed to set certificate file: %s\n"
+ , ec.message().c_str());
+ TEST_CHECK(!ec);
+ return false;
+ }
+ fprintf(stderr, "use_private_key_file \"%s\"\n", private_key.c_str());
+ ctx.use_private_key_file(private_key, context::pem, ec);
+ if (ec)
+ {
+ fprintf(stderr, "Failed to set private key: %s\n"
+ , ec.message().c_str());
+ TEST_CHECK(!ec);
+ return false;
+ }
+ fprintf(stderr, "use_tmp_dh_file \"%s\"\n", dh_params.c_str());
+ | ||
| relevance 0 | ../test/test_ssl.cpp:442 | also test using a hash that refers to a valid torrent but that differs from the SNI hash |
also test using a hash that refers to a valid torrent
+but that differs from the SNI hash../test/test_ssl.cpp:442 print_alerts(ses1, "ses1", true, true, true, &on_alert);
+ if (ec)
+ {
+ fprintf(stderr, "Failed SSL handshake: %s\n"
+ , ec.message().c_str());
+ return false;
+ }
+
+ char handshake[] = "\x13" "BitTorrent protocol\0\0\0\0\0\0\0\x04"
+ " " // space for info-hash
+ "aaaaaaaaaaaaaaaaaaaa" // peer-id
+ "\0\0\0\x01\x02"; // interested
+
+ // fill in the info-hash
+ if (flags & valid_bittorrent_hash)
+ {
+ std::memcpy(handshake + 28, &t->info_hash()[0], 20);
+ }
+ else
+ {
+ std::generate(handshake + 28, handshake + 48, &rand);
+ }
+
+ // fill in the peer-id
+ std::generate(handshake + 48, handshake + 68, &rand);
+
+ fprintf(stderr, "bittorrent handshake\n");
+ boost::asio::write(ssl_sock, libtorrent::asio::buffer(handshake, (sizeof(handshake) - 1)), ec);
+ if (ec)
+ {
+ fprintf(stderr, "failed to write bittorrent handshake: %s\n"
+ , ec.message().c_str());
+ return false;
+ }
+
+ char buf[68];
+ fprintf(stderr, "read bittorrent handshake\n");
+ boost::asio::read(ssl_sock, libtorrent::asio::buffer(buf, sizeof(buf)), ec);
+ if (ec)
+ {
+ fprintf(stderr, "failed to read bittorrent handshake: %s\n"
+ , ec.message().c_str());
+ return false;
+ }
+
+ if (memcmp(buf, "\x13" "BitTorrent protocol", 20) != 0)
+ {
+ fprintf(stderr, "invalid bittorrent handshake\n");
+ return false;
+ }
+
+ | ||
| relevance 0 | ../test/test_torrent.cpp:132 | wait for an alert rather than just waiting 10 seconds. This is kind of silly |
wait for an alert rather than just waiting 10 seconds. This is kind of silly../test/test_torrent.cpp:132 TEST_EQUAL(h.file_priorities().size(), info->num_files());
+ TEST_EQUAL(h.file_priorities()[0], 0);
+ if (info->num_files() > 1)
+ TEST_EQUAL(h.file_priorities()[1], 0);
+ if (info->num_files() > 2)
+ TEST_EQUAL(h.file_priorities()[2], 1);
+ }
+ }
+
+ if (info->num_pieces() > 0)
+ {
+ h.piece_priority(0, 1);
+ st = h.status();
+ TEST_CHECK(st.pieces.size() > 0 && st.pieces[0] == false);
+ std::vector<char> piece(info->piece_length());
+ for (int i = 0; i < int(piece.size()); ++i)
+ piece[i] = (i % 26) + 'A';
+ h.add_piece(0, &piece[0]);
+
+ // wait until the piece is done writing and hashing
+ test_sleep(2000);
+ st = h.status();
+ TEST_CHECK(st.pieces.size() > 0 && st.pieces[0] == true);
+
+ std::cout << "reading piece 0" << std::endl;
+ h.read_piece(0);
+ alert const* a = ses.wait_for_alert(seconds(10));
+ bool passed = false;
+ while (a)
+ {
+ std::auto_ptr<alert> al = ses.pop_alert();
+ assert(al.get());
+ std::cout << " " << al->message() << std::endl;
+ if (read_piece_alert* rpa = alert_cast<read_piece_alert>(al.get()))
+ {
+ std::cout << "SUCCEEDED!" << std::endl;
+ passed = true;
+ TEST_CHECK(memcmp(&piece[0], rpa->buffer.get(), piece.size()) == 0);
+ TEST_CHECK(rpa->size == info->piece_size(0));
+ TEST_CHECK(rpa->piece == 0);
+ TEST_CHECK(hasher(&piece[0], piece.size()).final() == info->hash_for_piece(0));
+ break;
+ }
+ a = ses.wait_for_alert(seconds(10));
+ TEST_CHECK(a);
+ }
+ TEST_CHECK(passed);
+ }
+}
+
+int test_main()
+ | ||
| relevance 0 | ../test/test_torrent_parse.cpp:114 | test remap_files |
test remap_files../test/test_torrent_parse.cpp:114 | ||
| relevance 0 | ../test/test_torrent_parse.cpp:115 | merkle torrents. specifically torrent_info::add_merkle_nodes and torrent with "root hash" |
merkle torrents. specifically torrent_info::add_merkle_nodes and torrent with "root hash"../test/test_torrent_parse.cpp:115 | ||
| relevance 0 | ../test/test_torrent_parse.cpp:116 | torrent with 'p' (padfile) attribute |
torrent with 'p' (padfile) attribute../test/test_torrent_parse.cpp:116 | ||
| relevance 0 | ../test/test_torrent_parse.cpp:117 | torrent with 'h' (hidden) attribute |
torrent with 'h' (hidden) attribute../test/test_torrent_parse.cpp:117 | ||
| relevance 0 | ../test/test_torrent_parse.cpp:118 | torrent with 'x' (executable) attribute |
torrent with 'x' (executable) attribute../test/test_torrent_parse.cpp:118 | ||
| relevance 0 | ../test/test_torrent_parse.cpp:119 | torrent with 'l' (symlink) attribute |
torrent with 'l' (symlink) attribute../test/test_torrent_parse.cpp:119 | ||
| relevance 0 | ../test/test_torrent_parse.cpp:120 | creating a merkle torrent (torrent_info::build_merkle_list) |
creating a merkle torrent (torrent_info::build_merkle_list)../test/test_torrent_parse.cpp:120 | ||
| relevance 0 | ../test/test_torrent_parse.cpp:121 | torrent with multiple trackers in multiple tiers, making sure we shuffle them (how do you test shuffling?, load it multiple times and make sure it's in different order at least once) |
torrent with multiple trackers in multiple tiers, making sure we shuffle them (how do you test shuffling?, load it multiple times and make sure it's in different order at least once)../test/test_torrent_parse.cpp:121 { "invalid_info.torrent", errors::torrent_missing_info },
+ { "string.torrent", errors::torrent_is_no_dict },
+ { "negative_size.torrent", errors::torrent_invalid_length },
+ { "negative_file_size.torrent", errors::torrent_file_parse_failed },
+ { "invalid_path_list.torrent", errors::torrent_file_parse_failed },
+ { "missing_path_list.torrent", errors::torrent_file_parse_failed },
+ { "invalid_pieces.torrent", errors::torrent_missing_pieces },
+ { "unaligned_pieces.torrent", errors::torrent_invalid_hashes },
+ { "invalid_root_hash.torrent", errors::torrent_invalid_hashes },
+ { "invalid_root_hash2.torrent", errors::torrent_missing_pieces},
+ { "invalid_file_size.torrent", errors::torrent_file_parse_failed },
+};
+
+namespace libtorrent
+{
+ // defined in torrent_info.cpp
+ TORRENT_EXPORT bool verify_encoding(std::string& target, bool path = true);
+ TORRENT_EXTRA_EXPORT void sanitize_append_path_element(std::string& p, char const* element, int len);
+}
+
+
+ int test_main()
+{
+ error_code ec;
+
+ // test merkle_*() functions
+
+ // this is the structure:
+ // 0
+ // 1 2
+ // 3 4 5 6
+ // 7 8 9 10 11 12 13 14
+ // num_leafs = 8
+
+ TEST_EQUAL(merkle_num_leafs(1), 1);
+ TEST_EQUAL(merkle_num_leafs(2), 2);
+ TEST_EQUAL(merkle_num_leafs(3), 4);
+ TEST_EQUAL(merkle_num_leafs(4), 4);
+ TEST_EQUAL(merkle_num_leafs(5), 8);
+ TEST_EQUAL(merkle_num_leafs(6), 8);
+ TEST_EQUAL(merkle_num_leafs(7), 8);
+ TEST_EQUAL(merkle_num_leafs(8), 8);
+ TEST_EQUAL(merkle_num_leafs(9), 16);
+ TEST_EQUAL(merkle_num_leafs(10), 16);
+ TEST_EQUAL(merkle_num_leafs(11), 16);
+ TEST_EQUAL(merkle_num_leafs(12), 16);
+ TEST_EQUAL(merkle_num_leafs(13), 16);
+ TEST_EQUAL(merkle_num_leafs(14), 16);
+ TEST_EQUAL(merkle_num_leafs(15), 16);
+ TEST_EQUAL(merkle_num_leafs(16), 16);
+ TEST_EQUAL(merkle_num_leafs(17), 32);
+ | ||
| relevance 0 | ../test/test_tracker.cpp:198 | test parse peers6 |
test parse peers6../test/test_tracker.cpp:198 | ||
| relevance 0 | ../test/test_tracker.cpp:199 | test parse tracker-id |
test parse tracker-id../test/test_tracker.cpp:199 | ||
| relevance 0 | ../test/test_tracker.cpp:200 | test parse failure-reason |
test parse failure-reason../test/test_tracker.cpp:200 | ||
| relevance 0 | ../test/test_tracker.cpp:201 | test all failure paths invalid bencoding not a dictionary no files entry in scrape response no info-hash entry in scrape response malformed peers in peer list of dictionaries uneven number of bytes in peers and peers6 string responses |
test all failure paths
+invalid bencoding
+not a dictionary
+no files entry in scrape response
+no info-hash entry in scrape response
+malformed peers in peer list of dictionaries
+uneven number of bytes in peers and peers6 string responses../test/test_tracker.cpp:201 TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.peers.size(), 0);
+ TEST_EQUAL(resp.external_ip, address_v6::from_string("f102:0304::ffff"));
+}
+#endif
+
+int test_main()
+{
+ test_parse_hostname_peers();
+ test_parse_peers4();
+ test_parse_interval();
+ test_parse_warning();
+ test_parse_failure_reason();
+ test_parse_scrape_response();
+ test_parse_scrape_response_with_zero();
+ test_parse_external_ip();
+#if TORRENT_USE_IPV6
+ test_parse_external_ip6();
+#endif
+
+
+ int http_port = start_web_server();
+ int udp_port = start_udp_tracker();
+
+ int prev_udp_announces = num_udp_announces();
+
+ int const alert_mask = alert::all_categories
+ & ~alert::progress_notification
+ & ~alert::stats_notification;
+
+ lt::session* s = new lt::session(fingerprint("LT", 0, 1, 0, 0), std::make_pair(48875, 49800), "0.0.0.0", 0, alert_mask);
+
+ settings_pack pack;
+ pack.set_int(settings_pack::half_open_limit, 1);
+ pack.set_bool(settings_pack::announce_to_all_trackers, true);
+ pack.set_bool(settings_pack::announce_to_all_tiers, true);
+ s->apply_settings(pack);
+
+ error_code ec;
+ remove_all("tmp1_tracker", ec);
+ create_directory("tmp1_tracker", ec);
+ std::ofstream file(combine_path("tmp1_tracker", "temporary").c_str());
+ boost::shared_ptr<torrent_info> t = ::create_torrent(&file, 16 * 1024, 13, false);
+ file.close();
+
+ char tracker_url[200];
+ snprintf(tracker_url, sizeof(tracker_url), "http://127.0.0.1:%d/announce", http_port);
+ t->add_tracker(tracker_url, 0);
+
+ snprintf(tracker_url, sizeof(tracker_url), "udp://127.0.0.1:%d/announce", udp_port);
+ t->add_tracker(tracker_url, 1);
+ | ||
| relevance 0 | ../test/test_upnp.cpp:101 | store the log and verify that some key messages are there |
store the log and verify that some key messages are there../test/test_upnp.cpp:101 "USN:uuid:000f-66d6-7296000099dc::upnp:rootdevice\r\n"
+ "Location: http://127.0.0.1:%d/upnp.xml\r\n"
+ "Server: Custom/1.0 UPnP/1.0 Proc/Ver\r\n"
+ "EXT:\r\n"
+ "Cache-Control:max-age=180\r\n"
+ "DATE: Fri, 02 Jan 1970 08:10:38 GMT\r\n\r\n";
+
+ TORRENT_ASSERT(g_port != 0);
+ char buf[sizeof(msg) + 30];
+ int len = snprintf(buf, sizeof(buf), msg, g_port);
+
+ error_code ec;
+ sock->send(buf, len, ec);
+
+ if (ec) std::cerr << "*** error sending " << ec.message() << std::endl;
+}
+
+void log_callback(char const* err)
+{
+ std::cerr << "UPnP: " << err << std::endl;
+}
+
+struct callback_info
+{
+ int mapping;
+ int port;
+ error_code ec;
+ bool operator==(callback_info const& e)
+ { return mapping == e.mapping && port == e.port && !ec == !e.ec; }
+};
+
+std::list<callback_info> callbacks;
+
+void callback(int mapping, address const& ip, int port, error_code const& err)
+{
+ callback_info info = {mapping, port, err};
+ callbacks.push_back(info);
+ std::cerr << "mapping: " << mapping << ", port: " << port << ", IP: " << ip
+ << ", error: \"" << err.message() << "\"\n";
+}
+
+int run_upnp_test(char const* root_filename, char const* router_model, char const* control_name)
+{
+ libtorrent::io_service ios;
+
+ g_port = start_web_server();
+
+ std::vector<char> buf;
+ error_code ec;
+ load_file(root_filename, buf, ec);
+ buf.push_back(0);
+ | ||
| relevance 0 | ../test/web_seed_suite.cpp:373 | file hashes don't work with the new torrent creator reading async |
file hashes don't work with the new torrent creator reading async../test/web_seed_suite.cpp:373 // corrupt the files now, so that the web seed will be banned
+ if (test_url_seed)
+ {
+ create_random_files(combine_path(save_path, "torrent_dir"), file_sizes, sizeof(file_sizes)/sizeof(file_sizes[0]));
+ }
+ else
+ {
+ piece_size = 64 * 1024;
+ char* random_data = (char*)malloc(64 * 1024 * num_pieces);
+ std::generate(random_data, random_data + 64 * 1024 * num_pieces, random_byte);
+ save_file(combine_path(save_path, "seed").c_str(), random_data, 64 * 1024 * num_pieces);
+ free(random_data);
+ }
+ }
+
+ std::vector<char> buf;
+ bencode(std::back_inserter(buf), t.generate());
+ boost::shared_ptr<torrent_info> torrent_file(boost::make_shared<torrent_info>(&buf[0], buf.size(), boost::ref(ec), 0));
+
+
+/*
+ // no point in testing the hashes since we know the data is corrupt
+ if (!test_ban)
+ {
+ // verify that the file hashes are correct
+ for (int i = 0; i < torrent_file->num_files(); ++i)
+ {
+ sha1_hash h1 = torrent_file->file_at(i).filehash;
+ sha1_hash h2 = file_hash(combine_path(save_path
+ , torrent_file->file_at(i).path));
+// fprintf(stderr, "%s: %s == %s\n"
+// , torrent_file->file_at(i).path.c_str()
+// , to_hex(h1.to_string()).c_str(), to_hex(h2.to_string()).c_str());
+ TEST_EQUAL(h1, h2);
+ }
+ }
+*/
+ {
+ libtorrent::session ses(fingerprint(" ", 0,0,0,0), 0);
+
+ settings_pack pack;
+ pack.set_int(settings_pack::max_queued_disk_bytes, 256 * 1024);
+ pack.set_str(settings_pack::listen_interfaces, "0.0.0.0:51000");
+ pack.set_int(settings_pack::max_retry_port_bind, 1000);
+ pack.set_int(settings_pack::alert_mask, ~(alert::progress_notification | alert::stats_notification));
+ ses.apply_settings(pack);
+
+ test_transfer(ses, torrent_file, proxy, port, protocol, test_url_seed
+ , chunked_encoding, test_ban, keepalive);
+
+ if (test_url_seed && test_rename)
+ | ||
| relevance 0 | ../src/block_cache.cpp:884 | it's somewhat expensive to iterate over this linked list. Presumably because of the random access of memory. It would be nice if pieces with no evictable blocks weren't in this list |
it's somewhat expensive
to iterate over this linked list. Presumably because of the random
access of memory. It would be nice if pieces with no evictable blocks
weren't in this list../src/block_cache.cpp:884 }
@@ -2368,7 +3175,7 @@ weren't in this list../src/block_cache.cpp:884| relevance 0 | ../src/block_cache.cpp:948 | this should probably only be done every n:th time |
|
this should probably only be done every n:th time../src/block_cache.cpp:948 }
+ | ||
| relevance 0 | ../src/block_cache.cpp:948 | this should probably only be done every n:th time |
this should probably only be done every n:th time../src/block_cache.cpp:948 }
if (pe->ok_to_evict())
{
@@ -2419,7 +3226,8 @@ weren't in this list../src/block_cache.cpp:884| relevance 0 | ../src/block_cache.cpp:1714 | create a holder for refcounts that automatically decrement |
|
create a holder for refcounts that automatically decrement../src/block_cache.cpp:1714
+ | ||
| relevance 0 | ../src/block_cache.cpp:1720 | create a holder for refcounts that automatically decrement |
create a holder for refcounts that automatically decrement../src/block_cache.cpp:1720 }
+
j->buffer = allocate_buffer("send buffer");
if (j->buffer == 0) return -2;
@@ -2431,7 +3239,6 @@ weren't in this list../src/block_cache.cpp:884| relevance 0 | ../src/bt_peer_connection.cpp:646 | this could be optimized using knuth morris pratt |
|
this could be optimized using knuth morris pratt../src/bt_peer_connection.cpp:646 {
+ | ||
| relevance 0 | ../src/bt_peer_connection.cpp:646 | this could be optimized using knuth morris pratt |
this could be optimized using knuth morris pratt../src/bt_peer_connection.cpp:646 {
disconnect(errors::no_memory, op_encryption);
return;
}
@@ -2521,7 +3328,7 @@ bool block_cache::maybe_free_piece(cached_piece_entry* pe)
// }
// no complete sync
- | ||
| relevance 0 | ../src/bt_peer_connection.cpp:2213 | if we're finished, send upload_only message |
if we're finished, send upload_only message../src/bt_peer_connection.cpp:2213 if (msg[5 + k / 8] & (0x80 >> (k % 8))) bitfield_string[k] = '1';
+ | ||
| relevance 0 | ../src/bt_peer_connection.cpp:2210 | if we're finished, send upload_only message |
if we're finished, send upload_only message../src/bt_peer_connection.cpp:2210 if (msg[5 + k / 8] & (0x80 >> (k % 8))) bitfield_string[k] = '1';
else bitfield_string[k] = '0';
}
peer_log("==> BITFIELD [ %s ]", bitfield_string.c_str());
@@ -2572,7 +3379,7 @@ bool block_cache::maybe_free_piece(cached_piece_entry* pe)
? m_settings.get_str(settings_pack::user_agent)
: m_settings.get_str(settings_pack::handshake_client_version);
}
- | ||
| relevance 0 | ../src/disk_io_thread.cpp:921 | instead of doing a lookup each time through the loop, save cached_piece_entry pointers with piece_refcount incremented to pin them |
instead of doing a lookup each time through the loop, save
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:921 | instead of doing a lookup each time through the loop, save cached_piece_entry pointers with piece_refcount incremented to pin them |
instead of doing a lookup each time through the loop, save
cached_piece_entry pointers with piece_refcount incremented to pin them../src/disk_io_thread.cpp:921 // this is why we pass in 1 as cont_block to the flushing functions
void disk_io_thread::try_flush_write_blocks(int num, tailqueue& completed_jobs
, mutex::scoped_lock& l)
@@ -2624,7 +3431,7 @@ cached_piece_entry pointers with piece_refcount incremented to pin them
cached_piece_entry* pe = m_disk_cache.find_piece(i->first, i->second);
if (pe == NULL) continue;
if (pe->num_dirty == 0) continue;
- | ||
| relevance 0 | ../src/disk_io_thread.cpp:1132 | instead of doing this. pass in the settings to each storage_interface call. Each disk thread could hold its most recent understanding of the settings in a shared_ptr, and update it every time it wakes up from a job. That way each access to the settings won't require a mutex to be held. |
instead of doing this. pass in the settings to each storage_interface
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:1132 | instead of doing this. pass in the settings to each storage_interface call. Each disk thread could hold its most recent understanding of the settings in a shared_ptr, and update it every time it wakes up from a job. That way each access to the settings won't require a mutex to be held. |
instead of doing this. pass in the settings to each storage_interface
call. Each disk thread could hold its most recent understanding of the settings
in a shared_ptr, and update it every time it wakes up from a job. That way
each access to the settings won't require a mutex to be held.../src/disk_io_thread.cpp:1132 {
@@ -2668,7 +3475,7 @@ each access to the settings won't require a mutex to be held.../src/dis
// our quanta in case there aren't any other
// jobs to run in between
- | ||
| relevance 0 | ../src/disk_io_thread.cpp:1157 | a potentially more efficient solution would be to have a special queue for retry jobs, that's only ever run when a job completes, in any thread. It would only work if m_outstanding_jobs > 0 |
a potentially more efficient solution would be to have a special
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:1157 | a potentially more efficient solution would be to have a special queue for retry jobs, that's only ever run when a job completes, in any thread. It would only work if m_outstanding_jobs > 0 |
a potentially more efficient solution would be to have a special
queue for retry jobs, that's only ever run when a job completes, in
any thread. It would only work if m_outstanding_jobs > 0../src/disk_io_thread.cpp:1157 storage->get_storage_impl()->m_settings = &m_settings;
@@ -2701,7 +3508,7 @@ any thread. It would only work if m_outstanding_jobs > 0../src/disk_io_
}
#if TORRENT_USE_ASSERT
- | ||
| relevance 0 | ../src/disk_io_thread.cpp:1171 | it should clear the hash state even when there's an error, right? |
it should clear the hash state even when there's an error, right?../src/disk_io_thread.cpp:1171 --m_outstanding_jobs;
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:1171 | it should clear the hash state even when there's an error, right? |
it should clear the hash state even when there's an error, right?../src/disk_io_thread.cpp:1171 --m_outstanding_jobs;
if (ret == retry_job)
{
@@ -2752,7 +3559,7 @@ any thread. It would only work if m_outstanding_jobs > 0../src/disk_io_
j->error.operation = storage_error::alloc_cache_piece;
return -1;
}
- | ||
| relevance 0 | ../src/disk_io_thread.cpp:1866 | maybe the tailqueue_iterator should contain a pointer-pointer instead and have an unlink function |
maybe the tailqueue_iterator should contain a pointer-pointer
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:1866 | maybe the tailqueue_iterator should contain a pointer-pointer instead and have an unlink function |
maybe the tailqueue_iterator should contain a pointer-pointer
instead and have an unlink function../src/disk_io_thread.cpp:1866 j->callback = handler;
add_fence_job(storage, j);
@@ -2804,7 +3611,7 @@ instead and have an unlink function../src/disk_io_thread.cpp:1866<
if (completed_jobs.size())
add_completed_jobs(completed_jobs);
}
- | ||
| relevance 0 | ../src/disk_io_thread.cpp:2121 | this is potentially very expensive. One way to solve it would be to have a fence for just this one piece. |
this is potentially very expensive. One way to solve
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:2121 | this is potentially very expensive. One way to solve it would be to have a fence for just this one piece. |
this is potentially very expensive. One way to solve
it would be to have a fence for just this one piece.../src/disk_io_thread.cpp:2121 }
void disk_io_thread::async_clear_piece(piece_manager* storage, int index
@@ -2856,7 +3663,7 @@ it would be to have a fence for just this one piece.../src/disk_io_thre
if (!pe->hash) return;
if (pe->hashing) return;
- | ||
| relevance 0 | ../src/disk_io_thread.cpp:2382 | we should probably just hang the job on the piece and make sure the hasher gets kicked |
we should probably just hang the job on the piece and make sure the hasher gets kicked../src/disk_io_thread.cpp:2382 if (pe == NULL)
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:2382 | we should probably just hang the job on the piece and make sure the hasher gets kicked |
we should probably just hang the job on the piece and make sure the hasher gets kicked../src/disk_io_thread.cpp:2382 if (pe == NULL)
{
int cache_state = (j->flags & disk_io_job::volatile_read)
? cached_piece_entry::volatile_read_lru
@@ -2907,7 +3714,7 @@ it would be to have a fence for just this one piece.../src/disk_io_thre
// increment the refcounts of all
// blocks up front, and then hash them without holding the lock
- | ||
| relevance 0 | ../src/disk_io_thread.cpp:2452 | introduce a holder class that automatically increments and decrements the piece_refcount |
introduce a holder class that automatically increments
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:2452 | introduce a holder class that automatically increments and decrements the piece_refcount |
introduce a holder class that automatically increments
and decrements the piece_refcount../src/disk_io_thread.cpp:2452 for (int i = ph->offset / block_size; i < blocks_in_piece; ++i)
{
iov.iov_len = (std::min)(block_size, piece_size - ph->offset);
@@ -2959,7 +3766,7 @@ and decrements the piece_refcount../src/disk_io_thread.cpp:2452 | ||
| relevance 0 | ../src/disk_io_thread.cpp:2692 | it would be nice to not have to lock the mutex every turn through this loop |
it would be nice to not have to lock the mutex every
+ | ||
| relevance 0 | ../src/disk_io_thread.cpp:2692 | it would be nice to not have to lock the mutex every turn through this loop |
it would be nice to not have to lock the mutex every
turn through this loop../src/disk_io_thread.cpp:2692 {
j->error.ec = error::no_memory;
j->error.operation = storage_error::alloc_cache_piece;
@@ -3011,7 +3818,7 @@ turn through this loop../src/disk_io_thread.cpp:2692| relevance 0 | ../src/http_tracker_connection.cpp:96 | support authentication (i.e. user name and password) in the URL |
|
support authentication (i.e. user name and password) in the URL../src/http_tracker_connection.cpp:96 , tracker_request const& req
+ | ||
| relevance 0 | ../src/http_tracker_connection.cpp:96 | support authentication (i.e. user name and password) in the URL |
support authentication (i.e. user name and password) in the URL../src/http_tracker_connection.cpp:96 , tracker_request const& req
, boost::weak_ptr<request_callback> c
, aux::session_impl& ses
, std::string const& auth
@@ -3062,7 +3869,7 @@ turn through this loop../src/disk_io_thread.cpp:2692 | ||
| relevance 0 | ../src/metadata_transfer.cpp:359 | this is not safe. The torrent could be unloaded while we're still sending the metadata |
this is not safe. The torrent could be unloaded while
+ | ||
| relevance 0 | ../src/metadata_transfer.cpp:359 | this is not safe. The torrent could be unloaded while we're still sending the metadata |
this is not safe. The torrent could be unloaded while
we're still sending the metadata../src/metadata_transfer.cpp:359 std::pair<int, int> offset
= req_to_offset(req, (int)m_tp.metadata().left());
@@ -3114,7 +3921,7 @@ we're still sending the metadata../src/metadata_transfer.cpp:359 | ||
| relevance 0 | ../src/packet_buffer.cpp:176 | use compare_less_wrap for this comparison as well |
use compare_less_wrap for this comparison as well../src/packet_buffer.cpp:176 while (new_size < size)
+ | ||
| relevance 0 | ../src/packet_buffer.cpp:176 | use compare_less_wrap for this comparison as well |
use compare_less_wrap for this comparison as well../src/packet_buffer.cpp:176 while (new_size < size)
new_size <<= 1;
void** new_storage = (void**)malloc(sizeof(void*) * new_size);
@@ -3165,7 +3972,7 @@ we're still sending the metadata../src/metadata_transfer.cpp:359 | ||
| relevance 0 | ../src/part_file.cpp:252 | what do we do if someone is currently reading from the disk from this piece? does it matter? Since we won't actively erase the data from disk, but it may be overwritten soon, it's probably not that big of a deal |
what do we do if someone is currently reading from the disk
+ | ||
| relevance 0 | ../src/part_file.cpp:252 | what do we do if someone is currently reading from the disk from this piece? does it matter? Since we won't actively erase the data from disk, but it may be overwritten soon, it's probably not that big of a deal |
what do we do if someone is currently reading from the disk
from this piece? does it matter? Since we won't actively erase the
data from disk, but it may be overwritten soon, it's probably not that
big of a deal../src/part_file.cpp:252 if (((mode & file::rw_mask) != file::read_only)
@@ -3219,7 +4026,7 @@ big of a deal../src/part_file.cpp:252| relevance 0 | ../src/part_file.cpp:344 | instead of rebuilding the whole file header and flushing it, update the slot entries as we go |
|
instead of rebuilding the whole file header
+ | ||
| relevance 0 | ../src/part_file.cpp:344 | instead of rebuilding the whole file header and flushing it, update the slot entries as we go |
instead of rebuilding the whole file header
and flushing it, update the slot entries as we go../src/part_file.cpp:344 if (block_to_copy == m_piece_size)
{
m_free_slots.push_back(i->second);
@@ -3271,7 +4078,7 @@ and flushing it, update the slot entries as we go../src/part_file.cpp:3
for (int piece = 0; piece < m_max_pieces; ++piece)
{
- | ||
| relevance 0 | ../src/peer_connection.cpp:1115 | this should be the global download rate |
this should be the global download rate../src/peer_connection.cpp:1115
+ | ||
| relevance 0 | ../src/peer_connection.cpp:1140 | this should be the global download rate |
this should be the global download rate../src/peer_connection.cpp:1140
int rate = 0;
// if we haven't received any data recently, the current download rate
@@ -3311,19 +4118,18 @@ and flushing it, update the slot entries as we go../src/part_file.cpp:3
void peer_connection::add_stat(size_type downloaded, size_type uploaded)
{
+ TORRENT_ASSERT(is_single_thread());
m_statistics.add_stat(downloaded, uploaded);
}
void peer_connection::received_bytes(int bytes_payload, int bytes_protocol)
{
+ TORRENT_ASSERT(is_single_thread());
m_statistics.received_bytes(bytes_payload, bytes_protocol);
if (m_ignore_stats) return;
boost::shared_ptr<torrent> t = m_torrent.lock();
if (!t) return;
- t->received_bytes(bytes_payload, bytes_protocol);
- }
- | ||
| relevance 0 | ../src/peer_connection.cpp:3294 | sort the allowed fast set in priority order |
sort the allowed fast set in priority order../src/peer_connection.cpp:3294 m_allowed_fast.push_back(index);
-
+ | ||
| relevance 0 | ../src/peer_connection.cpp:3373 | sort the allowed fast set in priority order |
sort the allowed fast set in priority order../src/peer_connection.cpp:3373
// if the peer has the piece and we want
// to download it, request it
if (int(m_have_piece.size()) > index
@@ -3339,6 +4145,7 @@ and flushing it, update the slot entries as we go../src/part_file.cpp:3
std::vector<int> const& peer_connection::allowed_fast()
{
+ TORRENT_ASSERT(is_single_thread());
boost::shared_ptr<torrent> t = m_torrent.lock();
TORRENT_ASSERT(t);
@@ -3347,6 +4154,7 @@ and flushing it, update the slot entries as we go../src/part_file.cpp:3
bool peer_connection::can_request_time_critical() const
{
+ TORRENT_ASSERT(is_single_thread());
if (has_peer_choked() || !is_interesting()) return false;
if ((int)m_download_queue.size() + (int)m_request_queue.size()
> m_desired_queue_size * 2) return false;
@@ -3364,6 +4172,7 @@ and flushing it, update the slot entries as we go../src/part_file.cpp:3
bool peer_connection::make_time_critical(piece_block const& block)
{
+ TORRENT_ASSERT(is_single_thread());
std::vector<pending_block>::iterator rit = std::find_if(m_request_queue.begin()
, m_request_queue.end(), has_block(block));
if (rit == m_request_queue.end()) return false;
@@ -3371,9 +4180,7 @@ and flushing it, update the slot entries as we go../src/part_file.cpp:3
boost::shared_ptr<torrent> t = m_torrent.lock();
TORRENT_ASSERT(t);
TORRENT_ASSERT(t->has_picker());
- TORRENT_ASSERT(t->picker().is_requested(block));
-#endif
- | ||
| relevance 0 | ../src/piece_picker.cpp:2407 | when expanding pieces for cache stripe reasons, the !downloading condition doesn't make much sense |
when expanding pieces for cache stripe reasons,
+ | ||
| relevance 0 | ../src/piece_picker.cpp:2407 | when expanding pieces for cache stripe reasons, the !downloading condition doesn't make much sense |
when expanding pieces for cache stripe reasons,
the !downloading condition doesn't make much sense../src/piece_picker.cpp:2407 TORRENT_ASSERT(index < (int)m_piece_map.size() || m_piece_map.empty());
if (index+1 == (int)m_piece_map.size())
return m_blocks_in_last_piece;
@@ -3425,8 +4232,8 @@ the !downloading condition doesn't make much sense../src/piece_picker.c
// the second bool is true if this is the only active peer that is requesting
// and downloading blocks from this piece. Active means having a connection.
boost::tuple<bool, bool> requested_from(piece_picker::downloading_piece const& p
- | ||
| relevance 0 | ../src/session_impl.cpp:678 | there's no rule here to make uTP connections not have the global or local rate limits apply to it. This used to be the default. |
there's no rule here to make uTP connections not have the global or
-local rate limits apply to it. This used to be the default.../src/session_impl.cpp:678 m_global_class = m_classes.new_peer_class("global");
+ | ||
| relevance 0 | ../src/session_impl.cpp:673 | there's no rule here to make uTP connections not have the global or local rate limits apply to it. This used to be the default. |
there's no rule here to make uTP connections not have the global or
+local rate limits apply to it. This used to be the default.../src/session_impl.cpp:673 m_global_class = m_classes.new_peer_class("global");
m_tcp_peer_class = m_classes.new_peer_class("tcp");
m_local_peer_class = m_classes.new_peer_class("local");
// local peers are always unchoked
@@ -3477,9 +4284,9 @@ local rate limits apply to it. This used to be the default.../src/sessi
get_thread_cpu_usage(&m_network_thread_cpu_usage);
- | ||
| relevance 0 | ../src/session_impl.cpp:2384 | instead of having a special case for this, just make the default listen interfaces be "0.0.0.0:6881,[::1]:6881" and use the generic path. That would even allow for not listening at all. |
instead of having a special case for this, just make the
+ | ||
| relevance 0 | ../src/session_impl.cpp:2238 | instead of having a special case for this, just make the default listen interfaces be "0.0.0.0:6881,[::1]:6881" and use the generic path. That would even allow for not listening at all. |
instead of having a special case for this, just make the
default listen interfaces be "0.0.0.0:6881,[::1]:6881" and use
-the generic path. That would even allow for not listening at all.../src/session_impl.cpp:2384
+the generic path. That would even allow for not listening at all.../src/session_impl.cpp:2238
// reset the retry counter
m_listen_port_retries = m_settings.get_int(settings_pack::max_retry_port_bind);
@@ -3530,7 +4337,7 @@ retry:
if (s.sock)
{
- | ||
| relevance 0 | ../src/session_impl.cpp:3229 | should this function take a shared_ptr instead? |
should this function take a shared_ptr instead?../src/session_impl.cpp:3229 {
+ | ||
| relevance 0 | ../src/session_impl.cpp:3083 | should this function take a shared_ptr instead? |
should this function take a shared_ptr instead?../src/session_impl.cpp:3083 {
#if defined TORRENT_ASIO_DEBUGGING
complete_async("session_impl::on_socks_accept");
#endif
@@ -3580,8 +4387,8 @@ retry:
TORRENT_ASSERT(p->is_disconnecting());
- if (!p->is_choked() && !p->ignore_unchoke_slots()) --m_num_unchoked;
- | ||
| relevance 0 | ../src/session_impl.cpp:3604 | have a separate list for these connections, instead of having to loop through all of them |
have a separate list for these connections, instead of having to loop through all of them../src/session_impl.cpp:3604 if (m_auto_manage_time_scaler < 0)
+ TORRENT_ASSERT(sp.use_count() > 0);
+ | ||
| relevance 0 | ../src/session_impl.cpp:3439 | have a separate list for these connections, instead of having to loop through all of them |
have a separate list for these connections, instead of having to loop through all of them../src/session_impl.cpp:3439 if (m_auto_manage_time_scaler < 0)
{
INVARIANT_CHECK;
m_auto_manage_time_scaler = settings().get_int(settings_pack::auto_manage_interval);
@@ -3632,7 +4439,7 @@ retry:
#ifndef TORRENT_DISABLE_DHT
if (m_dht)
- | ||
| relevance 0 | ../src/session_impl.cpp:3645 | this should apply to all bandwidth channels |
this should apply to all bandwidth channels../src/session_impl.cpp:3645 t.second_tick(tick_interval_ms, m_tick_residual / 1000);
+ | ||
| relevance 0 | ../src/session_impl.cpp:3480 | this should apply to all bandwidth channels |
this should apply to all bandwidth channels../src/session_impl.cpp:3480 t.second_tick(tick_interval_ms, m_tick_residual / 1000);
// if the call to second_tick caused the torrent
// to no longer want to be ticked (i.e. it was
@@ -3683,7 +4490,7 @@ retry:
&& m_stat.upload_ip_overhead() >= up_limit
&& m_alerts.should_post<performance_alert>())
{
- | ||
| relevance 0 | ../src/session_impl.cpp:4708 | these vectors could be copied from m_torrent_lists, if we would maintain them. That way the first pass over all torrents could be avoided. It would be especially efficient if most torrents are not auto-managed whenever we receive a scrape response (or anything that may change the rank of a torrent) that one torrent could re-sort itself in a list that's kept sorted at all times. That way, this pass over all torrents could be avoided alltogether. |
these vectors could be copied from m_torrent_lists,
+ | ||
| relevance 0 | ../src/session_impl.cpp:4543 | these vectors could be copied from m_torrent_lists, if we would maintain them. That way the first pass over all torrents could be avoided. It would be especially efficient if most torrents are not auto-managed whenever we receive a scrape response (or anything that may change the rank of a torrent) that one torrent could re-sort itself in a list that's kept sorted at all times. That way, this pass over all torrents could be avoided alltogether. |
these vectors could be copied from m_torrent_lists,
if we would maintain them. That way the first pass over
all torrents could be avoided. It would be especially
efficient if most torrents are not auto-managed
@@ -3691,7 +4498,7 @@ whenever we receive a scrape response (or anything
that may change the rank of a torrent) that one torrent
could re-sort itself in a list that's kept sorted at all
times. That way, this pass over all torrents could be
-avoided alltogether.../src/session_impl.cpp:4708#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+avoided alltogether.../src/session_impl.cpp:4543#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
if (t->allows_peers())
t->log_to_all_peers("AUTO MANAGER PAUSING TORRENT");
#endif
@@ -3742,7 +4549,7 @@ avoided alltogether.../src/session_impl.cpp:4708| relevance 0 | ../src/session_impl.cpp:4783 | allow extensions to sort torrents for queuing |
|
allow extensions to sort torrents for queuing../src/session_impl.cpp:4783 if (t->is_finished())
+ | ||
| relevance 0 | ../src/session_impl.cpp:4618 | allow extensions to sort torrents for queuing |
allow extensions to sort torrents for queuing../src/session_impl.cpp:4618 if (t->is_finished())
seeds.push_back(t);
else
downloaders.push_back(t);
@@ -3793,9 +4600,9 @@ avoided alltogether.../src/session_impl.cpp:4708| relevance 0 | ../src/session_impl.cpp:4961 | use a lower limit than m_settings.connections_limit to allocate the to 10% or so of connection slots for incoming connections |
|
use a lower limit than m_settings.connections_limit
+ | ||
| relevance 0 | ../src/session_impl.cpp:4796 | use a lower limit than m_settings.connections_limit to allocate the to 10% or so of connection slots for incoming connections |
use a lower limit than m_settings.connections_limit
to allocate the to 10% or so of connection slots for incoming
-connections../src/session_impl.cpp:4961 // if we don't have any free slots, return
+connections../src/session_impl.cpp:4796 // if we don't have any free slots, return
if (free_slots <= -m_half_open.limit()) return;
// boost connections are connections made by torrent connection
@@ -3846,9 +4653,8 @@ connections../src/session_impl.cpp:4961| relevance 0 | ../src/session_impl.cpp:5123 | post a message to have this happen immediately instead of waiting for the next tick |
|
post a message to have this happen
-immediately instead of waiting for the next tick../src/session_impl.cpp:5123 {
- // we've unchoked this peer, and it hasn't reciprocated
+ | ||
| relevance 0 | ../src/session_impl.cpp:4959 | post a message to have this happen immediately instead of waiting for the next tick |
post a message to have this happen
+immediately instead of waiting for the next tick../src/session_impl.cpp:4959 // we've unchoked this peer, and it hasn't reciprocated
// we may want to increase our estimated reciprocation rate
p->increase_est_reciprocation_rate();
}
@@ -3864,6 +4670,7 @@ immediately instead of waiting for the next tick../src/session_impl.cpp
if (p->is_choked()) continue;
if (pi && pi->optimistically_unchoked)
{
+ m_stats_counters.inc_stats_counter(counters::num_peers_up_unchoked_optimistic, -1);
pi->optimistically_unchoked = false;
// force a new optimistic unchoke
m_optimistic_unchoke_time_scaler = 0;
@@ -3898,7 +4705,7 @@ immediately instead of waiting for the next tick../src/session_impl.cpp
prev = i;
}
#endif
- | ||
| relevance 0 | ../src/session_impl.cpp:5157 | make configurable |
make configurable../src/session_impl.cpp:5157
+ | ||
| relevance 0 | ../src/session_impl.cpp:4993 | make configurable |
make configurable../src/session_impl.cpp:4993
#ifdef TORRENT_DEBUG
for (std::vector<peer_connection*>::const_iterator i = peers.begin()
, end(peers.end()), prev(peers.end()); i != end; ++i)
@@ -3931,7 +4738,7 @@ immediately instead of waiting for the next tick../src/session_impl.cpp
++m_allowed_upload_slots;
- | ||
| relevance 0 | ../src/session_impl.cpp:5171 | make configurable |
make configurable../src/session_impl.cpp:5171 >= (*i)->uploaded_in_last_round() * 1000
+ | ||
| relevance 0 | ../src/session_impl.cpp:5007 | make configurable |
make configurable../src/session_impl.cpp:5007 >= (*i)->uploaded_in_last_round() * 1000
* (1 + t2->priority()) / total_milliseconds(unchoke_interval));
}
prev = i;
@@ -3982,7 +4789,8 @@ immediately instead of waiting for the next tick../src/session_impl.cpp
{
// if our current upload rate is less than 90% of our
// limit
- | ||
| relevance 0 | ../src/session_impl.cpp:5250 | this should be called for all peers! |
this should be called for all peers!../src/session_impl.cpp:5250 // measurement of the peak, use that + 10kB/s, otherwise
+ | ||
| relevance 0 | ../src/session_impl.cpp:5086 | this should be called for all peers! |
this should be called for all peers!../src/session_impl.cpp:5086 // we don't know at what rate we can upload. If we have a
+ // measurement of the peak, use that + 10kB/s, otherwise
// assume 20 kB/s
upload_capacity_left = (std::max)(20000, m_peak_up_rate + 10000);
if (m_alerts.should_post<performance_alert>())
@@ -3991,7 +4799,6 @@ immediately instead of waiting for the next tick../src/session_impl.cpp
}
}
- m_num_unchoked = 0;
// go through all the peers and unchoke the first ones and choke
// all the other ones.
for (std::vector<peer_connection*>::iterator i = peers.begin()
@@ -4031,12 +4838,12 @@ immediately instead of waiting for the next tick../src/session_impl.cpp
}
--unchoke_set_size;
- ++m_num_unchoked;
- | ||
| relevance 0 | ../src/session_impl.cpp:5667 | it might be a nice feature here to limit the number of torrents to send in a single update. By just posting the first n torrents, they would nicely be round-robined because the torrent lists are always pushed back |
it might be a nice feature here to limit the number of torrents
+ TORRENT_ASSERT(p->peer_info_struct());
+ | ||
| relevance 0 | ../src/session_impl.cpp:5501 | it might be a nice feature here to limit the number of torrents to send in a single update. By just posting the first n torrents, they would nicely be round-robined because the torrent lists are always pushed back |
it might be a nice feature here to limit the number of torrents
to send in a single update. By just posting the first n torrents, they
would nicely be round-robined because the torrent lists are always
-pushed back../src/session_impl.cpp:5667 t->status(&*i, flags);
+pushed back../src/session_impl.cpp:5501 t->status(&*i, flags);
}
}
@@ -4086,7 +4893,7 @@ pushed back../src/session_impl.cpp:5667| relevance 0 | ../src/storage.cpp:710 | make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance maybe use the same format as .torrent files and reuse some code from torrent_info |
|
make this more generic to not just work if files have been
+ | ||
| relevance 0 | ../src/storage.cpp:710 | make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance maybe use the same format as .torrent files and reuse some code from torrent_info |
make this more generic to not just work if files have been
renamed, but also if they have been merged into a single file for instance
maybe use the same format as .torrent files and reuse some code from torrent_info../src/storage.cpp:710 for (;;)
{
@@ -4139,7 +4946,7 @@ maybe use the same format as .torrent files and reuse some code from torrent_inf
if (file_sizes_ent->list_size() == 0)
{
ec.ec = errors::no_files_in_resume_data;
- | ||
| relevance 0 | ../src/storage.cpp:1006 | if everything moves OK, except for the partfile we currently won't update the save path, which breaks things. it would probably make more sense to give up on the partfile |
if everything moves OK, except for the partfile
+ | ||
| relevance 0 | ../src/storage.cpp:1006 | if everything moves OK, except for the partfile we currently won't update the save path, which breaks things. it would probably make more sense to give up on the partfile |
if everything moves OK, except for the partfile
we currently won't update the save path, which breaks things.
it would probably make more sense to give up on the partfile../src/storage.cpp:1006 if (ec)
{
@@ -4192,8 +4999,8 @@ it would probably make more sense to give up on the partfile../src/stor
{
fileop op = { &file::writev
, file::read_write | flags };
- | ||
| relevance 0 | ../src/torrent.cpp:491 | if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it. |
if the existing torrent doesn't have metadata, insert
-the metadata we just downloaded into it.../src/torrent.cpp:491
+ | ||
| relevance 0 | ../src/torrent.cpp:492 | if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it. |
if the existing torrent doesn't have metadata, insert
+the metadata we just downloaded into it.../src/torrent.cpp:492
m_torrent_file = tf;
// now, we might already have this torrent in the session.
@@ -4244,8 +5051,8 @@ the metadata we just downloaded into it.../src/torrent.cpp:491 | ||
| relevance 0 | ../src/torrent.cpp:641 | if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it. |
if the existing torrent doesn't have metadata, insert
-the metadata we just downloaded into it.../src/torrent.cpp:641
+ | ||
| relevance 0 | ../src/torrent.cpp:642 | if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it. |
if the existing torrent doesn't have metadata, insert
+the metadata we just downloaded into it.../src/torrent.cpp:642
m_torrent_file = tf;
// now, we might already have this torrent in the session.
@@ -4296,12 +5103,12 @@ the metadata we just downloaded into it.../src/torrent.cpp:641 | ||
| relevance 0 | ../src/torrent.cpp:1446 | is verify_peer_cert called once per certificate in the chain, and this function just tells us which depth we're at right now? If so, the comment makes sense. any certificate that isn't the leaf (i.e. the one presented by the peer) should be accepted automatically, given preverified is true. The leaf certificate need to be verified to make sure its DN matches the info-hash |
is verify_peer_cert called once per certificate in the chain, and
+ | ||
| relevance 0 | ../src/torrent.cpp:1447 | is verify_peer_cert called once per certificate in the chain, and this function just tells us which depth we're at right now? If so, the comment makes sense. any certificate that isn't the leaf (i.e. the one presented by the peer) should be accepted automatically, given preverified is true. The leaf certificate need to be verified to make sure its DN matches the info-hash |
is verify_peer_cert called once per certificate in the chain, and
this function just tells us which depth we're at right now? If so, the comment
makes sense.
any certificate that isn't the leaf (i.e. the one presented by the peer)
should be accepted automatically, given preverified is true. The leaf certificate
-need to be verified to make sure its DN matches the info-hash../src/torrent.cpp:1446 if (pp) p->add_extension(pp);
+need to be verified to make sure its DN matches the info-hash../src/torrent.cpp:1447 if (pp) p->add_extension(pp);
}
// if files are checked for this torrent, call the extension
@@ -4352,8 +5159,8 @@ need to be verified to make sure its DN matches the info-hash../src/tor
{
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
match = true;
- | ||
| relevance 0 | ../src/torrent.cpp:1838 | instead of creating the picker up front here, maybe this whole section should move to need_picker() |
instead of creating the picker up front here,
-maybe this whole section should move to need_picker()../src/torrent.cpp:1838 else
+ | ||
| relevance 0 | ../src/torrent.cpp:1839 | instead of creating the picker up front here, maybe this whole section should move to need_picker() |
instead of creating the picker up front here,
+maybe this whole section should move to need_picker()../src/torrent.cpp:1839 else
{
read_resume_data(m_resume_data->entry);
}
@@ -4404,10 +5211,10 @@ maybe this whole section should move to need_picker()../src/torrent.cpp
// need to consider it finished
std::vector<piece_picker::downloading_piece> dq
- | ||
| relevance 0 | ../src/torrent.cpp:2034 | there may be peer extensions relying on the torrent extension still being alive. Only do this if there are no peers. And when the last peer is disconnected, if the torrent is unloaded, clear the extensions m_extensions.clear(); |
there may be peer extensions relying on the torrent extension
+ | ||
| relevance 0 | ../src/torrent.cpp:2035 | there may be peer extensions relying on the torrent extension still being alive. Only do this if there are no peers. And when the last peer is disconnected, if the torrent is unloaded, clear the extensions m_extensions.clear(); |
there may be peer extensions relying on the torrent extension
still being alive. Only do this if there are no peers. And when the last peer
is disconnected, if the torrent is unloaded, clear the extensions
-m_extensions.clear();../src/torrent.cpp:2034 // pinned torrents are not allowed to be swapped out
+m_extensions.clear();../src/torrent.cpp:2035 // pinned torrents are not allowed to be swapped out
TORRENT_ASSERT(!m_pinned);
m_should_be_loaded = false;
@@ -4458,9 +5265,9 @@ m_extensions.clear();../src/torrent.cpp:2034| relevance 0 | ../src/torrent.cpp:2707 | this pattern is repeated in a few places. Factor this into a function and generalize the concept of a torrent having a dedicated listen port |
|
this pattern is repeated in a few places. Factor this into
+ | ||
| relevance 0 | ../src/torrent.cpp:2708 | this pattern is repeated in a few places. Factor this into a function and generalize the concept of a torrent having a dedicated listen port |
this pattern is repeated in a few places. Factor this into
a function and generalize the concept of a torrent having a
-dedicated listen port../src/torrent.cpp:2707 // if the files haven't been checked yet, we're
+dedicated listen port../src/torrent.cpp:2708 // if the files haven't been checked yet, we're
// not ready for peers. Except, if we don't have metadata,
// we need peers to download from
if (!m_files_checked && valid_metadata()) return;
@@ -4496,7 +5303,7 @@ dedicated listen port../src/torrent.cpp:2707 | ||
| relevance 0 | ../src/torrent.cpp:3238 | instead, borrow host resolvers from a pool in session_impl. That would make the torrent object smaller |
instead, borrow host resolvers from a pool in session_impl. That
-would make the torrent object smaller../src/torrent.cpp:3238 , boost::bind(&torrent::on_i2p_resolve
- , shared_from_this(), _1));
- */
- // it seems like you're not supposed to do a name lookup
- // on the peers returned from the tracker, but just strip
- // the .i2p and use it as a destination
- i->ip.resize(i->ip.size() - 4);
- torrent_state st = get_policy_state();
- need_policy();
- if (m_policy->add_i2p_peer(i->ip.c_str(), peer_info::tracker, 0, &st))
- state_updated();
- peers_erased(st.erased);
- }
- else
-#endif
- {
+ | ||
| relevance 0 | ../src/torrent.cpp:3483 | add one peer per IP the hostname resolves to |
add one peer per IP the hostname resolves to../src/torrent.cpp:3483#endif
+
+ void torrent::on_peer_name_lookup(error_code const& e
+ , std::vector<address> const& host_list, int port)
+ {
+ TORRENT_ASSERT(is_single_thread());
+
+ INVARIANT_CHECK;
+
#if defined TORRENT_ASIO_DEBUGGING
- add_outstanding_async("torrent::on_peer_name_lookup");
+ complete_async("torrent::on_peer_name_lookup");
#endif
- tcp::resolver::query q(i->ip, to_string(i->port).elems);
- m_ses.get_resolver().async_resolve(i->ip, 0
- , boost::bind(&torrent::on_peer_name_lookup
- , shared_from_this(), _1, _2, i->port));
- }
- }
- else
- {
- // ignore local addresses from the tracker (unless the tracker is local too)
- // there are 2 reasons to allow this:
- // 1. retrackers are popular in russia, where an ISP runs a tracker within
- // the AS (but not on the local network) giving out peers only from the
- // local network
- // 2. it might make sense to have a tracker extension in the future where
- // trackers records a peer's internal and external IP, and match up
- // peers on the same local network
-// if (is_local(a.address()) && !is_local(tracker_ip)) continue;
- if (add_peer(a, peer_info::tracker))
- state_updated();
- }
- }
- update_want_peers();
- if (m_ses.alerts().should_post<tracker_reply_alert>())
+#if defined TORRENT_LOGGING
+ if (e)
+ debug_log("peer name lookup error: %s", e.message().c_str());
+#endif
+
+ if (e || host_list.empty() || m_ses.is_aborted()) return;
+
+ tcp::endpoint host(host_list.front(), port);
+
+ if (m_apply_ip_filter
+ && m_ses.get_ip_filter().access(host.address()) & ip_filter::blocked)
{
- m_ses.alerts().post_alert(tracker_reply_alert(
- get_handle(), peer_list.size(), r.url));
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+ error_code ec;
+ debug_log("blocked ip from tracker: %s", host.address().to_string(ec).c_str());
+#endif
+ if (m_ses.alerts().should_post<peer_blocked_alert>())
+ m_ses.alerts().post_alert(peer_blocked_alert(get_handle()
+ , host.address(), peer_blocked_alert::ip_filter));
+ return;
}
- m_got_tracker_response = true;
- // we're listening on an interface type that was not used
- // when talking to the tracker. If there is a matching interface
- | ||
| relevance 0 | ../src/torrent.cpp:4429 | update suggest_piece? |
update suggest_piece?../src/torrent.cpp:4429
+ if (add_peer(host, peer_info::tracker))
+ state_updated();
+ update_want_peers();
+ }
+
+ size_type torrent::bytes_left() const
+ {
+ // if we don't have the metadata yet, we
+ // cannot tell how big the torrent is.
+ if (!valid_metadata()) return -1;
+ return m_torrent_file->total_size()
+ - quantized_bytes_done();
+ }
+
+ size_type torrent::quantized_bytes_done() const
+ {
+ | ||
| relevance 0 | ../src/torrent.cpp:4474 | update suggest_piece? |
update suggest_piece?../src/torrent.cpp:4474
void torrent::peer_has_all(peer_connection const* peer)
{
if (has_picker())
@@ -4614,8 +5420,8 @@ would make the torrent object smaller../src/torrent.cpp:3238 | ||
| relevance 0 | ../src/torrent.cpp:4572 | really, we should just keep the picker around in this case to maintain the availability counters |
really, we should just keep the picker around
-in this case to maintain the availability counters../src/torrent.cpp:4572 pieces.reserve(cs.pieces.size());
+ | ||
| relevance 0 | ../src/torrent.cpp:4617 | really, we should just keep the picker around in this case to maintain the availability counters |
really, we should just keep the picker around
+in this case to maintain the availability counters../src/torrent.cpp:4617 pieces.reserve(cs.pieces.size());
// sort in ascending order, to get most recently used first
std::sort(cs.pieces.begin(), cs.pieces.end()
@@ -4666,12 +5472,12 @@ in this case to maintain the availability counters../src/torrent.cpp:45
}
void torrent::abort()
- | ||
| relevance 0 | ../src/torrent.cpp:6478 | make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance maybe use the same format as .torrent files and reuse some code from torrent_info The mapped_files needs to be read both in the network thread and in the disk thread, since they both have their own mapped files structures which are kept in sync |
make this more generic to not just work if files have been
+ | ||
| relevance 0 | ../src/torrent.cpp:6549 | make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance maybe use the same format as .torrent files and reuse some code from torrent_info The mapped_files needs to be read both in the network thread and in the disk thread, since they both have their own mapped files structures which are kept in sync |
make this more generic to not just work if files have been
renamed, but also if they have been merged into a single file for instance
maybe use the same format as .torrent files and reuse some code from torrent_info
The mapped_files needs to be read both in the network thread
and in the disk thread, since they both have their own mapped files structures
-which are kept in sync../src/torrent.cpp:6478 super_seeding(rd.dict_find_int_value("super_seeding", 0));
+which are kept in sync../src/torrent.cpp:6549 super_seeding(rd.dict_find_int_value("super_seeding", 0));
if (!m_use_resume_save_path)
{
@@ -4722,12 +5528,12 @@ which are kept in sync../src/torrent.cpp:6478| relevance 0 | ../src/torrent.cpp:6641 | if this is a merkle torrent and we can't restore the tree, we need to wipe all the bits in the have array, but not necessarily we might want to do a full check to see if we have all the pieces. This is low priority since almost no one uses merkle torrents |
|
if this is a merkle torrent and we can't
+ | ||
| relevance 0 | ../src/torrent.cpp:6712 | if this is a merkle torrent and we can't restore the tree, we need to wipe all the bits in the have array, but not necessarily we might want to do a full check to see if we have all the pieces. This is low priority since almost no one uses merkle torrents |
if this is a merkle torrent and we can't
restore the tree, we need to wipe all the
bits in the have array, but not necessarily
we might want to do a full check to see if we have
all the pieces. This is low priority since almost
-no one uses merkle torrents../src/torrent.cpp:6641 add_web_seed(url, web_seed_entry::http_seed);
+no one uses merkle torrents../src/torrent.cpp:6712 add_web_seed(url, web_seed_entry::http_seed);
}
}
@@ -4778,9 +5584,9 @@ no one uses merkle torrents../src/torrent.cpp:6641 | ||
| relevance 0 | ../src/torrent.cpp:6831 | make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance. using file_base |
make this more generic to not just work if files have been
+ | ||
| relevance 0 | ../src/torrent.cpp:6902 | make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance. using file_base |
make this more generic to not just work if files have been
renamed, but also if they have been merged into a single file for instance.
-using file_base../src/torrent.cpp:6831 pieces.resize(m_torrent_file->num_pieces());
+using file_base../src/torrent.cpp:6902 pieces.resize(m_torrent_file->num_pieces());
if (!has_picker())
{
std::memset(&pieces[0], m_have_all, pieces.size());
@@ -4831,9 +5637,9 @@ using file_base../src/torrent.cpp:6831| relevance 0 | ../src/torrent.cpp:8800 | add a flag to ignore stats, and only care about resume data for content. For unchanged files, don't trigger a load of the metadata just to save an empty resume data file |
|
add a flag to ignore stats, and only care about resume data for
+ | ||
| relevance 0 | ../src/torrent.cpp:8888 | add a flag to ignore stats, and only care about resume data for content. For unchanged files, don't trigger a load of the metadata just to save an empty resume data file |
add a flag to ignore stats, and only care about resume data for
content. For unchanged files, don't trigger a load of the metadata
-just to save an empty resume data file../src/torrent.cpp:8800 if (m_complete != 0xffffff) seeds = m_complete;
+just to save an empty resume data file../src/torrent.cpp:8888 if (m_complete != 0xffffff) seeds = m_complete;
else seeds = m_policy ? m_policy->num_seeds() : 0;
if (m_incomplete != 0xffffff) downloaders = m_incomplete;
@@ -4855,7 +5661,7 @@ just to save an empty resume data file../src/torrent.cpp:8800 void torrent::save_resume_data(int flags)
{
- TORRENT_ASSERT(m_ses.is_single_thread());
+ TORRENT_ASSERT(is_single_thread());
INVARIANT_CHECK;
if (!valid_metadata())
@@ -4884,10 +5690,10 @@ just to save an empty resume data file../src/torrent.cpp:8800 | ||
| relevance 0 | ../src/torrent.cpp:9768 | go through the pieces we have and count the total number of downloaders we have. Only count peers that are interested in us since some peers might not send have messages for pieces we have it num_interested == 0, we need to pick a new piece |
go through the pieces we have and count the total number
+ | ||
| relevance 0 | ../src/torrent.cpp:9855 | go through the pieces we have and count the total number of downloaders we have. Only count peers that are interested in us since some peers might not send have messages for pieces we have it num_interested == 0, we need to pick a new piece |
go through the pieces we have and count the total number
of downloaders we have. Only count peers that are interested in us
since some peers might not send have messages for pieces we have
-it num_interested == 0, we need to pick a new piece../src/torrent.cpp:9768 }
+it num_interested == 0, we need to pick a new piece../src/torrent.cpp:9855 }
rarest_pieces.clear();
rarest_rarity = pp.peer_count;
@@ -4920,7 +5726,7 @@ it num_interested == 0, we need to pick a new piece../src/torrent.cpp:9
void torrent::refresh_explicit_cache(int cache_size)
{
- TORRENT_ASSERT(m_ses.is_single_thread());
+ TORRENT_ASSERT(is_single_thread());
if (!ready_for_connections()) return;
if (m_abort) return;
@@ -4938,8 +5744,8 @@ it num_interested == 0, we need to pick a new piece../src/torrent.cpp:9
if (num_cache_pieces > m_torrent_file->num_pieces())
num_cache_pieces = m_torrent_file->num_pieces();
- | ||
| relevance 0 | ../src/torrent.cpp:10414 | instead of resorting the whole list, insert the peers directly into the right place |
instead of resorting the whole list, insert the peers
-directly into the right place../src/torrent.cpp:10414 printf("timed out [average-piece-time: %d ms ]\n"
+ | ||
| relevance 0 | ../src/torrent.cpp:10501 | instead of resorting the whole list, insert the peers directly into the right place |
instead of resorting the whole list, insert the peers
+directly into the right place../src/torrent.cpp:10501 printf("timed out [average-piece-time: %d ms ]\n"
, m_average_piece_time);
#endif
}
@@ -4980,7 +5786,7 @@ directly into the right place../src/torrent.cpp:10414 | ||
| relevance 0 | ../src/torrent_peer.cpp:179 | how do we deal with our external address changing? |
how do we deal with our external address changing?../src/torrent_peer.cpp:179 , is_v6_addr(false)
+ | ||
| relevance 0 | ../src/torrent_peer.cpp:176 | how do we deal with our external address changing? |
how do we deal with our external address changing?../src/torrent_peer.cpp:176 , is_v6_addr(false)
#endif
#if TORRENT_USE_I2P
, is_i2p_addr(false)
@@ -5041,7 +5847,7 @@ directly into the right place../src/torrent.cpp:10414| relevance 0 | ../src/udp_socket.cpp:290 | it would be nice to detect this on posix systems also |
|
it would be nice to detect this on posix systems also../src/udp_socket.cpp:290 --m_v6_outstanding;
+ | ||
| relevance 0 | ../src/udp_socket.cpp:290 | it would be nice to detect this on posix systems also |
it would be nice to detect this on posix systems also../src/udp_socket.cpp:290 --m_v6_outstanding;
}
else
#endif
@@ -5092,60 +5898,7 @@ void udp_socket::call_handler(error_code const& ec, udp::endpoint const&
ret = (*i)->incoming_packet(ec, ep, buf, size);
} TORRENT_CATCH (std::exception&) {}
if (*i == NULL) i = m_observers.erase(i);
- | ||
| relevance 0 | ../src/udp_tracker_connection.cpp:554 | it would be more efficient to not use a string here. however, the problem is that some trackers will respond with actual strings. For example i2p trackers |
it would be more efficient to not use a string here.
-however, the problem is that some trackers will respond
-with actual strings. For example i2p trackers../src/udp_tracker_connection.cpp:554 }
-
- boost::shared_ptr<request_callback> cb = requester();
-#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
- if (cb)
- {
- boost::shared_ptr<request_callback> cb = requester();
- cb->debug_log("<== UDP_TRACKER_RESPONSE [ url: %s ]", tracker_req().url.c_str());
- }
-#endif
-
- if (!cb)
- {
- close();
- return true;
- }
-
- std::vector<peer_entry> peer_list;
- for (int i = 0; i < num_peers; ++i)
- {
- peer_entry e;
- char ip_string[100];
- unsigned int a = detail::read_uint8(buf);
- unsigned int b = detail::read_uint8(buf);
- unsigned int c = detail::read_uint8(buf);
- unsigned int d = detail::read_uint8(buf);
- snprintf(ip_string, 100, "%u.%u.%u.%u", a, b, c, d);
- e.ip = ip_string;
- e.port = detail::read_uint16(buf);
- e.pid.clear();
- peer_list.push_back(e);
- }
-
- std::list<address> ip_list;
- for (std::list<tcp::endpoint>::const_iterator i = m_endpoints.begin()
- , end(m_endpoints.end()); i != end; ++i)
- {
- ip_list.push_back(i->address());
- }
-
- cb->tracker_response(tracker_req(), m_target.address(), ip_list
- , peer_list, interval, min_interval, complete, incomplete, 0, address(), "" /*trackerid*/);
-
- close();
- return true;
- }
-
- bool udp_tracker_connection::on_scrape_response(char const* buf, int size)
- {
- restart_read_timeout();
- int action = detail::read_int32(buf);
- | ||
| relevance 0 | ../src/upnp.cpp:72 | listen_interface is not used. It's meant to bind the broadcast socket |
listen_interface is not used. It's meant to bind the broadcast socket../src/upnp.cpp:72#include <asio/ip/multicast.hpp>
+ | ||
| relevance 0 | ../src/upnp.cpp:72 | listen_interface is not used. It's meant to bind the broadcast socket |
listen_interface is not used. It's meant to bind the broadcast socket../src/upnp.cpp:72#include <asio/ip/multicast.hpp>
#else
#include <boost/asio/ip/host_name.hpp>
#include <boost/asio/ip/multicast.hpp>
@@ -5196,7 +5949,7 @@ static error_code ec;
upnp_state_t* s = (upnp_state_t*)state;
m_devices.swap(s->devices);
m_mappings.swap(s->mappings);
- | ||
| relevance 0 | ../src/ut_metadata.cpp:320 | we really need to increment the refcounter on the torrent while this buffer is still in the peer's send buffer |
we really need to increment the refcounter on the torrent
+ | ||
| relevance 0 | ../src/ut_metadata.cpp:320 | we really need to increment the refcounter on the torrent while this buffer is still in the peer's send buffer |
we really need to increment the refcounter on the torrent
while this buffer is still in the peer's send buffer../src/ut_metadata.cpp:320 if (!m_tp.need_loaded()) return;
metadata = m_tp.metadata().begin + offset;
metadata_piece_size = (std::min)(
@@ -5248,7 +6001,7 @@ while this buffer is still in the peer's send buffer../src/ut_metadata.
#ifdef TORRENT_VERBOSE_LOGGING
m_pc.peer_log("<== UT_METADATA [ not a dictionary ]");
#endif
- | ||
| relevance 0 | ../src/utp_stream.cpp:1627 | this loop may not be very efficient |
this loop may not be very efficient../src/utp_stream.cpp:1627
+ | ||
| relevance 0 | ../src/utp_stream.cpp:1627 | this loop may not be very efficient |
this loop may not be very efficient../src/utp_stream.cpp:1627
char* m_buf;
};
@@ -5299,9 +6052,7 @@ bool utp_socket_impl::send_pkt(int flags)
if (sack > 32) sack = 32;
}
- | ||
| relevance 0 | ../src/web_connection_base.cpp:71 | introduce a web-seed default class which has a low download priority |
introduce a web-seed default class which has a low download priority../src/web_connection_base.cpp:71
-namespace libtorrent
-{
+ | ||
| relevance 0 | ../src/web_connection_base.cpp:73 | introduce a web-seed default class which has a low download priority |
introduce a web-seed default class which has a low download priority../src/web_connection_base.cpp:73{
web_connection_base::web_connection_base(
peer_connection_args const& pack
, web_seed_entry& web)
@@ -5314,7 +6065,9 @@ namespace libtorrent
, m_body_start(0)
{
TORRENT_ASSERT(&web.peer_info == pack.peerinfo);
- TORRENT_ASSERT(web.endpoint == *pack.endp);
+ // when going through a proxy, we don't necessarily have an endpoint here,
+ // since the proxy might be resolving the hostname, not us
+ TORRENT_ASSERT(web.endpoints.empty() || web.endpoints.front() == pack.endp);
INVARIANT_CHECK;
@@ -5350,7 +6103,7 @@ namespace libtorrent
// according to the settings.
return m_settings.get_int(settings_pack::urlseed_timeout);
}
- | ||
| relevance 0 | ../src/kademlia/dht_tracker.cpp:428 | ideally this function would be called when the put completes |
ideally this function would be called when the
+ | ||
| relevance 0 | ../src/kademlia/dht_tracker.cpp:428 | ideally this function would be called when the put completes |
ideally this function would be called when the
put completes../src/kademlia/dht_tracker.cpp:428 // since it controls whether we re-put the content
TORRENT_ASSERT(!it.is_mutable());
f(it);
@@ -5402,8 +6155,8 @@ put completes../src/kademlia/dht_tracker.cpp:428| relevance 0 | ../src/kademlia/routing_table.cpp:308 | instad of refreshing a bucket by using find_nodes, ping each node periodically |
|
instad of refreshing a bucket by using find_nodes,
-ping each node periodically../src/kademlia/routing_table.cpp:308 os << "]\n";
+ | ||
| relevance 0 | ../src/kademlia/routing_table.cpp:316 | instad of refreshing a bucket by using find_nodes, ping each node periodically |
instad of refreshing a bucket by using find_nodes,
+ping each node periodically../src/kademlia/routing_table.cpp:316 os << "]\n";
}
}
@@ -5454,7 +6207,7 @@ bool compare_bucket_refresh(routing_table_node const& lhs, routing_table_nod
node_id mask = generate_prefix_mask(num_bits);
// target = (target & ~mask) | (root & mask)
- | ||
| relevance 0 | ../include/libtorrent/bitfield.hpp:158 | rename to data() ? |
rename to data() ?../include/libtorrent/bitfield.hpp:158 if (m_buf[i] != 0) return false;
+ | ||
| relevance 0 | ../include/libtorrent/bitfield.hpp:158 | rename to data() ? |
rename to data() ?../include/libtorrent/bitfield.hpp:158 if (m_buf[i] != 0) return false;
}
return true;
}
@@ -5505,8 +6258,7 @@ bool compare_bucket_refresh(routing_table_node const& lhs, routing_table_nod
return ret;
}
#endif // TORRENT_HAS_SSE
- | ||
| relevance 0 | ../include/libtorrent/block_cache.hpp:220 | make this 32 bits and to count seconds since the block cache was created |
make this 32 bits and to count seconds since the block cache was created../include/libtorrent/block_cache.hpp:220
- bool operator==(cached_piece_entry const& rhs) const
+ | ||
| relevance 0 | ../include/libtorrent/block_cache.hpp:218 | make this 32 bits and to count seconds since the block cache was created |
make this 32 bits and to count seconds since the block cache was created../include/libtorrent/block_cache.hpp:218 bool operator==(cached_piece_entry const& rhs) const
{ return storage.get() == rhs.storage.get() && piece == rhs.piece; }
// if this is set, we'll be calculating the hash
@@ -5520,6 +6272,7 @@ bool compare_bucket_refresh(routing_table_node const& lhs, routing_table_nod
// the pointers to the block data. If this is a ghost
// cache entry, there won't be any data here
+
boost::shared_array<cached_block_entry> blocks;
// the last time a block was written to this piece
@@ -5556,7 +6309,7 @@ bool compare_bucket_refresh(routing_table_node const& lhs, routing_table_nod
// this is set to true once we flush blocks past
// the hash cursor. Once this happens, there's
- | ||
| relevance 0 | ../include/libtorrent/config.hpp:339 | Make this count Unicode characters instead of bytes on windows |
Make this count Unicode characters instead of bytes on windows../include/libtorrent/config.hpp:339#define TORRENT_USE_WRITEV 0
+ | ||
| relevance 0 | ../include/libtorrent/config.hpp:339 | Make this count Unicode characters instead of bytes on windows |
Make this count Unicode characters instead of bytes on windows../include/libtorrent/config.hpp:339#define TORRENT_USE_WRITEV 0
#define TORRENT_USE_READV 0
#else
@@ -5607,8 +6360,8 @@ bool compare_bucket_refresh(routing_table_node const& lhs, routing_table_nod
#include <stdarg.h>
// internal
- | ||
| relevance 0 | ../include/libtorrent/debug.hpp:212 | rewrite this class to use FILE* instead and have a printf-like interface |
rewrite this class to use FILE* instead and
-have a printf-like interface../include/libtorrent/debug.hpp:212#endif
+ | ||
| relevance 0 | ../include/libtorrent/debug.hpp:215 | rewrite this class to use FILE* instead and have a printf-like interface |
rewrite this class to use FILE* instead and
+have a printf-like interface../include/libtorrent/debug.hpp:215#endif
}
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
@@ -5659,7 +6412,7 @@ namespace libtorrent
mutex::scoped_lock l(file_mutex);
open(!append);
- | ||
| relevance 0 | ../include/libtorrent/disk_buffer_pool.hpp:133 | try to remove the observers, only using the async_allocate handlers |
try to remove the observers, only using the async_allocate handlers../include/libtorrent/disk_buffer_pool.hpp:133
+ | ||
| relevance 0 | ../include/libtorrent/disk_buffer_pool.hpp:133 | try to remove the observers, only using the async_allocate handlers |
try to remove the observers, only using the async_allocate handlers../include/libtorrent/disk_buffer_pool.hpp:133
// number of bytes per block. The BitTorrent
// protocol defines the block size to 16 KiB.
const int m_block_size;
@@ -5710,7 +6463,7 @@ namespace libtorrent
// the pointer to the block of virtual address space
// making up the mmapped cache space
char* m_cache_pool;
- | ||
| relevance 0 | ../include/libtorrent/peer_connection.hpp:217 | make this a raw pointer (to save size in the first cache line) and make the constructor take a raw pointer. torrent objects should always outlive their peers |
make this a raw pointer (to save size in
+ | ||
| relevance 0 | ../include/libtorrent/peer_connection.hpp:217 | make this a raw pointer (to save size in the first cache line) and make the constructor take a raw pointer. torrent objects should always outlive their peers |
make this a raw pointer (to save size in
the first cache line) and make the constructor
take a raw pointer. torrent objects should always
outlive their peers../include/libtorrent/peer_connection.hpp:217 , m_snubbed(false)
@@ -5764,8 +6517,8 @@ outlive their peers../include/libtorrent/peer_connection.hpp:217 | ||
| relevance 0 | ../include/libtorrent/peer_connection.hpp:1141 | factor this out into its own class with a virtual interface torrent and session should implement this interface |
factor this out into its own class with a virtual interface
-torrent and session should implement this interface../include/libtorrent/peer_connection.hpp:1141
+ | ||
| relevance 0 | ../include/libtorrent/peer_connection.hpp:1144 | factor this out into its own class with a virtual interface torrent and session should implement this interface |
factor this out into its own class with a virtual interface
+torrent and session should implement this interface../include/libtorrent/peer_connection.hpp:1144
// the local endpoint for this peer, i.e. our address
// and our port. If this is set for outgoing connections
// before the connection completes, it means we want to
@@ -5816,7 +6569,7 @@ torrent and session should implement this interface../include/libtorren
// |
// | m_recv_start (logical start of current
// | | receive buffer, as perceived by upper layers)
- | ||
| relevance 0 | ../include/libtorrent/peer_connection_interface.hpp:45 | make this interface smaller! |
make this interface smaller!../include/libtorrent/peer_connection_interface.hpp:45SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ | ||
| relevance 0 | ../include/libtorrent/peer_connection_interface.hpp:45 | make this interface smaller! |
make this interface smaller!../include/libtorrent/peer_connection_interface.hpp:45SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
@@ -5867,7 +6620,7 @@ namespace libtorrent
virtual tcp::endpoint const& remote() const = 0;
virtual tcp::endpoint local_endpoint() const = 0;
virtual void disconnect(error_code const& ec, operation_t op, int error = 0) = 0;
- | ||
| relevance 0 | ../include/libtorrent/performance_counters.hpp:132 | should keepalives be in here too? how about dont-have, share-mode, upload-only |
should keepalives be in here too?
+ | ||
| relevance 0 | ../include/libtorrent/performance_counters.hpp:132 | should keepalives be in here too? how about dont-have, share-mode, upload-only |
should keepalives be in here too?
how about dont-have, share-mode, upload-only../include/libtorrent/performance_counters.hpp:132 // a connect candidate
connection_attempt_loops,
// successful incoming connections (not rejected for any reason)
@@ -5919,7 +6672,9 @@ how about dont-have, share-mode, upload-only../include/libtorrent/perfo
num_outgoing_cancel,
num_outgoing_dht_port,
num_outgoing_suggest,
- | ||
| relevance 0 | ../include/libtorrent/performance_counters.hpp:404 | some space could be saved here by making gauges 32 bits |
some space could be saved here by making gauges 32 bits../include/libtorrent/performance_counters.hpp:404 limiter_down_bytes,
+ | ||
| relevance 0 | ../include/libtorrent/performance_counters.hpp:406 | some space could be saved here by making gauges 32 bits |
some space could be saved here by making gauges 32 bits../include/libtorrent/performance_counters.hpp:406 | ||
| relevance 0 | ../include/libtorrent/performance_counters.hpp:407 | restore these to regular integers. Instead have one copy of the counters per thread and collect them at convenient synchronization points |
restore these to regular integers. Instead have one copy
+of the counters per thread and collect them at convenient
+synchronization points../include/libtorrent/performance_counters.hpp:407 limiter_down_bytes,
num_counters,
num_gauge_counters = num_counters - num_stats_counters
@@ -5952,7 +6707,7 @@ how about dont-have, share-mode, upload-only../include/libtorrent/perfo
#endif
- | ||
| relevance 0 | ../include/libtorrent/piece_picker.hpp:669 | should this be allocated lazily? |
should this be allocated lazily?../include/libtorrent/piece_picker.hpp:669 std::vector<downloading_piece>::const_iterator find_dl_piece(int queue, int index) const;
+ | ||
| relevance 0 | ../include/libtorrent/piece_picker.hpp:669 | should this be allocated lazily? |
should this be allocated lazily?../include/libtorrent/piece_picker.hpp:669 std::vector<downloading_piece>::const_iterator find_dl_piece(int queue, int index) const;
std::vector<downloading_piece>::iterator find_dl_piece(int queue, int index);
// returns an iterator to the downloading piece, whichever
@@ -6003,7 +6758,7 @@ how about dont-have, share-mode, upload-only../include/libtorrent/perfo
// and some are still in the requested state
// 2: downloading pieces where every block is
// finished or writing
- | ||
| relevance 0 | ../include/libtorrent/proxy_base.hpp:166 | it would be nice to remember the bind port and bind once we know where the proxy is m_sock.bind(endpoint, ec); |
it would be nice to remember the bind port and bind once we know where the proxy is
+ | ||
| relevance 0 | ../include/libtorrent/proxy_base.hpp:166 | it would be nice to remember the bind port and bind once we know where the proxy is m_sock.bind(endpoint, ec); |
it would be nice to remember the bind port and bind once we know where the proxy is
m_sock.bind(endpoint, ec);../include/libtorrent/proxy_base.hpp:166 {
return m_sock.get_option(opt, ec);
}
@@ -6055,7 +6810,7 @@ m_sock.bind(endpoint, ec);../include/libtorrent/proxy_base.hpp:166
m_sock.close(ec);
m_resolver.cancel();
}
- | ||
| relevance 0 | ../include/libtorrent/session.hpp:857 | add get_peer_class_type_filter() as well |
add get_peer_class_type_filter() as well../include/libtorrent/session.hpp:857 //
+ | ||
| relevance 0 | ../include/libtorrent/session.hpp:861 | add get_peer_class_type_filter() as well |
add get_peer_class_type_filter() as well../include/libtorrent/session.hpp:861 //
// The ``peer_class`` argument cannot be greater than 31. The bitmasks
// representing peer classes in the ``peer_class_filter`` are 32 bits.
//
@@ -6106,10 +6861,10 @@ m_sock.bind(endpoint, ec);../include/libtorrent/proxy_base.hpp:166
// destructs.
//
// For more information on peer classes, see peer-classes_.
- | ||
| relevance 0 | ../include/libtorrent/settings_pack.hpp:1074 | deprecate this ``max_rejects`` is the number of piece requests we will reject in a row while a peer is choked before the peer is considered abusive and is disconnected. |
deprecate this
+ | ||
| relevance 0 | ../include/libtorrent/settings_pack.hpp:1080 | deprecate this ``max_rejects`` is the number of piece requests we will reject in a row while a peer is choked before the peer is considered abusive and is disconnected. |
deprecate this
``max_rejects`` is the number of piece requests we will reject in a row
while a peer is choked before the peer is considered abusive and is
-disconnected.../include/libtorrent/settings_pack.hpp:1074 auto_manage_startup,
+disconnected.../include/libtorrent/settings_pack.hpp:1080 auto_manage_startup,
// ``seeding_piece_quota`` is the number of pieces to send to a peer,
// when seeding, before rotating in another peer to the unchoke set.
@@ -6160,7 +6915,7 @@ disconnected.../include/libtorrent/settings_pack.hpp:1074 | ||
| relevance 0 | ../include/libtorrent/size_type.hpp:48 | remove these and just use boost's types directly |
remove these and just use boost's types directly../include/libtorrent/size_type.hpp:48ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ | ||
| relevance 0 | ../include/libtorrent/size_type.hpp:48 | remove these and just use boost's types directly |
remove these and just use boost's types directly../include/libtorrent/size_type.hpp:48ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
@@ -6186,7 +6941,7 @@ namespace libtorrent
#endif
- | ||
| relevance 0 | ../include/libtorrent/torrent.hpp:1194 | this wastes 5 bits per file |
this wastes 5 bits per file../include/libtorrent/torrent.hpp:1194#ifndef TORRENT_DISABLE_EXTENSIONS
+ | ||
| relevance 0 | ../include/libtorrent/torrent.hpp:1201 | this wastes 5 bits per file |
this wastes 5 bits per file../include/libtorrent/torrent.hpp:1201#ifndef TORRENT_DISABLE_EXTENSIONS
typedef std::list<boost::shared_ptr<torrent_plugin> > extension_list_t;
extension_list_t m_extensions;
#endif
@@ -6237,7 +6992,7 @@ namespace libtorrent
// if this was added from an RSS feed, this is the unique
// identifier in the feed.
- | ||
| relevance 0 | ../include/libtorrent/torrent.hpp:1253 | These two bitfields should probably be coalesced into one |
These two bitfields should probably be coalesced into one../include/libtorrent/torrent.hpp:1253 // the .torrent file from m_url
+ | ||
| relevance 0 | ../include/libtorrent/torrent.hpp:1260 | These two bitfields should probably be coalesced into one |
These two bitfields should probably be coalesced into one../include/libtorrent/torrent.hpp:1260 // the .torrent file from m_url
// std::vector<char> m_torrent_file_buf;
// this is a list of all pieces that we have announced
@@ -6288,133 +7043,7 @@ namespace libtorrent
// this is the time last any of our peers saw a seed
// in this swarm
time_t m_swarm_last_seen_complete;
- | ||
| relevance 0 | ../include/libtorrent/torrent.hpp:1571 | There are 8 bits free here |
There are 8 bits free here../include/libtorrent/torrent.hpp:1571 // files belonging to it. When set, don't write any
- // more blocks to disk!
- bool m_deleted:1;
-
- // pinned torrents are locked in RAM and won't be unloaded
- // in favor of more active torrents. When the torrent is added,
- // the user may choose to initialize this to 1, in which case
- // it will never be unloaded from RAM
- bool m_pinned:1;
-
- // when this is false, we should unload the torrent as soon
- // as the no other async. job needs the torrent loaded
- bool m_should_be_loaded:1;
-
-// ----
-
- // the timestamp of the last piece passed for this torrent
- // specified in session_time
- boost::uint16_t m_last_download;
-
-
- // this is a second count-down to when we should tick the
- // storage for this torrent. Ticking the storage is used
- // to periodically flush the partfile metadata and possibly
- // other deferred flushing. Any disk operation starts this
- // counter (unless it's already counting down). 0 means no
- // ticking is needed.
- boost::uint8_t m_storage_tick;
-
-// ----
-
- // the timestamp of the last byte uploaded from this torrent
- // specified in session_time
- boost::uint16_t m_last_upload;
-
- | ||
| relevance 0 | ../include/libtorrent/torrent.hpp:1587 | There are 8 bits here |
There are 8 bits here../include/libtorrent/torrent.hpp:1587
- // the timestamp of the last piece passed for this torrent
- // specified in session_time
- boost::uint16_t m_last_download;
-
-
- // this is a second count-down to when we should tick the
- // storage for this torrent. Ticking the storage is used
- // to periodically flush the partfile metadata and possibly
- // other deferred flushing. Any disk operation starts this
- // counter (unless it's already counting down). 0 means no
- // ticking is needed.
- boost::uint8_t m_storage_tick;
-
-// ----
-
- // the timestamp of the last byte uploaded from this torrent
- // specified in session_time
- boost::uint16_t m_last_upload;
-
-
- // if this is true, libtorrent may pause and resume
- // this torrent depending on queuing rules. Torrents
- // started with auto_managed flag set may be added in
- // a paused state in case there are no available
- // slots.
- bool m_auto_managed:1;
-
- enum { no_gauge_state = 0xf };
- // the current stats gauge this torrent counts against
- boost::uint32_t m_current_gauge_state:4;
-
- // set to true while moving the storage
- bool m_moving_storage:1;
-
- // this is true if this torrent is considered inactive from the
- // queuing mechanism's point of view. If a torrent doesn't transfer
- // at high enough rates, it's inactive.
- bool m_inactive:1;
-
- | ||
| relevance 0 | ../include/libtorrent/torrent.hpp:1608 | there's space for 1 bits here |
there's space for 1 bits here../include/libtorrent/torrent.hpp:1608
- // if this is true, libtorrent may pause and resume
- // this torrent depending on queuing rules. Torrents
- // started with auto_managed flag set may be added in
- // a paused state in case there are no available
- // slots.
- bool m_auto_managed:1;
-
- enum { no_gauge_state = 0xf };
- // the current stats gauge this torrent counts against
- boost::uint32_t m_current_gauge_state:4;
-
- // set to true while moving the storage
- bool m_moving_storage:1;
-
- // this is true if this torrent is considered inactive from the
- // queuing mechanism's point of view. If a torrent doesn't transfer
- // at high enough rates, it's inactive.
- bool m_inactive:1;
-
-
- // ----
-
- // the scrape data from the tracker response, this
- // is optional and may be 0xffffff
- unsigned int m_downloaded:24;
-
- // the timestamp of the last scrape request to
- // one of the trackers in this torrent
- // specified in session_time
- boost::uint16_t m_last_scrape;
-
-// ----
-
- // progress parts per million (the number of
- // millionths of completeness)
- unsigned int m_progress_ppm:20;
-
- // the number of seconds this torrent has been under the inactive
- // threshold in terms of sending and receiving data. When this counter
- // reaches the settings.inactive_torrent_timeout it will be considered
- // inactive and possibly open up another queue slot, to start another,
- // queued, torrent. Every second it's above the threshold
- boost::int16_t m_inactive_counter;
-
- // if this is set, accept the save path saved in the resume data, if
- // present
- bool m_use_resume_save_path:1;
-
-#if TORRENT_USE_ASSERTS
- public:
- | ||
| relevance 0 | ../include/libtorrent/torrent_info.hpp:124 | include the number of peers received from this tracker, at last announce |
include the number of peers received from this tracker, at last announce../include/libtorrent/torrent_info.hpp:124
+ | ||
| relevance 0 | ../include/libtorrent/torrent_info.hpp:124 | include the number of peers received from this tracker, at last announce |
include the number of peers received from this tracker, at last announce../include/libtorrent/torrent_info.hpp:124
// if this tracker failed the last time it was contacted
// this error code specifies what error occurred
error_code last_error;
@@ -6465,7 +7094,7 @@ namespace libtorrent
// flags for the source bitmask, each indicating where
// we heard about this tracker
enum tracker_source
- | ||
| relevance 0 | ../include/libtorrent/upnp.hpp:113 | support using the windows API for UPnP operations as well |
support using the windows API for UPnP operations as well../include/libtorrent/upnp.hpp:113 // specific port
+ | ||
| relevance 0 | ../include/libtorrent/upnp.hpp:113 | support using the windows API for UPnP operations as well |
support using the windows API for UPnP operations as well../include/libtorrent/upnp.hpp:113 // specific port
external_port_must_be_wildcard = 727
};
@@ -6516,7 +7145,7 @@ public:
// is -1, which means failure. There will not be any error alert notification for
// mappings that fail with a -1 return value.
int add_mapping(protocol_type p, int external_port, int local_port);
- | ||
| relevance 0 | ../include/libtorrent/utp_stream.hpp:391 | implement blocking write. Low priority since it's not used (yet) |
implement blocking write. Low priority since it's not used (yet)../include/libtorrent/utp_stream.hpp:391 for (typename Mutable_Buffers::const_iterator i = buffers.begin()
+ | ||
| relevance 0 | ../include/libtorrent/utp_stream.hpp:391 | implement blocking write. Low priority since it's not used (yet) |
implement blocking write. Low priority since it's not used (yet)../include/libtorrent/utp_stream.hpp:391 for (typename Mutable_Buffers::const_iterator i = buffers.begin()
, end(buffers.end()); i != end; ++i)
{
using asio::buffer_cast;
@@ -6567,7 +7196,7 @@ public:
if (m_impl == 0)
{
m_io_service.post(boost::bind<void>(handler, asio::error::not_connected, 0));
- | ||
| relevance 0 | ../include/libtorrent/kademlia/item.hpp:61 | since this is a public function, it should probably be moved out of this header and into one with other public functions. |
since this is a public function, it should probably be moved
+ | ||
| relevance 0 | ../include/libtorrent/kademlia/item.hpp:61 | since this is a public function, it should probably be moved out of this header and into one with other public functions. |
since this is a public function, it should probably be moved
out of this header and into one with other public functions.../include/libtorrent/kademlia/item.hpp:61#include <boost/array.hpp>
namespace libtorrent { namespace dht
@@ -6619,7 +7248,7 @@ public:
item(entry const& v
, std::pair<char const*, int> salt
, boost::uint64_t seq, char const* pk, char const* sk);
- | ||
| relevance 0 | ../include/libtorrent/aux_/session_impl.hpp:412 | move the login info into the tracker_request object |
move the login info into the tracker_request object../include/libtorrent/aux_/session_impl.hpp:412
+ | ||
| relevance 0 | ../include/libtorrent/aux_/session_impl.hpp:404 | move the login info into the tracker_request object |
move the login info into the tracker_request object../include/libtorrent/aux_/session_impl.hpp:404
void on_lsd_announce(error_code const& e);
// called when a port mapping is successful, or a router returns
@@ -6670,7 +7299,7 @@ public:
#ifndef TORRENT_DISABLE_EXTENSIONS
void add_extensions_to_torrent(
- | ||
| relevance 0 | ../include/libtorrent/aux_/session_impl.hpp:900 | should this be renamed m_outgoing_interfaces? |
should this be renamed m_outgoing_interfaces?../include/libtorrent/aux_/session_impl.hpp:900 // listen socket. For each retry the port number
+ | ||
| relevance 0 | ../include/libtorrent/aux_/session_impl.hpp:879 | should this be renamed m_outgoing_interfaces? |
should this be renamed m_outgoing_interfaces?../include/libtorrent/aux_/session_impl.hpp:879 // listen socket. For each retry the port number
// is incremented by one
int m_listen_port_retries;
@@ -6721,7 +7350,108 @@ public:
mutable boost::uint8_t m_interface_index;
void open_new_incoming_socks_connection();
- | ||
| relevance 0 | ../include/libtorrent/aux_/session_interface.hpp:200 | it would be nice to not have this be part of session_interface |
it would be nice to not have this be part of session_interface../include/libtorrent/aux_/session_interface.hpp:200 virtual boost::uint16_t listen_port() const = 0;
+ | ||
| relevance 0 | ../include/libtorrent/aux_/session_impl.hpp:928 | replace this by a proper asio timer |
replace this by a proper asio timer../include/libtorrent/aux_/session_impl.hpp:928 mutable boost::uint8_t m_interface_index;
+
+ void open_new_incoming_socks_connection();
+
+ void setup_listener(listen_socket_t* s, std::string const& device
+ , bool ipv4, int port, int& retries, int flags, error_code& ec);
+
+#ifndef TORRENT_DISABLE_DHT
+ entry m_dht_state;
+#endif
+
+ // the number of unchoked peers as set by the auto-unchoker
+ // this should always be >= m_max_uploads
+ int m_allowed_upload_slots;
+
+ // this is initialized to the unchoke_interval
+ // session_setting and decreased every second.
+ // when it reaches zero, it is reset to the
+ // unchoke_interval and the unchoke set is
+ // recomputed.
+ int m_unchoke_time_scaler;
+
+ // this is used to decide when to recalculate which
+ // torrents to keep queued and which to activate
+ | ||
| relevance 0 | ../include/libtorrent/aux_/session_impl.hpp:933 | replace this by a proper asio timer |
replace this by a proper asio timer../include/libtorrent/aux_/session_impl.hpp:933 void setup_listener(listen_socket_t* s, std::string const& device
+ , bool ipv4, int port, int& retries, int flags, error_code& ec);
+
+#ifndef TORRENT_DISABLE_DHT
+ entry m_dht_state;
+#endif
+
+ // the number of unchoked peers as set by the auto-unchoker
+ // this should always be >= m_max_uploads
+ int m_allowed_upload_slots;
+
+ // this is initialized to the unchoke_interval
+ // session_setting and decreased every second.
+ // when it reaches zero, it is reset to the
+ // unchoke_interval and the unchoke set is
+ // recomputed.
+ int m_unchoke_time_scaler;
+
+ // this is used to decide when to recalculate which
+ // torrents to keep queued and which to activate
+ int m_auto_manage_time_scaler;
+
+ // works like unchoke_time_scaler but it
+ // is only decresed when the unchoke set
+ // is recomputed, and when it reaches zero,
+ // the optimistic unchoke is moved to another peer.
+ | ||
| relevance 0 | ../include/libtorrent/aux_/session_impl.hpp:940 | replace this by a proper asio timer |
replace this by a proper asio timer../include/libtorrent/aux_/session_impl.hpp:940
+ // the number of unchoked peers as set by the auto-unchoker
+ // this should always be >= m_max_uploads
+ int m_allowed_upload_slots;
+
+ // this is initialized to the unchoke_interval
+ // session_setting and decreased every second.
+ // when it reaches zero, it is reset to the
+ // unchoke_interval and the unchoke set is
+ // recomputed.
+ int m_unchoke_time_scaler;
+
+ // this is used to decide when to recalculate which
+ // torrents to keep queued and which to activate
+ int m_auto_manage_time_scaler;
+
+ // works like unchoke_time_scaler but it
+ // is only decresed when the unchoke set
+ // is recomputed, and when it reaches zero,
+ // the optimistic unchoke is moved to another peer.
+ int m_optimistic_unchoke_time_scaler;
+
+ // works like unchoke_time_scaler. Each time
+ // it reaches 0, and all the connections are
+ // used, the worst connection will be disconnected
+ // from the torrent with the most peers
+ int m_disconnect_time_scaler;
+
+ // when this scaler reaches zero, it will
+ // scrape one of the auto managed, paused,
+ // torrents.
+ int m_auto_scrape_time_scaler;
+
+ // the index of the torrent that we'll
+ // refresh the next time
+ int m_next_explicit_cache_torrent;
+
+ // this is a counter of the number of seconds until
+ // the next time the read cache is rotated, if we're
+ // using an explicit read read cache.
+ int m_cache_rotation_timer;
+
+ // the index of the torrent that we'll
+ // refresh the next time
+ int m_next_suggest_torrent;
+
+ // this is a counter of the number of seconds until
+ // the next time the suggest pieces are refreshed
+ int m_suggest_timer;
+
+ // statistics gathered from all torrents.
+ | ||
| relevance 0 | ../include/libtorrent/aux_/session_interface.hpp:198 | it would be nice to not have this be part of session_interface |
it would be nice to not have this be part of session_interface../include/libtorrent/aux_/session_interface.hpp:198 virtual boost::uint16_t listen_port() const = 0;
virtual boost::uint16_t ssl_listen_port() const = 0;
// used to (potentially) issue socket write calls onto multiple threads
diff --git a/include/libtorrent/http_tracker_connection.hpp b/include/libtorrent/http_tracker_connection.hpp
index 12b3bb57d..25c488c71 100644
--- a/include/libtorrent/http_tracker_connection.hpp
+++ b/include/libtorrent/http_tracker_connection.hpp
@@ -95,9 +95,6 @@ namespace libtorrent
virtual void on_timeout(error_code const&) {}
- void parse(int status_code, lazy_entry const& e);
- bool extract_peer_info(lazy_entry const& e, peer_entry& ret);
-
tracker_manager& m_man;
boost::shared_ptr m_tracker_connection;
aux::session_impl& m_ses;
@@ -109,6 +106,9 @@ namespace libtorrent
#endif
};
+ TORRENT_EXTRA_EXPORT tracker_response parse_tracker_response(
+ char const* data, int size, error_code& ec
+ , bool scrape_request, sha1_hash scrape_ih);
}
#endif // TORRENT_HTTP_TRACKER_CONNECTION_HPP_INCLUDED
diff --git a/include/libtorrent/lazy_entry.hpp b/include/libtorrent/lazy_entry.hpp
index 012fd55e8..ef46df2bd 100644
--- a/include/libtorrent/lazy_entry.hpp
+++ b/include/libtorrent/lazy_entry.hpp
@@ -237,7 +237,8 @@ namespace libtorrent
// if this is a dictionary, look for a key ``name`` whose value
// is an int. If such key exist, return a pointer to its value,
// otherwise NULL.
- boost::int64_t dict_find_int_value(char const* name, boost::int64_t default_val = 0) const;
+ boost::int64_t dict_find_int_value(char const* name
+ , boost::int64_t default_val = 0) const;
lazy_entry const* dict_find_int(char const* name) const;
// these functions require that ``this`` is a dictionary.
diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp
index 7ce29106a..4736d2b41 100644
--- a/include/libtorrent/tracker_manager.hpp
+++ b/include/libtorrent/tracker_manager.hpp
@@ -150,20 +150,48 @@ namespace libtorrent
, min_interval(120)
, complete(-1)
, incomplete(-1)
+ , downloaders(-1)
, downloaded(-1)
{}
+ // peers from the tracker, in various forms
std::vector peers;
std::vector peers4;
#if TORRENT_USE_IPV6
std::vector peers6;
#endif
+ // our external IP address (if the tracker responded with ti, otherwise
+ // INADDR_ANY)
address external_ip;
+
+ // the tracker id, if it was included in the response, otherwise
+ // an empty string
std::string trackerid;
+
+ // if the tracker returned an error, this is set to that error
+ std::string failure_reason;
+
+ // contains a warning message from the tracker, if included in
+ // the response
+ std::string warning_message;
+
+ // re-announce interval, in seconds
int interval;
+
+ // the lowest force-announce interval
int min_interval;
+
+ // the number of seeds in the swarm
int complete;
+
+ // the number of downloaders in the swarm
int incomplete;
+
+ // if supported by the tracker, the number of actively downloading peers.
+ // i.e. partial seeds. If not suppored, -1
+ int downloaders;
+
+ // the number of times the torrent has been downloaded
int downloaded;
};
diff --git a/src/http_tracker_connection.cpp b/src/http_tracker_connection.cpp
index 9cb7a77f0..535136922 100644
--- a/src/http_tracker_connection.cpp
+++ b/src/http_tracker_connection.cpp
@@ -328,27 +328,70 @@ namespace libtorrent
received_bytes(size + parser.body_start());
// handle tracker response
- lazy_entry e;
error_code ecode;
- int res = lazy_bdecode(data, data + size, e, ecode);
- if (res == 0 && e.type() == lazy_entry::dict_t)
+ boost::shared_ptr cb = requester();
+ if (!cb)
{
- parse(parser.status_code(), e);
+ close();
+ return;
+ }
+
+ tracker_response resp = parse_tracker_response(data, size, ecode
+ , tracker_req().kind == tracker_request::scrape_request
+ , tracker_req().info_hash);
+
+ if (!resp.warning_message.empty())
+ cb->tracker_warning(tracker_req(), resp.warning_message);
+
+ if (ecode)
+ {
+ fail(ecode, parser.status_code());
+ close();
+ return;
+ }
+
+ if (!resp.failure_reason.empty())
+ {
+ fail(error_code(errors::tracker_failure), parser.status_code()
+ , resp.failure_reason.c_str(), resp.interval, resp.min_interval);
+ close();
+ return;
+ }
+
+ // do slightly different things for scrape requests
+ if (tracker_req().kind == tracker_request::scrape_request)
+ {
+ cb->tracker_scrape_response(tracker_req(), resp.complete
+ , resp.incomplete, resp.downloaded, resp.downloaders);
}
else
{
- fail(ecode, parser.status_code());
+ std::list ip_list;
+ if (m_tracker_connection)
+ {
+ error_code ec;
+ ip_list.push_back(
+ m_tracker_connection->socket().remote_endpoint(ec).address());
+ std::vector const& epts = m_tracker_connection->endpoints();
+ for (std::vector::const_iterator i = epts.begin()
+ , end(epts.end()); i != end; ++i)
+ {
+ ip_list.push_back(i->address());
+ }
+ }
+
+ cb->tracker_response(tracker_req(), m_tracker_ip, ip_list, resp);
}
close();
}
- bool http_tracker_connection::extract_peer_info(lazy_entry const& info, peer_entry& ret)
+ bool extract_peer_info(lazy_entry const& info, peer_entry& ret, error_code& ec)
{
// extract peer id (if any)
if (info.type() != lazy_entry::dict_t)
{
- fail(error_code(errors::invalid_peer_dict));
+ ec.assign(errors::invalid_peer_dict, get_libtorrent_category());
return false;
}
lazy_entry const* i = info.dict_find_string("peer id");
@@ -366,7 +409,7 @@ namespace libtorrent
i = info.dict_find_string("ip");
if (i == 0)
{
- fail(error_code(errors::invalid_tracker_response));
+ ec.assign(errors::invalid_tracker_response, get_libtorrent_category());
return false;
}
ret.hostname = i->string_value();
@@ -375,7 +418,7 @@ namespace libtorrent
i = info.dict_find_int("port");
if (i == 0)
{
- fail(error_code(errors::invalid_tracker_response));
+ ec.assign(errors::invalid_tracker_response, get_libtorrent_category());
return false;
}
ret.port = (unsigned short)i->int_value();
@@ -383,18 +426,27 @@ namespace libtorrent
return true;
}
- // TODO: 2 make this a free function that can be easily unit tested
- void http_tracker_connection::parse(int status_code, lazy_entry const& e)
+ tracker_response parse_tracker_response(char const* data, int size, error_code& ec
+ , bool scrape_request, sha1_hash scrape_ih)
{
- boost::shared_ptr cb = requester();
- if (!cb) return;
+ tracker_response resp;
+
+ lazy_entry e;
+ int res = lazy_bdecode(data, data + size, e, ec);
+
+ if (ec) return resp;
+
+ if (res != 0 || e.type() != lazy_entry::dict_t)
+ {
+ ec.assign(errors::invalid_tracker_response, get_libtorrent_category());
+ return resp;
+ }
int interval = int(e.dict_find_int_value("interval", 0));
// if no interval is specified, default to 30 minutes
if (interval == 0) interval = 1800;
int min_interval = int(e.dict_find_int_value("min interval", 30));
- tracker_response resp;
resp.interval = interval;
resp.min_interval = min_interval;
@@ -406,44 +458,48 @@ namespace libtorrent
lazy_entry const* failure = e.dict_find_string("failure reason");
if (failure)
{
- fail(error_code(errors::tracker_failure), status_code
- , failure->string_value().c_str(), interval, min_interval);
- return;
+ resp.failure_reason = failure->string_value();
+ ec.assign(errors::tracker_failure, get_libtorrent_category());
+ return resp;
}
lazy_entry const* warning = e.dict_find_string("warning message");
if (warning)
- cb->tracker_warning(tracker_req(), warning->string_value());
+ resp.warning_message = warning->string_value();
- if (tracker_req().kind == tracker_request::scrape_request)
+ if (scrape_request)
{
- std::string ih = tracker_req().info_hash.to_string();
-
lazy_entry const* files = e.dict_find_dict("files");
if (files == 0)
{
- fail(error_code(errors::invalid_files_entry), -1, ""
- , interval, min_interval);
- return;
+ ec.assign(errors::invalid_files_entry, get_libtorrent_category());
+ return resp;
}
- lazy_entry const* scrape_data = files->dict_find_dict(ih.c_str());
+ // TODO: 4 this is a bug. if the info-hash contains a 0, this will
+ // fail!
+ lazy_entry const* scrape_data = files->dict_find_dict(
+ scrape_ih.to_string().c_str());
+
if (scrape_data == 0)
{
- fail(error_code(errors::invalid_hash_entry), -1, ""
- , interval, min_interval);
- return;
+ ec.assign(errors::invalid_hash_entry, get_libtorrent_category());
+ return resp;
}
- int complete = int(scrape_data->dict_find_int_value("complete", -1));
- int incomplete = int(scrape_data->dict_find_int_value("incomplete", -1));
- int downloaded = int(scrape_data->dict_find_int_value("downloaded", -1));
- int downloaders = int(scrape_data->dict_find_int_value("downloaders", -1));
- cb->tracker_scrape_response(tracker_req(), complete
- , incomplete, downloaded, downloaders);
- return;
+ resp.complete = int(scrape_data->dict_find_int_value("complete", -1));
+ resp.incomplete = int(scrape_data->dict_find_int_value("incomplete", -1));
+ resp.downloaded = int(scrape_data->dict_find_int_value("downloaded", -1));
+ resp.downloaders = int(scrape_data->dict_find_int_value("downloaders", -1));
+
+ return resp;
}
+ // look for optional scrape info
+ resp.complete = int(e.dict_find_int_value("complete", -1));
+ resp.incomplete = int(e.dict_find_int_value("incomplete", -1));
+ resp.downloaded = int(e.dict_find_int_value("downloaded", -1));
+
lazy_entry const* peers_ent = e.dict_find("peers");
if (peers_ent && peers_ent->type() == lazy_entry::string_t)
{
@@ -465,12 +521,21 @@ namespace libtorrent
{
int len = peers_ent->list_size();
resp.peers.reserve(len);
+ error_code parse_error;
for (int i = 0; i < len; ++i)
{
peer_entry p;
- if (!extract_peer_info(*peers_ent->list_at(i), p)) return;
+ if (!extract_peer_info(*peers_ent->list_at(i), p, parse_error))
+ continue;
resp.peers.push_back(p);
}
+
+ // only report an error if all peer entries are invalid
+ if (resp.peers.empty() && parse_error)
+ {
+ ec = parse_error;
+ return resp;
+ }
}
else
{
@@ -501,16 +566,15 @@ namespace libtorrent
#else
lazy_entry const* ipv6_peers = 0;
#endif
-
+/*
// if we didn't receive any peers. We don't care if we're stopping anyway
if (peers_ent == 0 && ipv6_peers == 0
&& tracker_req().event != tracker_request::stopped)
{
- fail(error_code(errors::invalid_peers_entry), -1, ""
- , interval, min_interval);
- return;
+ ec.assign(errors::invalid_peers_entry, get_libtorrent_category());
+ return resp;
}
-
+*/
lazy_entry const* ip_ent = e.dict_find_string("external ip");
if (ip_ent)
{
@@ -523,26 +587,7 @@ namespace libtorrent
#endif
}
- // look for optional scrape info
- resp.complete = int(e.dict_find_int_value("complete", -1));
- resp.incomplete = int(e.dict_find_int_value("incomplete", -1));
- resp.downloaded = int(e.dict_find_int_value("downloaded", -1));
-
- std::list ip_list;
- if (m_tracker_connection)
- {
- error_code ec;
- ip_list.push_back(m_tracker_connection->socket().remote_endpoint(ec).address());
- std::vector const& epts = m_tracker_connection->endpoints();
- for (std::vector::const_iterator i = epts.begin()
- , end(epts.end()); i != end; ++i)
- {
- ip_list.push_back(i->address());
- }
- }
-
- cb->tracker_response(tracker_req(), m_tracker_ip, ip_list, resp);
+ return resp;
}
-
}
diff --git a/test/test_tracker.cpp b/test/test_tracker.cpp
index 808fa7e54..6d0df0a3e 100644
--- a/test/test_tracker.cpp
+++ b/test/test_tracker.cpp
@@ -36,14 +36,176 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/alert.hpp"
#include "libtorrent/session.hpp"
#include "libtorrent/error_code.hpp"
+#include "libtorrent/tracker_manager.hpp"
+#include "libtorrent/http_tracker_connection.hpp" // for parse_tracker_response
#include
using namespace libtorrent;
namespace lt = libtorrent;
+void test_parse_hostname_peers()
+{
+ char const response[] = "d5:peersld7:peer id20:aaaaaaaaaaaaaaaaaaaa2:ip13:test_hostname4:porti1000eed7:peer id20:bbbbabaababababababa2:ip12:another_host4:porti1001eeee";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, false, sha1_hash());
+
+ TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.peers.size(), 2);
+ if (resp.peers.size() == 2)
+ {
+ peer_entry const& e0 = resp.peers[0];
+ peer_entry const& e1 = resp.peers[1];
+ TEST_EQUAL(e0.hostname, "test_hostname");
+ TEST_EQUAL(e0.port, 1000);
+ TEST_EQUAL(e0.pid, peer_id("aaaaaaaaaaaaaaaaaaaa"));
+
+ TEST_EQUAL(e1.hostname, "another_host");
+ TEST_EQUAL(e1.port, 1001);
+ TEST_EQUAL(e1.pid, peer_id("bbbbabaababababababa"));
+ }
+}
+
+void test_parse_peers4()
+{
+ char const response[] = "d5:peers12:\x01\x02\x03\x04\x30\x10"
+ "\x09\x08\x07\x06\x20\x10" "e";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, false, sha1_hash());
+
+ TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.peers4.size(), 2);
+ if (resp.peers.size() == 2)
+ {
+ ipv4_peer_entry const& e0 = resp.peers4[0];
+ ipv4_peer_entry const& e1 = resp.peers4[1];
+ TEST_CHECK(e0.ip == address_v4::from_string("1.2.3.4").to_bytes());
+ TEST_EQUAL(e0.port, 0x3010);
+
+ TEST_CHECK(e1.ip == address_v4::from_string("9.8.7.6").to_bytes());
+ TEST_EQUAL(e1.port, 0x2010);
+ }
+}
+
+void test_parse_interval()
+{
+ char const response[] = "d8:intervali1042e12:min intervali10e5:peers0:e";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, false, sha1_hash());
+
+ TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.peers.size(), 0);
+ TEST_EQUAL(resp.peers4.size(), 0);
+ TEST_EQUAL(resp.interval, 1042);
+ TEST_EQUAL(resp.min_interval, 10);
+}
+
+void test_parse_warning()
+{
+ char const response[] = "d5:peers0:15:warning message12:test messagee";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, false, sha1_hash());
+
+ TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.peers.size(), 0);
+ TEST_EQUAL(resp.warning_message, "test message");
+}
+
+void test_parse_failure_reason()
+{
+ char const response[] = "d5:peers0:14:failure reason12:test messagee";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, false, sha1_hash());
+
+ TEST_EQUAL(ec, error_code(errors::tracker_failure));
+ TEST_EQUAL(resp.peers.size(), 0);
+ TEST_EQUAL(resp.failure_reason, "test message");
+}
+
+void test_parse_scrape_response()
+{
+ char const response[] = "d5:filesd20:aaaaaaaaaaaaaaaaaaaad8:completei1e10:incompletei2e10:downloadedi3e11:downloadersi6eeee";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, true, sha1_hash("aaaaaaaaaaaaaaaaaaaa"));
+
+ TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.complete, 1);
+ TEST_EQUAL(resp.incomplete, 2);
+ TEST_EQUAL(resp.downloaded, 3);
+ TEST_EQUAL(resp.downloaders, 6);
+}
+
+void test_parse_scrape_response_with_zero()
+{
+ char const response[] = "d5:filesd20:aaa\0aaaaaaaaaaaaaaaad8:completei4e10:incompletei5e10:downloadedi6eeee";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, true, sha1_hash("aaa\0aaaaaaaaaaaaaaaa"));
+
+ TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.complete, 1);
+ TEST_EQUAL(resp.incomplete, 2);
+ TEST_EQUAL(resp.downloaded, 3);
+ TEST_EQUAL(resp.downloaders, -1);
+}
+
+void test_parse_external_ip()
+{
+ char const response[] = "d5:peers0:11:external ip4:\x01\x02\x03\x04" "e";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, false, sha1_hash());
+
+ TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.peers.size(), 0);
+ TEST_EQUAL(resp.external_ip, address_v4::from_string("1.2.3.4"));
+}
+
+#if TORRENT_USE_IPV6
+void test_parse_external_ip6()
+{
+ char const response[] = "d5:peers0:11:external ip16:\xf1\x02\x03\x04\0\0\0\0\0\0\0\0\0\0\xff\xff" "e";
+ error_code ec;
+ tracker_response resp = parse_tracker_response(response, sizeof(response) - 1
+ , ec, false, sha1_hash());
+
+ TEST_EQUAL(ec, error_code());
+ TEST_EQUAL(resp.peers.size(), 0);
+ TEST_EQUAL(resp.external_ip, address_v6::from_string("f102:0304::ffff"));
+}
+#endif
+
int test_main()
{
+ test_parse_hostname_peers();
+ test_parse_peers4();
+ test_parse_interval();
+ test_parse_warning();
+ test_parse_failure_reason();
+ test_parse_scrape_response();
+ test_parse_scrape_response_with_zero();
+ test_parse_external_ip();
+#if TORRENT_USE_IPV6
+ test_parse_external_ip6();
+#endif
+
+ // TODO: test parse peers6
+ // TODO: test parse tracker-id
+ // TODO: test parse failure-reason
+ // TODO: test all failure paths
+ // invalid bencoding
+ // not a dictionary
+ // no files entry in scrape response
+ // no info-hash entry in scrape response
+ // malformed peers in peer list of dictionaries
+ // uneven number of bytes in peers and peers6 string responses
+
int http_port = start_web_server();
int udp_port = start_udp_tracker();
| ||