codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refresh to lt rev 1290

This commit is contained in:
Marcos Pinto 2007-05-25 22:40:26 +00:00
parent 0ea75cd486
commit fc7c3b142e
13 changed files with 220 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libtorrent/include/libtorrent/bt_peer_connection.hpp
View File

@ -130,7 +130,7 @@ namespace libtorrent
void on_receive(asio::error_code const& error
, std::size_t bytes_transferred);
virtual void get_peer_info(peer_info& p) const;
virtual void get_specific_peer_info(peer_info& p) const;
virtual bool in_handshake() const;
#ifndef TORRENT_DISABLE_EXTENSIONS
@ -273,4 +273,3 @@ namespace libtorrent
}
#endif // TORRENT_BT_PEER_CONNECTION_HPP_INCLUDED

29
libtorrent/include/libtorrent/peer_connection.hpp
View File

@ -174,9 +174,6 @@ namespace libtorrent
void set_non_prioritized(bool b)
{ m_non_prioritized = b; }
bool on_parole() const
{ return m_on_parole; }
// this adds an announcement in the announcement queue
// it will let the peer know that we have the given piece
void announce_piece(int index);
@ -209,6 +206,8 @@ namespace libtorrent
void update_interest();
virtual void get_peer_info(peer_info& p) const;
// returns the torrent this connection is a part of
// may be zero if the connection is an incoming connection
// and it hasn't received enough information to determine
@ -264,7 +263,6 @@ namespace libtorrent
// trust management.
void received_valid_data(int index);
void received_invalid_data(int index);
int trust_points() const;
size_type share_diff() const;
@ -335,7 +333,6 @@ namespace libtorrent
ptime m_last_choke;
#endif
virtual void get_peer_info(peer_info& p) const = 0;
// is true until we can be sure that the other end
// speaks our protocol (be it bittorrent or http).
@ -371,6 +368,8 @@ namespace libtorrent
protected:
virtual void get_specific_peer_info(peer_info& p) const = 0;
virtual void write_choke() = 0;
virtual void write_unchoke() = 0;
virtual void write_interested() = 0;
@ -475,6 +474,9 @@ namespace libtorrent
// the time when we last got a part of a
// piece packet from this peer
ptime m_last_piece;
// the time we sent a request to
// this peer the last time
ptime m_last_request;
int m_packet_size;
int m_recv_pos;
@ -582,14 +584,6 @@ namespace libtorrent
// that we give the free upload, to keep the balance.
size_type m_free_upload;
// for every valid piece we receive where this
// peer was one of the participants, we increase
// this value. For every invalid piece we receive
// where this peer was a participant, we decrease
// this value. If it sinks below a threshold, its
// considered a bad peer and will be banned.
int m_trust_points;
// if this is true, this peer is assumed to handle all piece
// requests in fifo order. All skipped blocks are re-requested
// immediately instead of having a looser requirement
@ -645,14 +639,6 @@ namespace libtorrent
// are preferred.
bool m_prefer_whole_pieces;
// if this is true, the peer has previously participated
// in a piece that failed the piece hash check. This will
// put the peer on parole and only request entire pieces.
// if a piece pass that was partially requested from this
// peer it will leave parole mode and continue download
// pieces as normal peers.
bool m_on_parole;
// if this is true, the blocks picked by the piece
// picker will be merged before passed to the
// request function. i.e. subsequent blocks are
@ -696,4 +682,3 @@ namespace libtorrent
}
#endif // TORRENT_PEER_CONNECTION_HPP_INCLUDED

17
libtorrent/include/libtorrent/peer_info.hpp
View File

@ -54,7 +54,9 @@ namespace libtorrent
local_connection = 0x20,
handshake = 0x40,
connecting = 0x80,
queued = 0x100
queued = 0x100,
on_parole = 0x200,
seed = 0x400
};
unsigned int flags;
@ -79,10 +81,21 @@ namespace libtorrent
size_type total_upload;
peer_id pid;
std::vector<bool> pieces;
bool seed; // true if this is a seed
int upload_limit;
int download_limit;
// time since last request
time_duration last_request;
// time since last download or upload
time_duration last_active;
// the size of the send buffer for this peer
int send_buffer_size;
// the number of failed hashes for this peer
int num_hashfails;
#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
// in case the session settings is set
// to resolve countries, this is set to

