Changeset 3861 for trunk/libtransmission/peer-mgr.c

Timestamp:

Nov 17, 2007, 11:43:33 PM (15 years ago)

Author:

charles

Message:

Add "Status" column to tr_peer_stat.

File:

• trunk/libtransmission/peer-mgr.c (modified) (5 diffs)

trunk/libtransmission/peer-mgr.c

@@ -36 +36 @@
 #include "ratecontrol.h"
 #include "shared.h"
+#include "trcompat.h" /* strlcpy */
 #include "trevent.h"
 #include "utils.h"
@@ -1414 +1415 @@
 
         tr_netNtop( &peer->in_addr, stat->addr, sizeof(stat->addr) );
+        strlcpy( stat->client, (peer->client ? peer->client : ""), sizeof(stat->client) );
         stat->port             = peer->port;
         stat->from             = atom->from;
-        stat->client           = tr_strdup( peer->client ? peer->client : "" );
         stat->progress         = peer->progress;
         stat->isEncrypted      = tr_peerIoIsEncrypted( peer->io ) ? 1 : 0;
@@ -1423 +1424 @@
         stat->isDownloading    = stat->uploadToRate > 0.01;
         stat->isUploading      = stat->downloadFromRate > 0.01;
+        stat->status           = peer->status;
     }
 
@@ -1483 +1485 @@
 rechoke( Torrent * t )
 {
-    int i, peerCount, size=0, unchoked=0;
+    int i, peerCount, size=0;
     const time_t fibrillationTime = time(NULL) - MIN_CHOKE_PERIOD_SEC;
     tr_peer ** peers = getConnectedPeers( t, &peerCount );
@@ -1506 +1508 @@
     qsort( choke, size, sizeof(struct ChokeData), compareChoke );
 
-    for( i=0; i<size && i<NUM_UNCHOKED_PEERS_PER_TORRENT; ++i ) {
+    for( i=0; i<size && i<NUM_UNCHOKED_PEERS_PER_TORRENT; ++i )
         choke[i].doUnchoke = 1;
-        ++unchoked;
-    }
 
     for( ; i<size; ++i ) {
         choke[i].doUnchoke = 1;
-        ++unchoked;
         if( choke[i].peer->peerIsInterested )
             break;