Changeset 3760

Timestamp:

Nov 8, 2007, 9:25:17 PM (15 years ago)

Author:

charles

Message:

minor tweaks.

Location:

trunk/libtransmission

Files:

• inout.c (modified) (1 diff)
• peer-io.c (modified) (1 diff)
• peer-msgs.c (modified) (5 diffs)

trunk/libtransmission/inout.c

@@ -26 +26 @@
 #include "inout.h"
 #include "list.h"
-#include "net.h"
 #include "platform.h"
 #include "peer-mgr.h"

trunk/libtransmission/peer-io.c

@@ -504 +504 @@
     {
         case PEER_ENCRYPTION_NONE:
-            evbuffer_remove(  inbuf, bytes, byteCount );
+            evbuffer_remove( inbuf, bytes, byteCount );
             break;
 
         case PEER_ENCRYPTION_RC4:
-            evbuffer_remove(  inbuf, bytes, byteCount );
+            evbuffer_remove( inbuf, bytes, byteCount );
             tr_cryptoDecrypt( io->crypto, byteCount, bytes, bytes );
             break;

trunk/libtransmission/peer-msgs.c

@@ -966 +966 @@
     if( !messageLengthIsCorrect( msgs, id, msglen ) )
     {
+        dbgmsg( msgs, "bad packet - BT message #%d with a length of %d", (int)id, (int)msglen );
         fireGotError( msgs );
         return READ_DONE;
@@ -1037 +1038 @@
         }
 
-        case BT_PIECE: {
+        case BT_PIECE:
             dbgmsg( msgs, "got a Piece!" );
             assert( msgs->blockToUs.length == 0 );
@@ -1047 +1048 @@
             return READ_AGAIN;
             break;
-        }
-
-        case BT_PORT: {
+
+        case BT_PORT:
             dbgmsg( msgs, "Got a BT_PORT" );
             tr_peerIoReadUint16( msgs->io, inbuf, &msgs->info->port );
             break;
-        }
-    
+   
+#if 0 
         case BT_SUGGEST: {
             /* FIXME(tiennou) */
@@ -1090 +1090 @@
             break;
         }
+#endif
         
         case BT_LTEP:
@@ -1306 +1307 @@
                         msgs->blockToUs.offset,
                         EVBUFFER_LENGTH( msgs->inBlock ) );
-        evbuffer_drain( msgs->inBlock, ~0 );
+        evbuffer_drain( msgs->inBlock, EVBUFFER_LENGTH( msgs->inBlock ) );
         msgs->state = AWAITING_BT_LENGTH;
     }