Changeset 1603 for trunk/libtransmission/torrent.c

Timestamp:

Mar 29, 2007, 12:19:09 AM (15 years ago)

Author:

joshe

Message:

Show peers found and used when adding new peers.
Accept --without-foo in addition to --disable-foo in the configure script.

File:

• trunk/libtransmission/torrent.c (modified) (9 diffs)

trunk/libtransmission/torrent.c

@@ -283 +283 @@
 void tr_manualUpdate( tr_torrent_t * tor )
 {
-    int peerCount;
+    int peerCount, new;
     uint8_t * peerCompact;
 
@@ -291 +291 @@
     tr_lockLock( &tor->lock );
     tr_trackerAnnouncePulse( tor->tracker, &peerCount, &peerCompact, 1 );
+    new = 0;
     if( peerCount > 0 )
     {
-        tr_torrentAddCompact( tor, TR_PEER_FROM_TRACKER,
+        new = tr_torrentAddCompact( tor, TR_PEER_FROM_TRACKER,
                               peerCompact, peerCount );
         free( peerCompact );
     }
+    tr_dbg( "got %i peers from manual announce, used %i", peerCount, new );
     tr_lockUnlock( &tor->lock );
 }
@@ -614 +616 @@
 }
 
-void tr_torrentAttachPeer( tr_torrent_t * tor, tr_peer_t * peer )
+int tr_torrentAttachPeer( tr_torrent_t * tor, tr_peer_t * peer )
 {
     int i;
@@ -622 +624 @@
     {
         tr_peerDestroy(  peer );
-        return;
+        return 0;
     }
 
@@ -632 +634 @@
         {
             tr_peerDestroy(  peer );
-            return;
+            return 0;
         }
     }
@@ -639 +641 @@
     tr_peerSetTorrent( peer, tor );
     tor->peers[tor->peerCount++] = peer;
-}
-
-void tr_torrentAddCompact( tr_torrent_t * tor, int from,
+
+    return 1;
+}
+
+int tr_torrentAddCompact( tr_torrent_t * tor, int from,
                            uint8_t * buf, int count )
 {
     struct in_addr addr;
     in_port_t port;
-    int i;
+    int i, added;
     tr_peer_t * peer;
 
+    added = 0;
     for( i = 0; i < count; i++ )
     {
@@ -655 +660 @@
 
         peer = tr_peerInit( addr, port, -1, from );
-        tr_torrentAttachPeer( tor, peer );
-    }
+        added += tr_torrentAttachPeer( tor, peer );
+    }
+
+    return added;
 }
 
@@ -666 +673 @@
     tr_torrent_t * tor = _tor;
     int            i, ret;
-    int            peerCount;
+    int            peerCount, used;
     uint8_t      * peerCompact;
     tr_peer_t    * peer;
@@ -696 +703 @@
         /* Try to get new peers or to send a message to the tracker */
         tr_trackerPulse( tor->tracker, &peerCount, &peerCompact );
+        used = 0;
         if( peerCount > 0 )
         {
-            tr_torrentAddCompact( tor, TR_PEER_FROM_TRACKER,
-                                  peerCompact, peerCount );
+            used = tr_torrentAddCompact( tor, TR_PEER_FROM_TRACKER,
+                                         peerCompact, peerCount );
             free( peerCompact );
         }
+        tr_dbg( "got %i peers from announce, used %i", peerCount, used );
         if( tor->status & TR_STATUS_STOPPED )
         {