Changeset 1603

Timestamp:

Mar 29, 2007, 12:19:09 AM (16 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.

Location:

trunk

Files:

• configure (modified) (1 diff)
• libtransmission/fastresume.h (modified) (2 diffs)
• libtransmission/internal.h (modified) (1 diff)
• libtransmission/peeraz.h (modified) (3 diffs)
• libtransmission/peerext.h (modified) (2 diffs)
• libtransmission/torrent.c (modified) (9 diffs)

trunk/configure

@@ -220 +220 @@
 
   case "x$1" in
-    x--disable-openssl)
+    x--disable-openssl|x--without-openssl)
       OPENSSL=no
       ;;
-    x--disable-gtk)
+    x--disable-gtk|x--without-gtk)
       GTK=no
       ;;

trunk/libtransmission/fastresume.h

@@ -380 +380 @@
                 if( !( TR_FLAG_PRIVATE & tor->info.flags ) )
                 {
+                    int used;
                     uint8_t * buf = malloc( len );
                     if( 1 != fread( buf, len, 1, file ) )
@@ -387 +388 @@
                         return 1;
                     }
-                    tr_torrentAddCompact( tor, TR_PEER_FROM_CACHE,
-                                          buf, len / 6 );
+                    used = tr_torrentAddCompact( tor, TR_PEER_FROM_CACHE,
+                                                 buf, len / 6 );
+                    tr_dbg( "found %i peers in resume file, used %i",
+                            len / 6, used );
                     free( buf );
                 }

trunk/libtransmission/internal.h

@@ -147 +147 @@
 #include "xml.h"
 
-void tr_torrentAddCompact( tr_torrent_t * tor, int from,
+int tr_torrentAddCompact( tr_torrent_t * tor, int from,
                            uint8_t * buf, int count );
-void tr_torrentAttachPeer( tr_torrent_t * tor, tr_peer_t * peer );
+int tr_torrentAttachPeer( tr_torrent_t * tor, tr_peer_t * peer );
 
 struct tr_torrent_s

trunk/libtransmission/peeraz.h

@@ -445 +445 @@
     tr_info_t * info = &tor->info;
     benc_val_t  val, * list, * pair;
-    int         ii;
+    int         ii, used;
 
     if( peer->private || PEX_PEER_CUTOFF <= tor->peerCount )
@@ -484 +484 @@
     }
 
-    peer_dbg( "GET  azureus-pex, %i peers", list->val.l.count );
-
+    used = 0;
     for( ii = 0; ii < list->val.l.count; ii++ )
     {
@@ -491 +490 @@
         if( TYPE_STR == pair->type && 6 == pair->val.s.i )
         {
-            tr_torrentAddCompact( tor, TR_PEER_FROM_PEX,
-                                  ( uint8_t * )pair->val.s.s, 1 );
-        }
-    }
+            used += tr_torrentAddCompact( tor, TR_PEER_FROM_PEX,
+                                          ( uint8_t * )pair->val.s.s, 1 );
+        }
+    }
+
+    peer_dbg( "GET  azureus-pex, found %i peers, using %i",
+              list->val.l.count, used );
 
     tr_bencFree( &val );

trunk/libtransmission/peerext.h

@@ -268 +268 @@
 {
     benc_val_t val, * sub;
+    int used;
 
     if( peer->private || PEX_PEER_CUTOFF <= tor->peerCount )
@@ -291 +292 @@
     if( NULL != sub && TYPE_STR == sub->type && 0 == sub->val.s.i % 6 )
     {
-        peer_dbg( "GET  extended-pex, %i peers", sub->val.s.i / 6 );
-        tr_torrentAddCompact( tor, TR_PEER_FROM_PEX,
-                              ( uint8_t * )sub->val.s.s, sub->val.s.i / 6 );
+        used = tr_torrentAddCompact( tor, TR_PEER_FROM_PEX,
+                                     ( uint8_t * )sub->val.s.s,
+                                     sub->val.s.i / 6 );
+        peer_dbg( "GET  extended-pex, got %i peers, used %i",
+                  sub->val.s.i / 6, used );
     }
     else

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 )
         {