Changeset 3166

Timestamp:

Sep 25, 2007, 5:56:46 PM (15 years ago)

Author:

charles

Message:

if we connect to a peer that understands the encryption handshake, try harder to continue the connection in encrypted mode.

File:

• trunk/libtransmission/handshake.c (modified) (5 diffs)

trunk/libtransmission/handshake.c

@@ -178 +178 @@
         case AWAITING_HANDSHAKE:      str = "awaiting handshake"; break;
         case AWAITING_YA:             str = "awaiting ya"; break;
-        //case SENDING_YB:              str = "sending yb"; break;
         case AWAITING_PAD_A:          str = "awaiting pad a"; break;
         case AWAITING_CRYPTO_PROVIDE: str = "awaiting crypto_provide"; break;
         case AWAITING_PAD_C:          str = "awaiting pad c"; break;
         case AWAITING_IA:             str = "awaiting ia"; break;
-        //case SENDING_YA:              str = "sending ya"; break;
         case AWAITING_YB:             str = "awaiting yb"; break;
-        //case SENDING_CRYPTO_PROVIDE:  str = "sending crypto provide"; break;
         case AWAITING_VC:             str = "awaiting vc"; break;
         case AWAITING_CRYPTO_SELECT:  str = "awaiting crypto select"; break;
         case AWAITING_PAD_D:          str = "awaiting pad d"; break;
-        //case SENDING_NONE: str = "sending plaintext handshake"; break;
     }
     return str;
@@ -205 +201 @@
 {
     setState( handshake, state );
-    //tr_peerIoSetIOMode( handshake->io, EV_READ, EV_WRITE );
 }
 
@@ -385 +380 @@
 
 static uint32_t
-getCryptoProvide( const tr_handshake * handshake )
+getCryptoProvide( const tr_handshake * handshake UNUSED )
 {
     uint32_t i = 0;
@@ -391 +386 @@
     i |= CRYPTO_PROVIDE_CRYPTO; /* always allow crypto */
 
+#if 0
     if( handshake->allowUnencryptedPeers ) /* sometimes allow plaintext */
         i |= CRYPTO_PROVIDE_PLAINTEXT;
+#endif
 
    return i;
@@ -469 +466 @@
 
         /* crypto_provide */
-        crypto_provide = getCryptoProvide( handshake );
-        crypto_provide = htonl( crypto_provide );
+        crypto_provide = htonl( getCryptoProvide( handshake ) );
         tr_cryptoEncrypt( handshake->crypto, sizeof(crypto_provide), &crypto_provide, &crypto_provide );
         evbuffer_add( outbuf, &crypto_provide, sizeof(crypto_provide) );