Changeset 10506

Timestamp:

Apr 21, 2010, 4:44:35 AM (9 years ago)

Author:

charles

Message:

(trunk libT) #3159 "better choosing of which peers to initiate new connections with" -- fix new bug in r10500 that was reported by Sharpshot in #3160

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (1 diff)
• peer-msgs.c (modified) (2 diffs)

trunk/libtransmission/handshake.c

@@ -1144 +1144 @@
 tr_handshakeAbort( tr_handshake * handshake )
 {
-    tr_handshakeDone( handshake, FALSE );
+    if( handshake != NULL )
+        tr_handshakeDone( handshake, FALSE );
 }
 

trunk/libtransmission/peer-msgs.c

@@ -1070 +1070 @@
             {
                 int seedProbability = -1;
-                if( added_f_len < n ) seedProbability = ( added_f[i] & ADDED_F_SEED_FLAG ) ? 100 : 0;
+                if( i < added_f_len ) seedProbability = ( added_f[i] & ADDED_F_SEED_FLAG ) ? 100 : 0;
                 tr_peerMgrAddPex( tor, TR_PEER_FROM_PEX, pex+i, seedProbability );
             }
@@ -1091 +1091 @@
             {
                 int seedProbability = -1;
-                if( added_f_len < n ) seedProbability = ( added_f[i] & ADDED_F_SEED_FLAG ) ? 100 : 0;
+                if( i < added_f_len ) seedProbability = ( added_f[i] & ADDED_F_SEED_FLAG ) ? 100 : 0;
                 tr_peerMgrAddPex( tor, TR_PEER_FROM_PEX, pex+i, seedProbability );
             }