#1214: add RPC support for per-peer status,ul,dl,address info

diff --git a/daemon/remote.c b/daemon/remote.c
index 1022ace97a809d22749edc8e5f8543159e8cee1f..cc703bc9c8d08767a50bf800397d936950680d9a 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -32,7 +32,7 @@
 #define DEFAULT_HOST "localhost"
 #define DEFAULT_PORT TR_DEFAULT_RPC_PORT
 
-enum { TAG_LIST, TAG_DETAILS, TAG_FILES };
+enum { TAG_LIST, TAG_DETAILS, TAG_FILES, TAG_PEERS };
 
 static const char*
 getUsage( void )
@@ -81,6 +81,7 @@ static tr_option opts[] =
     { 'w', "download-dir", "Set the default download folder", "w", 1, "<path>" },
     { 'x', "pex",          "Enable peer exchange (PEX)", "x", 0, NULL },
     { 'X', "no-pex",       "Disable peer exchange (PEX)", "X", 0, NULL },
+    { 'z', "peers",        "List the current torrent's peers", "z", 0, NULL },
     { 0, NULL, NULL, NULL, 0, NULL }
 };
 
@@ -324,6 +325,11 @@ readargs( int argc, const char ** argv )
             case 'X': tr_bencDictAddStr( &top, "method", "session-set" );
                       tr_bencDictAddInt( args, "pex-allowed", 0 );
                       break;
+            case 'z': tr_bencDictAddStr( &top, "method", "torrent-get" );
+                      tr_bencDictAddInt( &top, "tag", TAG_PEERS );
+                      fields = tr_bencDictAddList( args, "fields", 1 );
+                      tr_bencListAddStr( fields, "peers" );
+                      break;
             case 900: tr_bencDictAddStr( &top, "method", "torrent-set" );
                       addIdArg( args, id );
                       addFiles( args, "priority-high", optarg );
@@ -703,6 +709,38 @@ printFileList( tr_benc * top )
     }
 }
 