21
libtorrent/include/libtorrent/policy.hpp
View File

@ -138,6 +138,10 @@ namespace libtorrent
// the number of failed connection attempts this peer has
int failcount;
// the number of times this peer has been
// part of a piece that failed the hash check
int hashfails;
// this is true if the peer is a seed
bool seed;
@ -149,6 +153,22 @@ namespace libtorrent
// or disconnected if it isn't connected right now
libtorrent::ptime connected;
// for every valid piece we receive where this
// peer was one of the participants, we increase
// this value. For every invalid piece we receive
// where this peer was a participant, we decrease
// this value. If it sinks below a threshold, its
// considered a bad peer and will be banned.
int trust_points;
// if this is true, the peer has previously participated
// in a piece that failed the piece hash check. This will
// put the peer on parole and only request entire pieces.
// if a piece pass that was partially requested from this
// peer it will leave parole mode and continue download
// pieces as normal peers.
bool on_parole;
// this is the accumulated amount of
// uploaded and downloaded data to this
// peer. It only accounts for what was
@ -229,4 +249,3 @@ namespace libtorrent
}
#endif // TORRENT_POLICY_HPP_INCLUDED

15
libtorrent/include/libtorrent/session_settings.hpp
View File

@ -99,6 +99,8 @@ namespace libtorrent
, min_reconnect_time(60)
, peer_connect_timeout(10)
, ignore_limits_on_local_network(true)
, connection_speed(20)
, send_redundant_have(false)
#ifndef TORRENT_DISABLE_DHT
, use_dht_as_fallback(true)
#endif
@ -204,9 +206,19 @@ namespace libtorrent
int peer_connect_timeout;
// if set to true, upload, download and unchoke limits
// are ignored for peers on the local network
// are ignored for peers on the local network.
bool ignore_limits_on_local_network;
// the number of connection attempts that
// are made per second.
int connection_speed;
// if this is set to true, have messages will be sent
// to peers that already have the piece. This is
// typically not necessary, but it might be necessary
// for collecting statistics in some cases. Default is false.
bool send_redundant_have;
#ifndef TORRENT_DISABLE_DHT
// while this is true, the dht will note be used unless the
// tracker is online
@ -245,3 +257,4 @@ namespace libtorrent
}
#endif

3
libtorrent/include/libtorrent/torrent.hpp
View File

