Changeset 3132

Timestamp:

Sep 22, 2007, 4:44:50 AM (15 years ago)

Author:

charles

Message:

maybe get speed limits working.

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (4 diffs)
• peer-mgr.c (modified) (3 diffs)
• peer-msgs.c (modified) (2 diffs)

trunk/libtransmission/handshake.c

@@ -884 +884 @@
     uint32_t crypto_select;
 
+dbgmsg( handshake, "zbz reading IA..." );
     if( EVBUFFER_LENGTH(inbuf) < needlen )
         return READ_MORE;
 
+dbgmsg( handshake, "zbz reading IA..." );
     /* parse the handshake ... */
     i = parseHandshake( handshake, inbuf );
@@ -903 +905 @@
     /* send crypto_select */
     {
+dbgmsg( handshake, "handshake->crypto_provide is %d\n", (int)handshake->crypto_provide );
         if( handshake->crypto_provide & CRYPTO_PROVIDE_CRYPTO )
             crypto_select = CRYPTO_PROVIDE_CRYPTO;
@@ -908 +911 @@
             crypto_select = CRYPTO_PROVIDE_PLAINTEXT;
         else {
+dbgmsg( handshake, "gronk..." );
             evbuffer_free( outbuf );
             tr_handshakeDone( handshake, FALSE );
@@ -1067 +1071 @@
     handshake->io = io;
     handshake->crypto = tr_peerIoGetCrypto( io );
-    handshake->allowUnencryptedPeers = encryption_mode!=TR_ENCRYPTION_REQUIRED;
+    handshake->allowUnencryptedPeers = 0;//encryption_mode!=TR_ENCRYPTION_REQUIRED;
     handshake->doneCB = doneCB;
     handshake->doneUserData = doneUserData;

trunk/libtransmission/peer-mgr.c

@@ -655 +655 @@
                                     handshake,
                                     handshakeCompare );
-    assert( ours != NULL );
-    assert( ours == handshake );
+    //assert( ours != NULL );
+    //assert( ours == handshake );
 
     in_addr = tr_peerIoGetAddress( io, &port );
@@ -741 +741 @@
     assert( peer != NULL );
 
+#if 0
     if( peer->io != NULL ) { /* already connected */
         fprintf( stderr, "not connecting because we already have an IO for that address\n" );
@@ -759 +760 @@
                                t->hash );
     initiateHandshake( manager, io );
+#endif
 }
 

trunk/libtransmission/peer-msgs.c

@@ -790 +790 @@
 canDownload( const tr_peermsgs * msgs UNUSED )
 {
-#if 0
     tr_torrent * tor = msgs->torrent;
 
@@ -798 +797 @@
     if( tor->downloadLimitMode == TR_SPEEDLIMIT_SINGLE )
         return tr_rcCanTransfer( tor->download );
-#endif
 
     return TRUE;