Changeset 7238

Timestamp:

Dec 2, 2008, 7:46:51 PM (12 years ago)

Author:

charles

Message:

(libT) #1379: support "partial seeds" BEP 22

Location:

trunk/libtransmission

Files:

• peer-common.h (modified) (2 diffs)
• peer-mgr.c (modified) (6 diffs)
• peer-msgs.c (modified) (4 diffs)
• rpcimpl.c (modified) (1 diff)
• torrent.c (modified) (1 diff)
• tracker.c (modified) (8 diffs)
• tracker.h (modified) (1 diff)
• transmission.h (modified) (1 diff)
• webseed.c (modified) (1 diff)

trunk/libtransmission/peer-common.h

@@ -49 +49 @@
     TR_PEER_ERROR,
     TR_PEER_CANCEL,
+    TR_PEER_UPLOAD_ONLY,
     TR_PEER_NEED_REQ
 }
@@ -62 +63 @@
     int              err;          /* errno for GOT_ERROR */
     int              wasPieceData; /* for GOT_DATA */
+    tr_bool          uploadOnly;   /* for UPLOAD_ONLY */
 }
 tr_peer_event;

trunk/libtransmission/peer-mgr.c

@@ -90 +90 @@
 **/
 
+enum
+{
+    UPLOAD_ONLY_UKNOWN,
+    UPLOAD_ONLY_YES,
+    UPLOAD_ONLY_NO
+};
+
 /* We keep one of these for every peer we know about, whether
  * it's connected or not, so the struct must be small.
@@ -97 +104 @@
 {
     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     flags;       /* these match the added_f flags */
+    uint8_t     myflags;     /* flags that aren't defined in added_f */
+    uint8_t     uploadOnly;  /* UPLOAD_ONLY_ */
+    uint8_t     partialSeed;
     tr_port     port;
     uint16_t    numFails;
     tr_address  addr;
-    time_t      time; /* when the peer's connection status last changed */
+    time_t      time;        /* when the peer's connection status last changed */
     time_t      piece_data_time;
 };
