From b10aea6fcc18bebae2bf4dc6890619561228837e Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Fri, 4 Mar 2011 04:50:50 +0000 Subject: [PATCH] (trunk) #4072 "remove the 'know peer count' field in Inspector" -- remove it from libtransmission too --- extras/rpc-spec.txt | 2 +- libtransmission/peer-mgr.c | 2 -- libtransmission/peer-mgr.h | 1 - libtransmission/rpcimpl.c | 2 -- libtransmission/torrent.c | 1 - libtransmission/transmission.h | 3 --- 6 files changed, 1 insertion(+), 10 deletions(-) diff --git a/extras/rpc-spec.txt b/extras/rpc-spec.txt index 3893a7e00..9f0ede991 100644 --- a/extras/rpc-spec.txt +++ b/extras/rpc-spec.txt @@ -173,7 +173,6 @@ peersConnected | number | tr_stat peersFrom | object (see below) | n/a peersGettingFromUs | number | tr_stat - peersKnown | number | tr_stat peersSendingToUs | number | tr_stat percentDone | double | tr_stat pieces | string (see below) | tr_torrent @@ -656,3 +655,4 @@ | | yes | session-close | new method ------+---------+-----------+----------------+------------------------------- 13 | 2.30 | yes | session-get | new arg "isUTP" to the "peers" list + | | NO | torrent-get | reomved arg "peersKnown" diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c index 950005d40..7733e923b 100644 --- a/libtransmission/peer-mgr.c +++ b/libtransmission/peer-mgr.c @@ -2544,7 +2544,6 @@ tr_peerMgrGetAvailable( const tr_torrent * tor ) void tr_peerMgrTorrentStats( tr_torrent * tor, - int * setmePeersKnown, int * setmePeersConnected, int * setmeSeedsConnected, int * setmeWebseedsSendingToUs, @@ -2561,7 +2560,6 @@ tr_peerMgrTorrentStats( tr_torrent * tor, peers = (const tr_peer **) tr_ptrArrayBase( &t->peers ); size = tr_ptrArraySize( &t->peers ); - *setmePeersKnown = tr_ptrArraySize( &t->pool ); *setmePeersConnected = 0; *setmeSeedsConnected = 0; *setmePeersGettingFromUs = 0; diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h index 8ec36afa6..c6a6fb198 100644 --- a/libtransmission/peer-mgr.h +++ b/libtransmission/peer-mgr.h @@ -240,7 +240,6 @@ void tr_peerMgrOnTorrentGotMetainfo( tr_torrent * tor ); void tr_peerMgrOnBlocklistChanged( tr_peerMgr * manager ); void tr_peerMgrTorrentStats( tr_torrent * tor, - int * setmePeersKnown, int * setmePeersConnected, int * setmeSeedsConnected, int * setmeWebseedsSendingToUs, diff --git a/libtransmission/rpcimpl.c b/libtransmission/rpcimpl.c index fc8a5a42f..67982c3d6 100644 --- a/libtransmission/rpcimpl.c +++ b/libtransmission/rpcimpl.c @@ -556,8 +556,6 @@ addField( const tr_torrent * tor, tr_benc * d, const char * key ) } else if( tr_streq( key, keylen, "peersGettingFromUs" ) ) tr_bencDictAddInt( d, key, st->peersGettingFromUs ); - else if( tr_streq( key, keylen, "peersKnown" ) ) - tr_bencDictAddInt( d, key, st->peersKnown ); else if( tr_streq( key, keylen, "peersSendingToUs" ) ) tr_bencDictAddInt( d, key, st->peersSendingToUs ); else if( tr_streq( key, keylen, "pieces" ) ) { diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c index 42b603be0..bf70e4e89 100644 --- a/libtransmission/torrent.c +++ b/libtransmission/torrent.c @@ -1160,7 +1160,6 @@ tr_torrentStat( tr_torrent * tor ) s->manualAnnounceTime = tr_announcerNextManualAnnounce( tor ); tr_peerMgrTorrentStats( tor, - &s->peersKnown, &s->peersConnected, &usableSeeds, &s->webseedsSendingToUs, diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h index 730f70a41..54b1b826b 100644 --- a/libtransmission/transmission.h +++ b/libtransmission/transmission.h @@ -1804,9 +1804,6 @@ typedef struct tr_stat /** If seeding, number of seconds left until the idle time limit is reached. */ int etaIdle; - /** Number of peers that the tracker says this torrent has */ - int peersKnown; - /** Number of peers that we're connected to */ int peersConnected;