Changeset 6453

Timestamp:

Aug 8, 2008, 10:44:32 PM (13 years ago)

Author:

charles

Message:

back out the changes from r6415.

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (3 diffs)
• peer-io.h (modified) (1 diff)
• peer-mgr.c (modified) (5 diffs)

trunk/libtransmission/peer-io.c

@@ -69 +69 @@
 
     tr_crypto           * crypto;
-
-    uint64_t              fromPeer;
 };
 
@@ -540 +538 @@
     {
         case PEER_ENCRYPTION_NONE:
-            io->fromPeer += evbuffer_remove( inbuf, bytes, byteCount );
+            evbuffer_remove( inbuf, bytes, byteCount );
             break;
 
         case PEER_ENCRYPTION_RC4:
-            io->fromPeer += evbuffer_remove( inbuf, bytes, byteCount );
+            evbuffer_remove( inbuf, bytes, byteCount );
             tr_cryptoDecrypt( io->crypto, byteCount, bytes, bytes );
             break;
@@ -596 +594 @@
     return time( NULL ) - io->timeCreated;
 }
-
-int64_t
-tr_peerIoCountBytesFromPeer( const tr_peerIo * io )
-{
-    return io->fromPeer;
-}
-

trunk/libtransmission/peer-io.h

@@ -179 +179 @@
                             size_t             byteCount );
 
-int64_t tr_peerIoCountBytesFromPeer( const tr_peerIo * io );
 
 #endif

trunk/libtransmission/peer-mgr.c

@@ -45 +45 @@
 
     /* minimum interval for refilling peers' request lists */
-    REFILL_PERIOD_MSEC = 500,
+    REFILL_PERIOD_MSEC = 333,
 
     /* when many peers are available, keep idle ones this long */
@@ -966 +966 @@
             struct peer_atom * atom = getExistingAtom( t, addr );
             if( atom )
-            {
-                /* if we talked but the connection failed, mark a failure
-                 * in the peer's permanent record.  if they didn't send
-                 * us anything at all, mark the peer as unreachable. */
-                if( tr_peerIoCountBytesFromPeer( io ) ) {
-                    ++atom->numFails;
-                    tordbg( t, "handshake failed; incremented fail count to %d", (int)atom->numFails );
-                } else {
-                    tordbg( t, "no data received at all during handshake; marking as unreachable" );
-                    atom->myflags |= MYFLAG_UNREACHABLE;
-                }
-            }
+                ++atom->numFails;
         }
 
@@ -1091 +1080 @@
     const uint8_t * walk = compact;
     tr_pex * pex = tr_new0( tr_pex, n );
+if( added_f && strlen(added_f)!=n )
+{
+    int i;
+    const int len = strlen( added_f );
+    fprintf( stderr, "compactLen is %d, n is %d, and strlen(added_f) is %d!!!\n", (int)compactLen, (int)n, len );
+    for( i=0; i<len; ++i )
+        fprintf( stderr, "added.f[%d] is %d\n", i, (int)added_f[i] );
+}
     for( i=0; i<n; ++i ) {
         memcpy( &pex[i].in_addr, walk, 4 ); walk += 4;
@@ -1816 +1813 @@
             if( wait > maxWait ) wait = maxWait;
             if( ( now - atom->time ) < wait ) {
-                /*tordbg( t, "RECONNECT peer %d (%s) is in its grace period of %d seconds..",
-                          i, tr_peerIoAddrStr(&atom->addr,atom->port), wait );*/
+                tordbg( t, "RECONNECT peer %d (%s) is in its grace period of %d seconds..",
+                        i, tr_peerIoAddrStr(&atom->addr,atom->port), wait );
                 continue;
             }
@@ -1897 +1894 @@
             if( io == NULL )
             {
-                /* we've temporarily exceeded our max connection limit... */
+                atom->myflags |= MYFLAG_UNREACHABLE;
             }
             else