Ticket #4888: magnet-left-until-complete.patch

libtransmission/completion.h

@@ -89 +89 @@
     return cp->sizeNow;
 }
 
-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 )
 {
     return tr_bitfieldHasAll( &cp->blockBitfield );

libtransmission/announcer.c

@@ -912 +912 @@
     req->up = tier->byteCounts[TR_ANN_UP];
     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;
     req->key = announcer->key;

libtransmission/announcer-udp.c

@@ -323 +323 @@
     evbuffer_add        ( buf, in->info_hash, SHA_DIGEST_LENGTH );
     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 ) );
     evbuffer_add_hton_32( buf, 0 );

libtransmission/announcer-common.h

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

libtransmission/announcer-http.c

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