premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Magnus Jonsson 2004-01-15 01:29:43 +00:00
parent fde3a47daa
commit 1fba488c4d
3 changed files with 125 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/libtorrent/peer_id.hpp
View File

@ -46,6 +46,16 @@ namespace libtorrent
enum { number_size = 20 };
public:
void set_to_all_zero()
{
std::fill(m_number,m_number+number_size,0);
}
bool is_all_zeros() const
{
return std::count(m_number,m_number+number_size,0) == number_size;
}
bool operator==(const big_number& n) const
{
return std::equal(n.m_number, n.m_number+number_size, m_number);

61
include/libtorrent/policy.hpp
View File

@ -106,27 +106,41 @@ namespace libtorrent
// TODO: for the moment the peer_id is never updated
// when we get it from the peer. It's kindof useless
// in here right now.
struct peer_identification
{
peer_identification()
: ip(0,0)
{
id.set_to_all_zero();
}
peer_identification(address a, const peer_id &p)
: ip(a)
, id(p)
{
}
// If this info comes from a remote connection,
// port should be set to 0 to denote that the port is unknown.
address ip;
peer_id id;
};
struct peer
{
peer(const peer_id& pid, const address& a);
peer(const peer_identification &pid);
int total_download() const;
int total_upload() const;
bool operator==(const address& pip) const
{ return ip == pip; }
// the id of the peer. This is needed to store information
// about peers that aren't connected right now. This
// is to avoid peers reconnecting. unconnected entries
// will be saved a limited amount of time
peer_id id;
// the ip/port pair this peer is or was connected on
// TODO: if this peer was discovered by a remote connection,
// set port=0 to denote that port is unknown. Later if
// this ip comes from the tracker, fill in the right port.
address ip;
peer_identification id;
// the time when this peer was optimistically unchoked
// the last time.
@ -156,6 +170,35 @@ namespace libtorrent
peer_connection* connection;
};
// predicate used to check if two peers with likelyness are the same one
struct peer_information_matches
{
peer_information_matches(const peer_identification &id)
: this_id(id)
{
}
bool operator()(const peer&other_peer) const
{
return operator()(other_peer.id);
}
bool operator()(const peer_identification &other_id) const
{
return
this_id.ip.ip() == other_id.ip.ip()
// && (
// this_id.ip.port() == other_id.ip.port()
// || ((this_id.ip.port() == 0) ^ (other_id.ip.port() == 0)) // one of them unknown
// )
&& (
this_id.id == other_id.id
|| (this_id.id.is_all_zeros() ^ other_id.id.is_all_zeros()) // one of them unknown
);
}
peer_identification this_id;
};
bool unchoke_one_peer();
peer* find_choke_candidate();
peer* find_unchoke_candidate();

88
src/policy.cpp
View File

@ -366,6 +366,7 @@ namespace libtorrent
{
if(i->connection) continue;
if(i->banned) continue;
if(i->id.ip.port()==0) continue;
// TODO: Don't connect to peers that were discovered through
// remote connection, since we don't know the port.
@ -509,8 +510,13 @@ namespace libtorrent
void policy::ban_peer(const peer_connection& c)
{
address a(c.get_socket()->sender());
if(!c.is_local())
a=address(a.ip(),0);
peer_identification id(a,c.get_peer_id());
std::vector<peer>::iterator i =
std::find(m_peers.begin(), m_peers.end(), c.get_socket()->sender());
std::find_if(m_peers.begin(), m_peers.end(), peer_information_matches(id));
assert(i != m_peers.end());
i->banned = true;
@ -518,8 +524,14 @@ namespace libtorrent
void policy::new_connection(peer_connection& c)
{
std::vector<peer>::iterator i
= std::find(m_peers.begin(), m_peers.end(), c.get_socket()->sender());
assert(!c.is_local());
assert(!c.get_peer_id().is_all_zeros());
peer_identification pid(address(c.get_socket()->sender().ip(),0),c.get_peer_id());
std::vector<peer>::iterator i =
std::find_if(m_peers.begin(), m_peers.end(), peer_information_matches(pid));
if (i == m_peers.end())
{
using namespace boost::posix_time;
@ -528,8 +540,7 @@ namespace libtorrent
// we don't have ny info about this peer.
// add a new entry
peer p(c.get_peer_id(), c.get_socket()->sender());
peer p(pid);
m_peers.push_back(p);
i = m_peers.end()-1;
}
@ -545,10 +556,15 @@ namespace libtorrent
void policy::peer_from_tracker(const address& remote, const peer_id& id)
{
assert(remote.ip()!=0);
assert(remote.port()!=0);
try
{
peer_identification pid(remote,id);
std::vector<peer>::iterator i =
std::find(m_peers.begin(), m_peers.end(), remote);
std::find_if(m_peers.begin(), m_peers.end(), peer_information_matches(pid));
if (i == m_peers.end())
{
using namespace boost::posix_time;
@ -556,23 +572,35 @@ namespace libtorrent
// we don't have ny info about this peer.
// add a new entry
peer p(id, remote);
peer p(pid);
m_peers.push_back(p);
i = m_peers.end()-1;
}
else if (!i->connection == 0)
else
{
// this means we're already connected
// to this peer. don't connect to
// it again.
assert(i->connection->associated_torrent() == m_torrent);
return;
// in case we got the ip from a remote connection, port is
// not known, so save it. Client may also have changed port
// for some reason.
i->id.ip=remote;
// fill in peer id if missing
if(!id.is_all_zeros())
i->id.id=id;
if (i->connection)
{
// this means we're already connected
// to this peer. don't connect to
// it again.
assert(i->connection->associated_torrent() == m_torrent);
return;
}
}
// if (i->banned) return;
if (i->banned) return;
// i->connected = boost::posix_time::second_clock::local_time();
// i->connection = &m_torrent->connect_to_peer(remote, id);
i->connection = &m_torrent->connect_to_peer(remote, id);
i->connected = boost::posix_time::second_clock::local_time();
return;
}
catch(network_error& e)
@ -682,8 +710,9 @@ namespace libtorrent
if (p==0) return false;
assert(!p->banned);
assert(!p->connection);
assert(p->id.ip.port()!=0);
p->connection = &m_torrent->connect_to_peer(p->ip, p->id);
p->connection = &m_torrent->connect_to_peer(p->id.ip, p->id.id);
p->connected = boost::posix_time::second_clock::local_time();
return true;
}
@ -691,10 +720,16 @@ namespace libtorrent
// this is called whenever a peer connection is closed
void policy::connection_closed(const peer_connection& c)
{
std::vector<peer>::iterator i
= std::find(m_peers.begin(), m_peers.end(), c.get_socket()->sender());
address a(c.get_socket()->sender());
if(!c.is_local())
a=address(a.ip(),0);
peer_identification cid(a,c.get_peer_id());
std::vector<peer>::iterator i =
std::find_if(m_peers.begin(), m_peers.end(), peer_information_matches(cid));
assert(i != m_peers.end());
assert(i->connection==&c);
i->connected = boost::posix_time::second_clock::local_time();
i->prev_amount_download += c.statistics().total_payload_download();
@ -731,10 +766,15 @@ namespace libtorrent
}
#ifndef NDEBUG
bool policy::has_connection(const peer_connection* p)
bool policy::has_connection(const peer_connection* c)
{
return std::find(m_peers.begin(), m_peers.end(), p->get_socket()->sender())
!= m_peers.end();
address a(c->get_socket()->sender());
if(!c->is_local())
a=address(a.ip(),0);
peer_identification id(a,c->get_peer_id());
return m_peers.end() !=
std::find_if(m_peers.begin(), m_peers.end(), peer_information_matches(id));
}
void policy::check_invariant()
@ -753,10 +793,8 @@ namespace libtorrent
#endif
policy::peer::peer(
const peer_id& pid
, const address& a)
const peer_identification& pid)
: id(pid)
, ip(a)
, last_optimistically_unchoked(
boost::gregorian::date(1970,boost::gregorian::Jan,1))
//, connected(boost::posix_time::second_clock::local_time())