Changeset 13310

Timestamp:

May 20, 2012, 2:14:59 PM (9 years ago)

Author:

jordan

Message:

(trunk libT) #4888: when scraping magnet links, don't send a left=0 argument to the tracker.

Location:

trunk/libtransmission

Files:

• announcer-common.h (modified) (1 diff)
• announcer-http.c (modified) (1 diff)
• announcer-udp.c (modified) (1 diff)
• announcer.c (modified) (1 diff)
• completion.h (modified) (1 diff)

trunk/libtransmission/announcer-common.h

@@ -149 +149 @@
 
     /* the total size of the torrent minus the number of bytes completed */
-    uint64_t left;
+    uint64_t leftUntilComplete;
 
     /* the tracker's announce URL */

trunk/libtransmission/announcer-http.c

@@ -82 +82 @@
                               req->up,
                               req->down,
-                              req->left,
+                              req->leftUntilComplete,
                               req->numwant,
                               req->key );

trunk/libtransmission/announcer-udp.c

@@ -324 +324 @@
     evbuffer_add        ( buf, in->peer_id, PEER_ID_LEN );
     evbuffer_add_hton_64( buf, in->down );
-    evbuffer_add_hton_64( buf, in->left );
+    evbuffer_add_hton_64( buf, in->leftUntilComplete );
     evbuffer_add_hton_64( buf, in->up );
     evbuffer_add_hton_32( buf, get_tau_announce_event( in->event ) );

trunk/libtransmission/announcer.c

@@ -913 +913 @@
     req->down = tier->byteCounts[TR_ANN_DOWN];
     req->corrupt = tier->byteCounts[TR_ANN_CORRUPT];
-    req->left = tr_cpLeftUntilComplete( &tor->completion );
+    req->leftUntilComplete = tr_torrentHasMetadata( tor )
+            ? tor->info.totalSize - tr_cpHaveTotal( &tor->completion )
+            : ~(uint64_t)0;
     req->event = event;
     req->numwant = event == TR_ANNOUNCE_EVENT_STOPPED ? 0 : NUMWANT;

trunk/libtransmission/completion.h

@@ -90 +90 @@
 }
 
-static inline uint64_t
-tr_cpLeftUntilComplete( const tr_completion * cp )
-{
-    return tr_torrentInfo(cp->tor)->totalSize - cp->sizeNow;
-}
-
 static inline bool tr_cpHasAll( const tr_completion * cp )
 {