Changeset 3129

Timestamp:

Sep 22, 2007, 12:53:11 AM (15 years ago)

Author:

charles

Message:

• abort connections if the peer selects an encryption option we didn't offer them.
• fix a shutdown crash as a result of peer-mgr timers not getting destroyed.
• remove some console messages.

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (5 diffs)
• peer-mgr.c (modified) (2 diffs)

trunk/libtransmission/handshake.c

@@ -257 +257 @@
 }
 
+static void
+tr_handshakeDone( tr_handshake * handshake, int isConnected );
+
 /***
 ****
@@ -291 +294 @@
     /* cleanup */
     evbuffer_free( outbuf );
+}
+
+static uint32_t
+getCryptoProvide( const tr_handshake * handshake )
+{
+    uint32_t i = 0;
+
+    i |= CRYPTO_PROVIDE_CRYPTO; /* always allow crypto */
+
+    if( handshake->allowUnencryptedPeers ) /* sometimes allow plaintext */
+        i |= CRYPTO_PROVIDE_PLAINTEXT;
+
+   return i;
 }
 
@@ -365 +381 @@
 
         /* crypto_provide */
-        crypto_provide = 0;
-        crypto_provide |= CRYPTO_PROVIDE_CRYPTO; /* always allow crypto */
-        if( handshake->allowUnencryptedPeers ) /* sometimes allow plaintext */
-            crypto_provide |= CRYPTO_PROVIDE_PLAINTEXT;
-        fprintf( stderr, "crypto_provide is %d\n", (int)crypto_provide );
-
+        crypto_provide = getCryptoProvide( handshake );
         crypto_provide = htonl( crypto_provide );
         tr_cryptoEncrypt( handshake->crypto, sizeof(crypto_provide), &crypto_provide, &crypto_provide );
@@ -457 +468 @@
 
     tr_peerIoReadUint32( handshake->io, inbuf, &crypto_select );
-    assert( crypto_select==1 || crypto_select==2 );
     handshake->crypto_select = crypto_select;
     dbgmsg( handshake, "crypto select is %d", (int)crypto_select );
+    if( ! ( crypto_select & getCryptoProvide( handshake ) ) )
+    {
+        dbgmsg( handshake, "peer selected an encryption option we didn't provide" );
+        tr_handshakeDone( handshake, FALSE );
+        return READ_DONE;
+    }
 
     tr_peerIoReadUint16( handshake->io, inbuf, &pad_d_len );
@@ -496 +512 @@
 ****
 ***/
-
-static void
-tr_handshakeDone( tr_handshake * handshake, int isConnected );
 
 static int

trunk/libtransmission/peer-mgr.c

@@ -224 +224 @@
     memcpy( hash, t->hash, SHA_DIGEST_LENGTH );
 
+    tr_timerFree( &t->reconnectTimer );
+    tr_timerFree( &t->reconnectSoonTimer );
     tr_timerFree( &t->rechokeTimer );
     tr_timerFree( &t->rechokeSoonTimer );
@@ -1162 +1164 @@
 
 static int
-reconnectPulse( void * vt )
-{
-    static int n = 0;
+reconnectPulse( void * vt UNUSED )
+{
+#if 0
     Torrent * t = vt;
-    fprintf( stderr, "when this code is written, it will cull out crappy peer connections and initiate new ones within some limit. %p - %d\n", t, ++n );
+    /* FIXME */
+#endif
     return TRUE;
 }