@ -250,7 +250,7 @@ namespace libtorrent
void remove_peer(peer_connection* p);
bool want_more_peers() const;
void try_connect_peer();
bool try_connect_peer();
peer_connection* connection_for(tcp::endpoint const& a)
{
@ -769,3 +769,4 @@ namespace libtorrent
#endif // TORRENT_TORRENT_HPP_INCLUDED

3
libtorrent/include/libtorrent/web_peer_connection.hpp
View File

@ -111,7 +111,7 @@ namespace libtorrent
std::string const& url() const { return m_url; }
virtual void get_peer_info(peer_info& p) const;
virtual void get_specific_peer_info(peer_info& p) const;
virtual bool in_handshake() const;
// the following functions appends messages
@ -177,3 +177,4 @@ namespace libtorrent
#endif // TORRENT_WEB_PEER_CONNECTION_HPP_INCLUDED

63
libtorrent/src/bt_peer_connection.cpp
View File

@ -179,56 +179,10 @@ namespace libtorrent
setup_send();
}
void bt_peer_connection::get_peer_info(peer_info& p) const
void bt_peer_connection::get_specific_peer_info(peer_info& p) const
{
assert(!associated_torrent().expired());
p.down_speed = statistics().download_rate();
p.up_speed = statistics().upload_rate();
p.payload_down_speed = statistics().download_payload_rate();
p.payload_up_speed = statistics().upload_payload_rate();
p.pid = pid();
p.ip = remote();
#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
p.country[0] = m_country[0];
p.country[1] = m_country[1];
#endif
p.total_download = statistics().total_payload_download();
p.total_upload = statistics().total_payload_upload();
if (m_bandwidth_limit[upload_channel].throttle() == bandwidth_limit::inf)
p.upload_limit = -1;
else
p.upload_limit = m_bandwidth_limit[upload_channel].throttle();
if (m_bandwidth_limit[download_channel].throttle() == bandwidth_limit::inf)
p.download_limit = -1;
else
p.download_limit = m_bandwidth_limit[download_channel].throttle();
p.load_balancing = total_free_upload();
p.download_queue_length = (int)download_queue().size();
p.upload_queue_length = (int)upload_queue().size();
if (boost::optional<piece_block_progress> ret = downloading_piece_progress())
{
p.downloading_piece_index = ret->piece_index;
p.downloading_block_index = ret->block_index;
p.downloading_progress = ret->bytes_downloaded;
p.downloading_total = ret->full_block_bytes;
}
else
{
p.downloading_piece_index = -1;
p.downloading_block_index = -1;
p.downloading_progress = 0;
p.downloading_total = 0;
}
p.flags = 0;
if (is_interesting()) p.flags |= peer_info::interesting;
if (is_choked()) p.flags |= peer_info::choked;
if (is_peer_interested()) p.flags |= peer_info::remote_interested;
@ -240,23 +194,9 @@ namespace libtorrent
if (is_connecting() && !is_queued()) p.flags |= peer_info::connecting;
if (is_queued()) p.flags |= peer_info::queued;
p.pieces = get_bitfield();
p.seed = is_seed();
p.client = m_client_version;
p.connection_type = peer_info::standard_bittorrent;
if (peer_info_struct())
{
p.source = peer_info_struct()->source;
p.failcount = peer_info_struct()->failcount;
}
else
{
assert(!is_local());
p.source = 0;
p.failcount = 0;
}
}
bool bt_peer_connection::in_handshake() const
@ -1376,3 +1316,4 @@ namespace libtorrent
}

127
libtorrent/src/peer_connection.cpp
View File

