Changeset 3411

Timestamp:

Oct 14, 2007, 5:21:24 PM (15 years ago)

Author:

charles

Message:

Fix bug that could initiate pex in private torrents.

Location:

trunk/libtransmission

Files:

• internal.h (modified) (1 diff)
• peer-mgr.c (modified) (2 diffs)
• peer-msgs.c (modified) (5 diffs)
• torrent.c (modified) (1 diff)

trunk/libtransmission/internal.h

@@ -62 +62 @@
 void tr_torrentUnlock  ( const tr_torrent * );
 
+int tr_torrentIsPexEnabled( const tr_torrent * );
+
 void tr_torrentChangeMyPort  ( tr_torrent * );
 

trunk/libtransmission/peer-mgr.c

@@ -1506 +1506 @@
         const int clientIsSeed = tr_cpGetStatus( tor->completion ) != TR_CP_INCOMPLETE;
         const int peerIsSeed = atom->flags & ADDED_F_SEED_FLAG;
-        if( peerIsSeed && clientIsSeed && ( tor->pexDisabled || (now-atom->time>=30) ) ) {
+        if( peerIsSeed && clientIsSeed && ( !tr_torrentIsPexEnabled(tor) || (now-atom->time>=30) ) ) {
             tordbg( t, "purging peer %s because we're both seeds", tr_peerIoAddrStr(&atom->addr,atom->port) );
             return TRUE;
@@ -1603 +1603 @@
 
         /* if we used this peer recently, give someone else a turn */
-        if( ( now - atom->time ) < 60 ) {
+        if( ( now - atom->time ) < 180 ) {
             tordbg( t, "RECONNECT peer %d (%s) is in its grace period..",
                     i, tr_peerIoAddrStr(&atom->addr,atom->port) );

trunk/libtransmission/peer-msgs.c

@@ -691 +691 @@
 
     /* decide if we want to advertise pex support */
-    if( msgs->torrent->pexDisabled )
+    if( !tr_torrentIsPexEnabled( msgs->torrent ) )
         pex = 0;
     else if( msgs->peerSentLtepHandshake )
@@ -785 +785 @@
     uint8_t * tmp;
 
-    if( msgs->torrent->pexDisabled ) /* no sharing! */
+    if( !tr_torrentIsPexEnabled( msgs->torrent ) ) /* no sharing! */
         return;
 
@@ -1512 +1512 @@
 sendPex( tr_peermsgs * msgs )
 {
-    if( msgs->peerSupportsPex && !msgs->torrent->pexDisabled )
+    if( msgs->peerSupportsPex && tr_torrentIsPexEnabled( msgs->torrent ) )
     {
         int i;
@@ -1634 +1634 @@
     m->clientAllowedPieces = NULL;
     setme = tr_publisherSubscribe( m->publisher, func, userData );
-    tr_peerIoSetTimeoutSecs( m->io, 150 ); /* error if we don't read or write for 2.5 minutes */
     
     if ( tr_peerIoSupportsFEXT( m->io ) )
@@ -1651 +1650 @@
     }
     
+    tr_peerIoSetTimeoutSecs( m->io, 150 ); /* error if we don't read or write for 2.5 minutes */
     tr_peerIoSetIOFuncs( m->io, canRead, didWrite, gotError, m );
     tr_peerIoSetIOMode( m->io, EV_READ|EV_WRITE, 0 );

trunk/libtransmission/torrent.c

@@ -645 +645 @@
 }
 
+int
+tr_torrentIsPexEnabled( const tr_torrent * tor )
+{
+    if( tor->info.flags & TR_FLAG_PRIVATE )
+        return FALSE;
+
+    if( tor->pexDisabled )
+        return FALSE;
+
+    return TRUE;
+}
 
 void