mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk libT) #3242 "use added.f's 'connectable' flag" -- added.

This commit is contained in:
Charles Kerr 2010-12-14 18:33:48 +00:00
parent a9d0190a0e
commit f8355d654f
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libtransmission/peer-mgr.c
View File

@ -79,10 +79,10 @@ enum
before it's considered too old and needs to be rebuilt */
PIECE_LIST_SHELF_LIFE_SECS = 60,
/* use for bitwise operations w/peer_atom.myflags */
/* use for bitwise operations w/peer_atom.flags2 */
MYFLAG_BANNED = 1,
/* use for bitwise operations w/peer_atom.myflags */
/* use for bitwise operations w/peer_atom.flags2 */
/* unreachable for now... but not banned.
* if they try to connect to us it's okay */
MYFLAG_UNREACHABLE = 2,
@ -123,7 +123,7 @@ struct peer_atom
{
uint8_t from;
uint8_t flags; /* these match the added_f flags */
uint8_t myflags; /* flags that aren't defined in added_f */
uint8_t flags2; /* flags that aren't defined in added_f */
uint8_t uploadOnly; /* UPLOAD_ONLY_ */
int8_t seedProbability; /* how likely is this to be a seed... [0..100] or -1 for unknown */
int8_t blocklisted; /* -1 for unknown, TRUE for blocklisted, FALSE for not blocklisted */
@ -1241,7 +1241,7 @@ addStrike( Torrent * t, tr_peer * peer )
if( ++peer->strikes >= MAX_BAD_PIECES_PER_PEER )
{
struct peer_atom * atom = peer->atom;
atom->myflags |= MYFLAG_BANNED;
atom->flags2 |= MYFLAG_BANNED;
peer->doPurge = 1;
tordbg( t, "banning peer %s", tr_atomAddrStr( atom ) );
}
@ -1649,7 +1649,7 @@ myHandshakeDoneCB( tr_handshake * handshake,
if( !readAnythingFromPeer )
{
tordbg( t, "marking peer %s as unreachable... numFails is %d", tr_atomAddrStr( atom ), (int)atom->numFails );
atom->myflags |= MYFLAG_UNREACHABLE;
atom->flags2 |= MYFLAG_UNREACHABLE;
}
}
}
@ -1663,9 +1663,14 @@ myHandshakeDoneCB( tr_handshake * handshake,
atom->time = tr_time( );
atom->piece_data_time = 0;
atom->lastConnectionAt = tr_time( );
atom->myflags &= ~MYFLAG_UNREACHABLE;
if( atom->myflags & MYFLAG_BANNED )
if( !tr_peerIoIsIncoming( io ) )
{
atom->flags |= ADDED_F_CONNECTABLE;
atom->flags2 &= ~MYFLAG_UNREACHABLE;
}
if( atom->flags2 & MYFLAG_BANNED )
{
tordbg( t, "banned peer %s tried to reconnect",
tr_atomAddrStr( atom ) );
@ -2931,7 +2936,7 @@ getReconnectIntervalSecs( const struct peer_atom * atom, const time_t now )
}
/* penalize peers that were unreachable the last time we tried */
if( atom->myflags & MYFLAG_UNREACHABLE )
if( atom->flags2 & MYFLAG_UNREACHABLE )
sec += sec;
dbgmsg( "reconnect interval for %s is %d seconds", tr_atomAddrStr( atom ), sec );
@ -3376,7 +3381,7 @@ isPeerCandidate( const tr_torrent * tor, struct peer_atom * atom, const time_t n
return FALSE;
/* not if they're banned... */
if( atom->myflags & MYFLAG_BANNED )
if( atom->flags2 & MYFLAG_BANNED )
return FALSE;
return TRUE;
@ -3435,6 +3440,10 @@ getPeerCandidateScore( const tr_torrent * tor, const struct peer_atom * atom, ui
i = tr_torrentIsSeed( tor ) ? 1 : 0;
score = addValToKey( score, 1, i );
/* prefer peers that are known to be connectible */
i = ( atom->flags & ADDED_F_CONNECTABLE ) ? 0 : 1;
score = addValToKey( score, 1, i );
/* prefer peers that we might have a chance of uploading to...
so lower seed probability is better */
if( atom->seedProbability == 100 ) i = 101;
@ -3560,7 +3569,7 @@ initiateConnection( tr_peerMgr * mgr, Torrent * t, struct peer_atom * atom )
{
tordbg( t, "peerIo not created; marking peer %s as unreachable",
tr_atomAddrStr( atom ) );
atom->myflags |= MYFLAG_UNREACHABLE;
atom->flags2 |= MYFLAG_UNREACHABLE;
atom->numFails++;
}
else

15
libtransmission/peer-mgr.h
View File

@ -38,13 +38,24 @@ struct tr_peer_stat;
struct tr_torrent;
typedef struct tr_peerMgr tr_peerMgr;
/* added_f's bitwise-or'ed flags */
enum
{
/* corresponds to ut_pex's added.f flags */
/* true if the peer supports encryption */
ADDED_F_ENCRYPTION_FLAG = 1,
/* corresponds to ut_pex's added.f flags */
/* true if the peer is a seed or partial seed */
ADDED_F_SEED_FLAG = 2,
/* true if the peer supports uTP */
ADDED_F_UTP_FLAGS = 4,
/* true if the peer has holepunch support */
ADDED_F_HOLEPUNCH = 8,
/* true if the peer telling us about this peer
* initiated the connection (implying that it is connectible) */
ADDED_F_CONNECTABLE = 16
};
typedef struct tr_pex