@ -90,6 +90,7 @@ namespace libtorrent
, m_max_out_request_queue(m_ses.settings().max_out_request_queue)
, m_timeout(m_ses.settings().peer_timeout)
, m_last_piece(time_now())
, m_last_request(time_now())
, m_packet_size(0)
, m_recv_pos(0)
, m_current_send_buffer(0)
@ -109,7 +110,6 @@ namespace libtorrent
, m_num_pieces(0)
, m_desired_queue_size(2)
, m_free_upload(0)
, m_trust_points(0)
, m_assume_fifo(false)
, m_num_invalid_requests(0)
, m_disconnecting(false)
@ -120,7 +120,6 @@ namespace libtorrent
, m_writing(false)
, m_reading(false)
, m_prefer_whole_pieces(false)
, m_on_parole(false)
, m_request_large_blocks(false)
, m_non_prioritized(false)
, m_refs(0)
@ -164,6 +163,7 @@ namespace libtorrent
, m_max_out_request_queue(m_ses.settings().max_out_request_queue)
, m_timeout(m_ses.settings().peer_timeout)
, m_last_piece(time_now())
, m_last_request(time_now())
, m_packet_size(0)
, m_recv_pos(0)
, m_current_send_buffer(0)
@ -181,7 +181,6 @@ namespace libtorrent
, m_num_pieces(0)
, m_desired_queue_size(2)
, m_free_upload(0)
, m_trust_points(0)
, m_assume_fifo(false)
, m_num_invalid_requests(0)
, m_disconnecting(false)
@ -192,7 +191,6 @@ namespace libtorrent
, m_writing(false)
, m_reading(false)
, m_prefer_whole_pieces(false)
, m_on_parole(false)
, m_request_large_blocks(false)
, m_non_prioritized(false)
, m_refs(0)
@ -340,7 +338,8 @@ namespace libtorrent
{
// optimization, don't send have messages
// to peers that already have the piece
if (has_piece(index)) return;
if (!m_ses.settings().send_redundant_have
&& has_piece(index)) return;
#ifdef TORRENT_VERBOSE_LOGGING
(*m_logger) << time_now_string()
@ -405,11 +404,14 @@ namespace libtorrent
}
#endif
m_on_parole = false;
m_trust_points++;
if (peer_info_struct())
{
peer_info_struct()->on_parole = false;
int& trust_points = peer_info_struct()->trust_points;
trust_points++;
// TODO: make this limit user settable
if (m_trust_points > 20) m_trust_points = 20;
if (trust_points > 20) trust_points = 20;
}
}
void peer_connection::received_invalid_data(int index)
@ -424,18 +426,18 @@ namespace libtorrent
}
#endif
m_on_parole = true;
if (peer_info_struct())
{
peer_info_struct()->on_parole = true;
++peer_info_struct()->hashfails;
int& trust_points = peer_info_struct()->trust_points;
// we decrease more than we increase, to keep the
// allowed failed/passed ratio low.
// TODO: make this limit user settable
m_trust_points -= 2;
if (m_trust_points < -7) m_trust_points = -7;
trust_points -= 2;
if (trust_points < -7) trust_points = -7;
}
int peer_connection::trust_points() const
{
return m_trust_points;
}
size_type peer_connection::total_free_upload() const
@ -1557,9 +1559,14 @@ namespace libtorrent
{
if (handled = (*i)->write_request(r)) break;
}
if (!handled) write_request(r);
if (!handled)
{
write_request(r);
m_last_request = time_now();
}
#else
write_request(r);
m_last_request = time_now();
#endif
#ifdef TORRENT_VERBOSE_LOGGING
@ -1678,6 +1685,81 @@ namespace libtorrent
return false;
}
void peer_connection::get_peer_info(peer_info& p) const
{
assert(!associated_torrent().expired());
p.down_speed = statistics().download_rate();
p.up_speed = statistics().upload_rate();
p.payload_down_speed = statistics().download_payload_rate();
p.payload_up_speed = statistics().upload_payload_rate();
p.pid = pid();
p.ip = remote();
#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
p.country[0] = m_country[0];
p.country[1] = m_country[1];
#endif
p.total_download = statistics().total_payload_download();
p.total_upload = statistics().total_payload_upload();
if (m_bandwidth_limit[upload_channel].throttle() == bandwidth_limit::inf)
p.upload_limit = -1;
else
p.upload_limit = m_bandwidth_limit[upload_channel].throttle();
if (m_bandwidth_limit[download_channel].throttle() == bandwidth_limit::inf)
p.download_limit = -1;
else
p.download_limit = m_bandwidth_limit[download_channel].throttle();
p.load_balancing = total_free_upload();
p.download_queue_length = (int)download_queue().size();
p.upload_queue_length = (int)upload_queue().size();
if (boost::optional<piece_block_progress> ret = downloading_piece_progress())
{
p.downloading_piece_index = ret->piece_index;
p.downloading_block_index = ret->block_index;
p.downloading_progress = ret->bytes_downloaded;
p.downloading_total = ret->full_block_bytes;
}
else
{
p.downloading_piece_index = -1;
p.downloading_block_index = -1;
p.downloading_progress = 0;
p.downloading_total = 0;
}
p.pieces = get_bitfield();
ptime now = time_now();
p.last_request = now - m_last_request;
p.last_active = now - std::max(m_last_sent, m_last_receive);
// this will set the flags so that we can update them later
p.flags = 0;
get_specific_peer_info(p);
p.flags |= is_seed() ? peer_info::seed : 0;
if (peer_info_struct())
{
p.source = peer_info_struct()->source;
p.failcount = peer_info_struct()->failcount;
p.num_hashfails = peer_info_struct()->hashfails;
p.flags |= peer_info_struct()->on_parole ? peer_info::on_parole : 0;
}
else
{
p.source = 0;
p.failcount = 0;
p.num_hashfails = 0;
}
p.send_buffer_size = send_buffer_size();
}
void peer_connection::cut_receive_buffer(int size, int packet_size)
{
@ -2131,10 +2213,6 @@ namespace libtorrent
assert(m_reading);
m_reading = false;
#ifdef TORRENT_VERBOSE_LOGGING
(*m_logger) << "read " << bytes_transferred << " bytes\n";
#endif
if (error)
{
#ifdef TORRENT_VERBOSE_LOGGING
@ -2146,6 +2224,9 @@ namespace libtorrent
do
{
#ifdef TORRENT_VERBOSE_LOGGING
(*m_logger) << "read " << bytes_transferred << " bytes\n";
#endif
// correct the dl quota usage, if not all of the buffer was actually read
if (!m_ignore_bandwidth_limits)
m_bandwidth_limit[download_channel].use_quota(bytes_transferred);
@ -2185,9 +2266,6 @@ namespace libtorrent
, max_receive), ec);
if (ec && ec != asio::error::would_block)
throw asio::system_error(ec);
#ifdef TORRENT_VERBOSE_LOGGING
(*m_logger) << "read_some " << bytes_transferred << " bytes\n";
#endif
}
while (bytes_transferred > 0);
@ -2564,3 +2642,4 @@ namespace libtorrent
}
}