+static void
+printPeerList( tr_benc * top )
+{
+    tr_benc *args, *list;
+
+    if( ( tr_bencDictFindDict( top, "arguments", &args ) ) &&
+        ( tr_bencDictFindList( args, "peers", &list ) ) )
+    {
+        int i, n;
+        printf( "%-20s  %-12s  %-5s  %5s  %s\n",
+                "Address", "Flags", "Down", "Up", "Client" );
+        for( i=0, n=tr_bencListSize( list ); i<n; ++i )
+        {
+            const char * address, * client, * flagstr;
+            int64_t rateToClient, rateToPeer;
+            tr_benc * d = tr_bencListChild( list, i );
+            if(    tr_bencDictFindStr( d, "address", &address )
+                && tr_bencDictFindStr( d, "client", &client )
+                && tr_bencDictFindStr( d, "flagstr", &flagstr )
+                && tr_bencDictFindInt( d, "rateToClient", &rateToClient )
+                && tr_bencDictFindInt( d, "rateToPeer", &rateToPeer ) )
+            {
+                printf( "%-20s  %-12s  %5.1f  %5.1f  %s\n",
+                        address, flagstr,
+                        rateToClient * 1024.0,
+                        rateToPeer * 1024.0,
+                        client );
+            }
+        }
+    }
+}
+
 static void
 printTorrentList( tr_benc * top )
 {
@@ -773,6 +811,7 @@ processResponse( const char * host, int port,
             case TAG_FILES: printFileList( &top ); break;
             case TAG_DETAILS: printDetails( &top ); break;
             case TAG_LIST: printTorrentList( &top ); break;
+            case TAG_PEERS: printPeerList( &top ); break;
             default: if( tr_bencDictFindStr( &top, "result", &str ) ) 
                          printf( "%s:%d responded: \"%s\"\n", host, port, str );
         }

diff --git a/daemon/transmission-remote.1 b/daemon/transmission-remote.1
index a8183bff5f82d4f4e2510466a92a805d03ae8582..bc56e88f2dc1d6f2fe859c4300fdf4bb539aca28 100644 (file)
--- a/daemon/transmission-remote.1
+++ b/daemon/transmission-remote.1
@@ -34,6 +34,7 @@ and
 .Op Fl v
 .Op Fl w Ar download-dir
 .Op Fl x | X
+.Op Fl z | peers
 .Ek
 .Sh DESCRIPTION
 .Nm
@@ -169,6 +170,20 @@ Enable peer exchange (PEX).
 .It Fl X Fl -no-pex
 Disable peer exchange (PEX).
 
+.It Fl x Fl -peers
+List the current torrent's connected peers.
+In the `status' section of the list, the following shorthand is used:
+.D1 D: Downloading from this peer
+.D1 d: We would download from this peer if they would let us
+.D1 E: Encrypted connection
+.D1 I: Peer is an incoming connection
+.D1 K: Peer has unchoked us, but we're not interested
+.D1 O: Optimistic unchoked
+.D1 U: Uploading to peer
+.D1 u: We would upload to this peer if they asked
+.D1 X: Peer was discovered through Peer Exchange (PEX)
+.D1 ?: We unchoked this peer, but they're not interested
+
 .El
 .Sh EXAMPLES
 

diff --git a/doc/rpc-spec.txt b/doc/rpc-spec.txt
index 51f1dd370c56a59acc7e78530d360dda89cb2f3c..dd4644823584287e761cf5f42f2471726b87c7e0 100644 (file)
--- a/doc/rpc-spec.txt
+++ b/doc/rpc-spec.txt
@@ -143,6 +143,7 @@
    name                   | string                               | tr_info
    nextAnnounceTime       | number                               | tr_stat
    nextScrapeTime         | number                               | tr_stat
+   peers                  | array (see below)                    | n/a
    peersConnected         | number                               | tr_stat
    peersFrom              | object (see below)                   | n/a
    peersGettingFromUs     | number                               | tr_stat
@@ -151,8 +152,8 @@
    pieceCount             | tnumber                              | tr_info
    pieceSize              | tnumber                              | tr_info
    priorities             | array (see below)                    | n/a
-   rateDownload           | number                               | tr_stat
-   rateUpload             | number                               | tr_stat
+   rateDownload (B/s)     | number                               | tr_stat
+   rateUpload (B/s)       | number                               | tr_stat
    recheckProgress        | number                               | tr_stat
    scrapeResponse         | string                               | tr_stat
    scrapeURL              | string                               | tr_stat
@@ -175,37 +176,53 @@
                           |                                      |
    -----------------------+--------------------------------------+
    files                  | array of objects, each containing:   |
-                          +------------------+-------------------+
-                          | key              | type              |
-                         | bytesCompleted   | number            | tr_torrent
-                         | length           | number            | tr_info
-                         | name             | string            | tr_info
+                          +-------------------------+------------+
+                          | key                     | type       |
+                          | bytesCompleted          | number     | tr_torrent
+                          | length                  | number     | tr_info
+                          | name                    | string     | tr_info
+   -----------------------+--------------------------------------+
+   peers                  | array of objects, each containing:   |
+                          +-------------------------+------------+
+                          | address                 | string     | tr_peer_stat
+                          | clientName              | string     | tr_peer_stat
+                          | clientIsChoked          | 'boolean'  | tr_peer_stat
+                          | clientIsInterested      | 'boolean'  | tr_peer_stat
+                          | isDownloadingFrom       | 'boolean'  | tr_peer_stat
+                          | isEncrypted             | 'boolean'  | tr_peer_stat
+                          | isIncoming              | 'boolean'  | tr_peer_stat
+                          | isUploadingTo           | 'boolean'  | tr_peer_stat
+                          | peerIsChoked            | 'boolean'  | tr_peer_stat
+                          | peerIsInterested        | 'boolean'  | tr_peer_stat
+                          | progress                | 'double'   | tr_peer_stat
+                          | rateToClient (B/s)      | number     | tr_peer_stat
+                          | rateToPeer (B/s)        | number     | tr_peer_stat
    -----------------------+--------------------------------------+
    peersFrom              | an object containing:                |
-                          +------------------+-------------------+
-                          | fromCache        | number            | tr_stat
-                          | fromIncoming     | number            | tr_stat
-                          | fromPex          | number            | tr_stat
-                          | fromTracker      | number            | tr_stat
+                          +-------------------------+------------+
+                          | fromCache               | number     | tr_stat
+                          | fromIncoming            | number     | tr_stat
+                          | fromPex                 | number     | tr_stat
+                          | fromTracker             | number     | tr_stat
    -----------------------+--------------------------------------+
    priorities             | an array of tr_info.filecount        | tr_info
                           | numbers. each is the tr_priority_t   |
                           | mode for the corresponding file.     |
    -----------------------+--------------------------------------+
    trackers               | array of objects, each containing:   |
-                          +------------------+-------------------+
-                          | announce         | string            | tr_info
-                          | scrape           | string            | tr_info
-                          | tier             | number            | tr_info
+                          +-------------------------+------------+
+                          | announce                | string     | tr_info
+                          | scrape                  | string     | tr_info
+                          | tier                    | number     | tr_info
    -----------------------+--------------------------------------+
    wanted                 | an array of tr_info.fileCount        | tr_info
                           | 'booleans' true if the corresponding |
                           | file is to be downloaded.            |
    -----------------------+--------------------------------------+
    webseeds               | an array of strings:                 |
-                          +------------------+-------------------+
-                          | webseed          | string            | tr_info
-                          +------------------+-------------------+
+                          +-------------------------+------------+
+                          | webseed                 | string     | tr_info
+                          +-------------------------+------------+
 
    Example:
 

diff --git a/gtk/details.c b/gtk/details.c
index 9f1876247797bdffbdf08833aefab2c315200a26..483a29cb23efbab5f55f1e01e6caa4220e8ab7cd 100644 (file)
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -322,8 +322,8 @@ peer_row_set (GtkListStore        * store,
                       PEER_COL_CLIENT, client,
                       PEER_COL_IS_ENCRYPTED, peer->isEncrypted,
                       PEER_COL_PROGRESS, (int)(100.0*peer->progress),
-                      PEER_COL_DOWNLOAD_RATE, peer->downloadFromRate,
-                      PEER_COL_UPLOAD_RATE, peer->uploadToRate,
+                      PEER_COL_DOWNLOAD_RATE, peer->rateToClient,
+                      PEER_COL_UPLOAD_RATE, peer->rateToPeer,
                       PEER_COL_STATUS, peer->flagStr,
                       -1);
 }

diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h
index 2532148dd9e3ea08195e4f5bd10bea5aaac44217..4c16be5c7c6bebf22973957db419c152f64776b6 100644 (file)
--- a/libtransmission/peer-common.h
+++ b/libtransmission/peer-common.h
@@ -27,7 +27,8 @@ typedef enum
     TR_ADDREQ_DUPLICATE,
     TR_ADDREQ_MISSING,
     TR_ADDREQ_CLIENT_CHOKED
-} tr_addreq_t;
+}
+tr_addreq_t;
 
 /**
 ***  Peer Publish / Subscribe

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index f4649dbabe06924a5d98e8ae66aa6a62a8db317f..80b0c0fcabdcdebba6bd28570f9df32d0766f411 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -1514,8 +1514,8 @@ tr_peerMgrPeerStats( const tr_peerMgr  * manager,
         stat->from               = atom->from;
         stat->progress           = peer->progress;
         stat->isEncrypted        = tr_peerIoIsEncrypted( peer->io ) ? 1 : 0;
-        stat->uploadToRate       = peer->rateToPeer;
-        stat->downloadFromRate   = peer->rateToClient;
+        stat->rateToPeer         = peer->rateToPeer;
+        stat->rateToClient       = peer->rateToClient;
         stat->peerIsChoked       = peer->peerIsChoked;
         stat->peerIsInterested   = peer->peerIsInterested;
         stat->clientIsChoked     = peer->clientIsChoked;

diff --git a/libtransmission/rpc.c b/libtransmission/rpc.c
index 296896a043089997d320960d527462826007e82d..940d80cec5369d3bc0db8f6bd479f2c04825a3e7 100644 (file)
--- a/libtransmission/rpc.c
+++ b/libtransmission/rpc.c
@@ -202,6 +202,38 @@ addTrackers( const tr_info * info, tr_benc * trackers )
     }
 }
 
+static void
+addPeers( const tr_torrent * tor, tr_benc * list )
+{
+    int i;
+    int peerCount;
+    tr_peer_stat * peers = tr_torrentPeers( tor, &peerCount );
+
+    tr_bencInitList( list, peerCount );
+
+    for( i=0; i<peerCount; ++i )
+    {
+        tr_benc * d = tr_bencListAddDict( list, 14 );
+        const tr_peer_stat * peer = peers + i;
+        tr_bencDictAddStr( d, "address", peer->addr );
+        tr_bencDictAddStr( d, "clientName", peer->client );
+        tr_bencDictAddInt( d, "clientIsChoked", peer->clientIsChoked );
+        tr_bencDictAddInt( d, "clientIsInterested", peer->clientIsInterested );
+        tr_bencDictAddStr( d, "flagStr", peer->flagStr );
+        tr_bencDictAddInt( d, "isDownloadingFrom", peer->isDownloadingFrom );
+        tr_bencDictAddInt( d, "isEncrypted", peer->isEncrypted );
+        tr_bencDictAddInt( d, "isIncoming", peer->isIncoming );
+        tr_bencDictAddInt( d, "isUploadingTo", peer->isUploadingTo );
+        tr_bencDictAddInt( d, "peerIsChoked", peer->peerIsChoked );
+        tr_bencDictAddInt( d, "peerIsInterested", peer->peerIsInterested );
+        tr_bencDictAddDouble( d, "progress", peer->progress );
+        tr_bencDictAddInt( d, "rateToClient", (int)(peer->rateToClient*1024.0) );
+        tr_bencDictAddInt( d, "rateToPeer", (int)(peer->rateToPeer*1024.0) );
+    }
+
+    tr_torrentPeersFree( peers, peerCount );
+}
+
 static void
 addField( const tr_torrent * tor, tr_benc * d, const char * key )
 {
@@ -270,6 +302,8 @@ addField( const tr_torrent * tor, tr_benc * d, const char * key )
         tr_bencDictAddInt( d, key, st->nextAnnounceTime );
     else if( !strcmp( key, "nextScrapeTime" ) )
         tr_bencDictAddInt( d, key, st->nextScrapeTime );
+    else if( !strcmp( key, "peers" ) )
+        addPeers( tor, tr_bencDictAdd( d, key ) );
     else if( !strcmp( key, "peersConnected" ) )
         tr_bencDictAddInt( d, key, st->peersConnected );
     else if( !strcmp( key, "peersFrom" ) ) {

diff --git a/libtransmission/session.c b/libtransmission/session.c
index 48fdc912c0171c50ccaf83bf4be3b3d047c9d409..4facfa72d3c373960c4a3722f1977436ee2ee0fe 100644 (file)
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -219,8 +219,6 @@ tr_sessionInitFull( const char        * configDir,
     signal( SIGPIPE, SIG_IGN );
 #endif
 
-abort();
-
     tr_msgInit( );
     tr_setMessageLevel( messageLevel );
     tr_setMessageQueuing( isMessageQueueingEnabled );

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 369fe9e650062222baf87989a11e399d72850676..31c5cb64a2b7f30fd5186484a8f263dbf6ad1a35 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -1024,8 +1024,8 @@ typedef struct tr_peer_stat
     char flagStr[32];
     
     float progress;
-    float downloadFromRate;
-    float uploadToRate;
+    float rateToPeer;
+    float rateToClient;
 }
 tr_peer_stat;
 

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 1f626db56ab7a393c112c27a6618d7c6f9f39dc2..c707ce4dc31a4cc0f03aaec4ce8aa55321d058ea 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1008,9 +1008,9 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
         [dict setObject: [NSString stringWithUTF8String: peer->flagStr] forKey: @"Flags"];
         
         if (peer->isUploadingTo)
-            [dict setObject: [NSNumber numberWithFloat: peer->uploadToRate] forKey: @"UL To Rate"];
+            [dict setObject: [NSNumber numberWithFloat: peer->rateToPeer] forKey: @"UL To Rate"];
         if (peer->isDownloadingFrom)
-            [dict setObject: [NSNumber numberWithFloat: peer->downloadFromRate] forKey: @"DL From Rate"];
+            [dict setObject: [NSNumber numberWithFloat: peer->rateToClient] forKey: @"DL From Rate"];
         
         [peerDicts addObject: dict];
     }