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

Timestamp:

Apr 19, 2008, 7:37:05 PM (14 years ago)

Author:

charles

Message:

peer-msgs: faster upload speeds in situations with few peers. this patch needs wider testing for side-effects wrt speed limits.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -995 +995 @@
 }
 
-static void
-maybeEnsureAtomExists( Torrent * t, const struct in_addr * addr, uint16_t port, uint8_t flags, uint8_t from )
-{
-    if( tr_blocklistHasAddress( t->manager->handle, addr ) )
-    {
-        char * fmt = NULL;
-        switch( from ) {
-            case TR_PEER_FROM_TRACKER:  fmt = _( "Banned IP address \"%s\" was given to us by the tracker" ); break;
-            case TR_PEER_FROM_CACHE:    fmt = _( "Banned IP address \"%s\" was found in the cache" ); break;
-            case TR_PEER_FROM_PEX:      fmt = _( "Banned IP address \"%s\" was given to us by another peer" ); break;
-            case TR_PEER_FROM_INCOMING: fmt = _( "Banned IP address \"%s\" tried to connect to us" ); break;
-        }
-        tr_torinf( t->tor, fmt, inet_ntoa( *addr ) );
-    }
-    else
-    {
-        ensureAtomExists( t, addr, port, flags, from );
-    }
-}
-
 static int
 getMaxPeerCount( const tr_torrent * tor UNUSED )
@@ -1120 +1100 @@
     if( tr_blocklistHasAddress( manager->handle, addr ) )
     {
-        tr_inf( _( "Banned IP address \"%s\" tried to connect to us" ),
+        tr_dbg( "Banned IP address \"%s\" tried to connect to us",
                 inet_ntoa( *addr ) );
         tr_netClose( socket );
@@ -1158 +1138 @@
 
     t = getExistingTorrent( manager, torrentHash );
-    maybeEnsureAtomExists( t, &pex->in_addr, pex->port, pex->flags, from );
+    if( !tr_blocklistHasAddress( t->manager->handle, &pex->in_addr ) )
+        ensureAtomExists( t, &pex->in_addr, pex->port, pex->flags, from );
 
     managerUnlock( manager );