6
libtorrent/src/policy.cpp
View File

@ -187,7 +187,7 @@ namespace libtorrent
interesting_pieces.reserve(100);
bool prefer_whole_pieces = c.prefer_whole_pieces()
|| c.on_parole();
|| (c.peer_info_struct() && c.peer_info_struct()->on_parole);
if (!prefer_whole_pieces)
{
@ -1394,9 +1394,12 @@ namespace libtorrent
: ip(ip_)
, type(t)
, failcount(0)
, hashfails(0)
, seed(false)
, last_optimistically_unchoked(min_time())
, connected(min_time())
, trust_points(0)
, on_parole(false)
, prev_amount_upload(0)
, prev_amount_download(0)
, banned(false)
@ -1433,3 +1436,4 @@ namespace libtorrent
}
}

42
libtorrent/src/session_impl.cpp
View File

@ -622,6 +622,8 @@ namespace libtorrent { namespace detail
void session_impl::set_settings(session_settings const& s)
{
mutex_t::scoped_lock l(m_mutex);
assert(s.connection_speed > 0);
assert(s.file_pool_size > 0);
m_settings = s;
m_files.resize(m_settings.file_pool_size);
// replace all occurances of '\n' with ' '.
@ -891,29 +893,52 @@ namespace libtorrent { namespace detail
// let torrents connect to peers if they want to
// if there are any torrents and any free slots
// this loop will "hand out" max(connection_speed
// , half_open.free_slots()) to the torrents, in a
// round robin fashion, so that every torrent is
// equallt likely to connect to a peer
if (!m_torrents.empty() && m_half_open.free_slots())
{
torrent_map::iterator next_connect_torrent = m_torrents.begin();
// this is the maximum number of connections we will
// attempt this tick
int max_connections = m_settings.connection_speed;
torrent_map::iterator i = m_torrents.begin();
if (m_next_connect_torrent < int(m_torrents.size()))
std::advance(next_connect_torrent, m_next_connect_torrent);
std::advance(i, m_next_connect_torrent);
else
m_next_connect_torrent = 0;
torrent_map::iterator i = next_connect_torrent;
do
int steps_since_last_connect = 0;
int num_torrents = int(m_torrents.size());
for (;;)
{
torrent& t = *i->second;
if (t.want_more_peers())
t.try_connect_peer();
if (t.try_connect_peer())
{
--max_connections;
steps_since_last_connect = 0;
}
++m_next_connect_torrent;
if (!m_half_open.free_slots()) break;
++steps_since_last_connect;
++i;
if (i == m_torrents.end())
{
assert(m_next_connect_torrent == int(m_torrents.size()));
assert(m_next_connect_torrent == num_torrents);
i = m_torrents.begin();
m_next_connect_torrent = 0;
}
} while (i != next_connect_torrent);
// if we have gone one whole loop without
// handing out a single connection, break
if (steps_since_last_connect > num_torrents) break;
// if there are no more free connection slots, abort
if (m_half_open.free_slots() == 0) break;
// if we should not make any more connections
// attempts this tick, abort
if (max_connections == 0) break;
}
}
// do the second_tick() on each connection
@ -2061,3 +2086,4 @@ namespace libtorrent { namespace detail
}
}}

