add rpc fields for the tracker identifier stats

diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c
index 24d42f507bfad6ed39f08381c62b455d1a583a45..e7d73f28931eff07729fabbd89ad34098d37bb2d 100644 (file)
--- a/libtransmission/metainfo.c
+++ b/libtransmission/metainfo.c
@@ -271,7 +271,6 @@ getannounce( tr_info * inf, tr_benc * meta )
         int       n;
         int       i, j, validTiers;
         const int numTiers = tr_bencListSize( tiers );
-        uint32_t  trackerId = 0;
 
         n = 0;
         for( i = 0; i < numTiers; ++i )

diff --git a/libtransmission/rpcimpl.c b/libtransmission/rpcimpl.c
index 14e08cf89c08624e3e297737b01b105243ca1872..195a1d1ebe4361858ecd5cb587bfa5f98ebfa0c2 100644 (file)
--- a/libtransmission/rpcimpl.c
+++ b/libtransmission/rpcimpl.c
@@ -359,11 +359,11 @@ addTrackers( const tr_info * info,
     for( i = 0; i < info->trackerCount; ++i )
     {
         const tr_tracker_info * t = &info->trackers[i];
-        tr_benc *               d = tr_bencListAddDict( trackers, 3 );
+        tr_benc *               d = tr_bencListAddDict( trackers, 4 );
         tr_bencDictAddStr( d, "announce", t->announce );
+        tr_bencDictAddInt( d, "identifier", t->identifier );
         tr_bencDictAddStr( d, "scrape", t->scrape );
         tr_bencDictAddInt( d, "tier", t->tier );
-        tr_bencDictAddInt( d, "id", t->identifier );
     }
 }
 
@@ -375,13 +375,14 @@ addTrackerStats( const tr_tracker_stat * st, int n, tr_benc * list )
     for( i=0; i<n; ++i )
     {
         const tr_tracker_stat * s = &st[i];
-        tr_benc * d = tr_bencListAddDict( list, 22 );
+        tr_benc * d = tr_bencListAddDict( list, 23 );
         tr_bencDictAddStr ( d, "announce", s->announce );
         tr_bencDictAddInt ( d, "announceState", s->announceState );
         tr_bencDictAddInt ( d, "downloadCount", s->downloadCount );
         tr_bencDictAddBool( d, "hasAnnounced", s->hasAnnounced );
         tr_bencDictAddBool( d, "hasScraped", s->hasScraped );
         tr_bencDictAddStr ( d, "host", s->host );
+        tr_bencDictAddInt ( d, "identifier", s->identifier );
         tr_bencDictAddBool( d, "isBackup", s->isBackup );
         tr_bencDictAddInt ( d, "lastAnnouncePeerCount", s->lastAnnouncePeerCount );
         tr_bencDictAddStr ( d, "lastAnnounceResult", s->lastAnnounceResult );