@@ -981 +990 @@
     switch( e->eventType )
     {
+        case TR_PEER_UPLOAD_ONLY:
+            /* update our atom */
+            if( peer ) {
+                struct peer_atom * a = getExistingAtom( t, &peer->addr );
+                a->uploadOnly = e->uploadOnly ? UPLOAD_ONLY_YES : UPLOAD_ONLY_NO;
+            }
+            break;
+
         case TR_PEER_NEED_REQ:
             refillSoon( t );
@@ -1459 +1476 @@
         {
             const tr_peer * peer = peers[i];
+            const struct peer_atom * atom = getExistingAtom( t, &peer->addr );
+
             walk->addr = peer->addr;
             walk->port = peer->port;
             walk->flags = 0;
-            if( peerPrefersCrypto( peer ) ) walk->flags |= ADDED_F_ENCRYPTION_FLAG;
-            if( peer->progress >= 1.0 ) walk->flags |= ADDED_F_SEED_FLAG;
+            if( peerPrefersCrypto( peer ) )
+                walk->flags |= ADDED_F_ENCRYPTION_FLAG;
+            if( ( atom->uploadOnly == UPLOAD_ONLY_YES ) || ( peer->progress >= 1.0 ) )
+                walk->flags |= ADDED_F_SEED_FLAG;
         }
 
@@ -1885 +1906 @@
     {
         tr_peer * peer = peers[i];
+        struct peer_atom * atom = getExistingAtom( t, &peer->addr );
+
         if( peer->progress >= 1.0 ) /* choke all seeds */
+        {
             tr_peerMsgsSetChoke( peer->msgs, TRUE );
-        else if( chokeAll )
+        }
+        else if( atom->uploadOnly == UPLOAD_ONLY_YES ) /* choke partial seeds */
+        {
             tr_peerMsgsSetChoke( peer->msgs, TRUE );
-        else {
+        }
+        else if( chokeAll ) /* choke everyone if we're not uploading */
+        {
+            tr_peerMsgsSetChoke( peer->msgs, TRUE );
+        }
+        else
+        {
             struct ChokeData * n = &choke[size++];
             n->peer         = peer;
@@ -2176 +2208 @@
 
         /* no need to connect if we're both seeds... */
-        if( seed && ( atom->flags & ADDED_F_SEED_FLAG ) )
+        if( seed && ( ( atom->flags & ADDED_F_SEED_FLAG ) ||
+                      ( atom->uploadOnly == UPLOAD_ONLY_YES ) ) )
             continue;
 

trunk/libtransmission/peer-msgs.c

@@ -514 +514 @@
 **/
 
-static const tr_peer_event blankEvent = { 0, 0, 0, 0, 0.0f, 0, 0 };
+static const tr_peer_event blankEvent = { 0, 0, 0, 0, 0.0f, 0, 0, 0 };
 
 static void
@@ -538 +538 @@
 
 static void
+fireUploadOnly( tr_peermsgs * msgs, tr_bool uploadOnly )
+{
+    tr_peer_event e = blankEvent;
+    e.eventType = TR_PEER_UPLOAD_ONLY;
+    e.uploadOnly = uploadOnly;
+    publish( msgs, &e );
+}
+
+static void
 fireNeedReq( tr_peermsgs * msgs )
 {
     tr_peer_event e = blankEvent;
-
     e.eventType = TR_PEER_NEED_REQ;
     publish( msgs, &e );
@@ -1087 +1095 @@
 
     tr_bencInitDict( &val, 4 );
-    tr_bencDictAddInt( &val, "e",
-                       msgs->session->encryptionMode != TR_CLEAR_PREFERRED );
+    tr_bencDictAddInt( &val, "e", msgs->session->encryptionMode != TR_CLEAR_PREFERRED );
     tr_bencDictAddInt( &val, "p", tr_sessionGetPeerPort( msgs->session ) );
+    tr_bencDictAddInt( &val, "upload_only", tr_torrentIsSeed( msgs->torrent ) );
     tr_bencDictAddStr( &val, "v", TR_NAME " " USERAGENT_PREFIX );
     m  = tr_bencDictAddDict( &val, "m", 1 );
@@ -1145 +1153 @@
         }
     }
+
+    /* look for upload_only (BEP 21) */
+    if( tr_bencDictFindInt( &val, "upload_only", &i ) )
+        fireUploadOnly( msgs, i!=0 );
 
     /* get peer's listening port */

trunk/libtransmission/rpcimpl.c

@@ -292 +292 @@
     else if( !strcmp( key, "downloadedEver" ) )
         tr_bencDictAddInt( d, key, st->downloadedEver );
+    else if( !strcmp( key, "downloaders" ) )
+        tr_bencDictAddInt( d, key, st->downloaders );
     else if( !strcmp( key, "downloadLimitMode" ) )
         tr_bencDictAddInt( d, key, tr_torrentGetSpeedMode( tor, TR_DOWN ) );

trunk/libtransmission/torrent.c

@@ -784 +784 @@
     s->scrapeURL   = ti ? ti->scrape   : NULL;
     tr_trackerStat( tc, s );
+
     tr_trackerGetCounts( tc, &s->timesCompleted,
-                         &s->leechers,
-                         &s->seeders );
+                             &s->leechers,
+                             &s->seeders,
+                             &s->downloaders );
+
     tr_peerMgrTorrentStats( tor->session->peerMgr,
                             tor->info.hash,

trunk/libtransmission/tracker.c

@@ -109 +109 @@
     int       timesDownloaded;
     int       seederCount;
+    int       downloaderCount;
     int       leecherCount;
     char *    trackerID;
@@ -539 +540 @@
                   const void * response,
                   size_t       responseLen,
-                  void *       torrent_hash )
+                  void       * torrent_hash )
 {
     int          success = FALSE;
@@ -584 +585 @@
                     t->timesDownloaded = itmp;
 
+                if( ( tr_bencDictFindInt( tordict, "downloaders", &itmp ) ) )
+                    t->downloaderCount = itmp;
+
                 if( tr_bencDictFindDict( tordict, "flags", &flags ) )
-                    if( ( tr_bencDictFindInt( flags, "min_request_interval",
-                                              &itmp ) ) )
+                    if( ( tr_bencDictFindInt( flags, "min_request_interval", &itmp ) ) )
                         t->scrapeIntervalSec = i;
 
@@ -652 +655 @@
     TR_REQ_COMPLETED,
     TR_REQ_STOPPED,
+    TR_REQ_PAUSED,     /* BEP 21 */
     TR_REQ_REANNOUNCE,
-    TR_REQ_SCRAPE,
-    TR_REQ_COUNT
+    TR_REQ_SCRAPE
 };
 
@@ -713 +716 @@
 
 static struct tr_tracker_request*
-createRequest(                 tr_session * session,
-                               tr_tracker * tracker,
-                           int reqtype )
-{
-    static const char*          strings[] =
-    { "started", "completed", "stopped", "", "err" };
-    const tr_torrent *          torrent = tr_torrentFindFromHash(
-        session, tracker->hash );
-    const tr_tracker_info *     address = getCurrentAddressFromTorrent(
-        tracker, torrent );
-    const int                   isStopping = reqtype == TR_REQ_STOPPED;
+createRequest( tr_session * session,
+               tr_tracker * tracker,
+               int          reqtype )
+{
+    static const char* strings[] = { "started", "completed", "stopped", "paused", "", "err" };
+    const tr_torrent * torrent = tr_torrentFindFromHash( session, tracker->hash );
+    const tr_tracker_info * address = getCurrentAddressFromTorrent( tracker, torrent );
+    int isStopping;
     struct tr_tracker_request * req;
-    struct evbuffer *           url;
+    struct evbuffer * url;
+
+    /* BEP 21: In order to tell the tracker that a peer is a partial seed, it MUST send
+     * an event=paused parameter in every announce while it is a partial seed. */
+    if( tr_cpGetStatus( torrent->completion ) == TR_PARTIAL_SEED )
+        reqtype = TR_REQ_PAUSED;
+
+    isStopping = reqtype == TR_REQ_STOPPED;
 
     url = evbuffer_new( );
@@ -981 +988 @@
     t->timesDownloaded          = -1;
     t->seederCount              = -1;
+    t->downloaderCount          = -1;
     t->leecherCount             = -1;
     t->lastAnnounceResponse     = -1;
@@ -1061 +1069 @@
 void
 tr_trackerGetCounts( const tr_tracker * t,
-                     int *              setme_completedCount,
-                     int *              setme_leecherCount,
-                     int *              setme_seederCount )
+                     int              * setme_completedCount,
+                     int              * setme_leecherCount,
+                     int              * setme_seederCount,
+                     int              * setme_downloaderCount )
 {
     if( setme_completedCount )
@@ -1073 +1082 @@
     if( setme_seederCount )
         *setme_seederCount = t->seederCount;
+
+    if( setme_downloaderCount )
+        *setme_downloaderCount = t->downloaderCount;
 }
 

trunk/libtransmission/tracker.h

@@ -98 +98 @@
                                              int * setme_completedCount,
                                              int * setme_leecherCount,
-                                             int * setme_seederCount );
+                                             int * setme_seederCount,
+                                             int * setme_downloaderCount );
 
 #endif

trunk/libtransmission/transmission.h

@@ -1324 +1324 @@
     int    leechers;
 
+    /** Number of downloaders that the tracker says this torrent has.
+        This is a new key introduced in BEP 21 and may not be supported by some trackers.
+        If the tracker doesn't support this key, the value here will be -1. */
+    int    downloaders;
+
     /** Number of finished downloads that the tracker says torrent has */
     int    timesCompleted;

trunk/libtransmission/webseed.c

@@ -52 +52 @@
 ***/
 
-static const tr_peer_event blankEvent = { 0, 0, 0, 0, 0.0f, 0, 0 };
+static const tr_peer_event blankEvent = { 0, 0, 0, 0, 0.0f, 0, 0, 0 };
 
 static void