wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

some cleanups

This commit is contained in:
Arvid Norberg 2018-04-04 21:54:15 +02:00 committed by Arvid Norberg
parent a5e0578c88
commit 357217326d
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/peer_connection.cpp
View File

@ -381,14 +381,12 @@ namespace libtorrent
return; return;
} }
tcp::endpoint bound_ip = m_ses.bind_outgoing_socket(*m_socket
, m_remote.address(), ec);
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
tcp::endpoint const bound_ip = m_ses.bind_outgoing_socket(*m_socket
, m_remote.address(), ec);
peer_log(peer_log_alert::outgoing, "BIND", "dst: %s ec: %s" peer_log(peer_log_alert::outgoing, "BIND", "dst: %s ec: %s"
, print_endpoint(bound_ip).c_str() , print_endpoint(bound_ip).c_str()
, ec.message().c_str()); , ec.message().c_str());
#else
TORRENT_UNUSED(bound_ip);
#endif #endif
if (ec) if (ec)
{ {
@ -2226,12 +2224,13 @@ namespace libtorrent
boost::shared_ptr<torrent> t = m_torrent.lock(); boost::shared_ptr<torrent> t = m_torrent.lock();
TORRENT_ASSERT(t); TORRENT_ASSERT(t);
torrent_info const& ti = t->torrent_file();
m_counters.inc_stats_counter(counters::piece_requests); m_counters.inc_stats_counter(counters::piece_requests);
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
const bool valid_piece_index const bool valid_piece_index
= r.piece >= 0 && r.piece < int(t->torrent_file().num_pieces()); = r.piece >= 0 && r.piece < int(ti.num_pieces());
peer_log(peer_log_alert::incoming_message, "REQUEST" peer_log(peer_log_alert::incoming_message, "REQUEST"
, "piece: %d s: %x l: %x", r.piece, r.start, r.length); , "piece: %d s: %x l: %x", r.piece, r.start, r.length);
@ -2247,9 +2246,9 @@ namespace libtorrent
"i: %d t: %d n: %d h: %d ss1: %d ss2: %d" "i: %d t: %d n: %d h: %d ss1: %d ss2: %d"
, m_peer_interested , m_peer_interested
, valid_piece_index , valid_piece_index
? int(t->torrent_file().piece_size(r.piece)) ? int(ti.piece_size(r.piece))
: -1 : -1
, t->torrent_file().num_pieces() , ti.num_pieces()
, valid_piece_index ? t->has_piece_passed(r.piece) : 0 , valid_piece_index ? t->has_piece_passed(r.piece) : 0
, m_superseed_piece[0] , m_superseed_piece[0]
, m_superseed_piece[1]); , m_superseed_piece[1]);
@ -2325,8 +2324,8 @@ namespace libtorrent
peer_log(peer_log_alert::info, "INVALID_REQUEST", "peer is not interested " peer_log(peer_log_alert::info, "INVALID_REQUEST", "peer is not interested "
" t: %d n: %d block_limit: %d" " t: %d n: %d block_limit: %d"
, valid_piece_index , valid_piece_index
? int(t->torrent_file().piece_size(r.piece)) : -1 ? int(ti.piece_size(r.piece)) : -1
, t->torrent_file().num_pieces() , ti.num_pieces()
, t->block_size()); , t->block_size());
peer_log(peer_log_alert::info, "INTERESTED", "artificial incoming INTERESTED message"); peer_log(peer_log_alert::info, "INTERESTED", "artificial incoming INTERESTED message");
#endif #endif
@ -2349,14 +2348,14 @@ namespace libtorrent
// is legal and that the peer // is legal and that the peer
// is not choked // is not choked
if (r.piece < 0 if (r.piece < 0
|| r.piece >= t->torrent_file().num_pieces() || r.piece >= ti.num_pieces()
|| (!t->has_piece_passed(r.piece) || (!t->has_piece_passed(r.piece)
&& !t->is_predictive_piece(r.piece) && !t->is_predictive_piece(r.piece)
&& !t->seed_mode()) && !t->seed_mode())
|| r.start < 0 || r.start < 0
|| r.start >= t->torrent_file().piece_size(r.piece) || r.start >= ti.piece_size(r.piece)
|| r.length <= 0 || r.length <= 0
|| r.length + r.start > t->torrent_file().piece_size(r.piece) || r.length + r.start > ti.piece_size(r.piece)
|| r.length > t->block_size()) || r.length > t->block_size())
{ {
m_counters.inc_stats_counter(counters::invalid_piece_requests); m_counters.inc_stats_counter(counters::invalid_piece_requests);
@ -2366,8 +2365,8 @@ namespace libtorrent
, "i: %d t: %d n: %d h: %d block_limit: %d" , "i: %d t: %d n: %d h: %d block_limit: %d"
, m_peer_interested , m_peer_interested
, valid_piece_index , valid_piece_index
? int(t->torrent_file().piece_size(r.piece)) : -1 ? int(ti.piece_size(r.piece)) : -1
, t->torrent_file().num_pieces() , ti.num_pieces()
, t->has_piece_passed(r.piece) , t->has_piece_passed(r.piece)
, t->block_size()); , t->block_size());
@ -2414,7 +2413,7 @@ namespace libtorrent
// if we have choked the client // if we have choked the client
// ignore the request // ignore the request
const int blocks_per_piece = static_cast<int>( const int blocks_per_piece = static_cast<int>(
(t->torrent_file().piece_length() + t->block_size() - 1) / t->block_size()); (ti.piece_length() + t->block_size() - 1) / t->block_size());
// disconnect peers that downloads more than foo times an allowed // disconnect peers that downloads more than foo times an allowed
// fast piece // fast piece
@ -2455,7 +2454,7 @@ namespace libtorrent
TORRENT_ASSERT(t->valid_metadata()); TORRENT_ASSERT(t->valid_metadata());
TORRENT_ASSERT(r.piece >= 0); TORRENT_ASSERT(r.piece >= 0);
TORRENT_ASSERT(r.piece < t->torrent_file().num_pieces()); TORRENT_ASSERT(r.piece < ti.num_pieces());
m_requests.push_back(r); m_requests.push_back(r);
@ -5318,11 +5317,8 @@ namespace libtorrent
peer_log(peer_log_alert::info, "SEED_MODE_FILE_HASH" peer_log(peer_log_alert::info, "SEED_MODE_FILE_HASH"
, "piece: %d passed", j->piece); , "piece: %d passed", j->piece);
#endif #endif
if (t) if (t->seed_mode() && t->all_verified())
{ t->leave_seed_mode(true);
if (t->seed_mode() && t->all_verified())
t->leave_seed_mode(true);
}
} }
// try to service the requests again, now that the piece // try to service the requests again, now that the piece