12
libtorrent/src/torrent.cpp
View File

@ -903,13 +903,16 @@ namespace libtorrent
, end(peers.end()); i != end; ++i)
{
peer_iterator p = m_connections.find(*i);
peer_connection& peer = *p->second;
if (p == m_connections.end()) continue;
p->second->received_invalid_data(index);
peer.received_invalid_data(index);
// either, we have received too many failed hashes
// or this was the only peer that sent us this piece.
// TODO: make this a changable setting
if (p->second->trust_points() <= -7 || peers.size() == 1)
if ((peer.peer_info_struct()
&& peer.peer_info_struct()->trust_points <= -7)
|| peers.size() == 1)
{
// we don't trust this peer anymore
// ban it.
@ -2481,10 +2484,10 @@ namespace libtorrent
m_stat.second_tick(tick_interval);
}
void torrent::try_connect_peer()
bool torrent::try_connect_peer()
{
assert(want_more_peers());
m_policy->connect_one_peer();
return m_policy->connect_one_peer();
}
void torrent::distribute_resources(float tick_interval)
@ -2766,3 +2769,4 @@ namespace libtorrent
}

56
libtorrent/src/web_peer_connection.cpp
View File

@ -592,56 +592,8 @@ namespace libtorrent
}
}
void web_peer_connection::get_peer_info(peer_info& p) const
void web_peer_connection::get_specific_peer_info(peer_info& p) const
{
assert(!associated_torrent().expired());
p.down_speed = statistics().download_rate();
p.up_speed = statistics().upload_rate();
p.payload_down_speed = statistics().download_payload_rate();
p.payload_up_speed = statistics().upload_payload_rate();
p.pid = pid();
p.ip = remote();
#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
p.country[0] = m_country[0];
p.country[1] = m_country[1];
#endif
p.total_download = statistics().total_payload_download();
p.total_upload = statistics().total_payload_upload();
if (m_bandwidth_limit[upload_channel].throttle() == bandwidth_limit::inf)
p.upload_limit = -1;
else
p.upload_limit = m_bandwidth_limit[upload_channel].throttle();
if (m_bandwidth_limit[download_channel].throttle() == bandwidth_limit::inf)
p.download_limit = -1;
else
p.download_limit = m_bandwidth_limit[download_channel].throttle();
p.load_balancing = total_free_upload();
p.download_queue_length = (int)download_queue().size();
p.upload_queue_length = (int)upload_queue().size();
if (boost::optional<piece_block_progress> ret = downloading_piece_progress())
{
p.downloading_piece_index = ret->piece_index;
p.downloading_block_index = ret->block_index;
p.downloading_progress = ret->bytes_downloaded;
p.downloading_total = ret->full_block_bytes;
}
else
{
p.downloading_piece_index = -1;
p.downloading_block_index = -1;
p.downloading_progress = 0;
p.downloading_total = 0;
}
p.flags = 0;
if (is_interesting()) p.flags |= peer_info::interesting;
if (is_choked()) p.flags |= peer_info::choked;
if (is_peer_interested()) p.flags |= peer_info::remote_interested;
@ -652,13 +604,8 @@ namespace libtorrent
if (is_connecting() && !is_queued()) p.flags |= peer_info::connecting;
if (is_queued()) p.flags |= peer_info::queued;
p.pieces = get_bitfield();
p.seed = is_seed();
p.client = m_server_string;
p.connection_type = peer_info::web_seed;
p.source = 0;
p.failcount = 0;
}
bool web_peer_connection::in_handshake() const
@ -690,3 +637,4 @@ namespace libtorrent
}