Changeset 1554

Timestamp:

Mar 9, 2007, 1:41:45 AM (15 years ago)

Author:

joshe

Message:

Remove old message length check that was causing some messages to be ignored.
Send the correct bitfield in the bitfield message.

Location:

branches/pex/libtransmission

Files:

• peermessages.h (modified) (4 diffs)
• peerparse.h (modified) (1 diff)

branches/pex/libtransmission/peermessages.h

@@ -188 +188 @@
 static void sendKeepAlive( tr_peer_t * peer )
 {
-    uint8_t * p;
-
-    p = getMessagePointer( peer, 0, AZ_MSG_BT_KEEP_ALIVE );
+    getMessagePointer( peer, 0, AZ_MSG_BT_KEEP_ALIVE );
 
     peer_dbg( "SEND keep-alive" );
@@ -203 +201 @@
 static void sendChoke( tr_peer_t * peer, int yes )
 {
-    uint8_t * p;
-    int       id;
+    int id;
 
     id = ( yes ? PEER_MSG_CHOKE : PEER_MSG_UNCHOKE );
-    p = getMessagePointer( peer, 0, id );
+    getMessagePointer( peer, 0, id );
 
     peer->amChoking = yes;
@@ -228 +225 @@
 static void sendInterest( tr_peer_t * peer, int yes )
 {
-    uint8_t * p;
-    int       id;
+    int id;
 
     id = ( yes ? PEER_MSG_INTERESTED : PEER_MSG_UNINTERESTED );
-    p = getMessagePointer( peer, 0, id );
+    getMessagePointer( peer, 0, id );
 
     peer->amInterested = yes;
@@ -265 +261 @@
 static void sendBitfield( tr_torrent_t * tor, tr_peer_t * peer )
 {
-    uint8_t * p;
-    int       bitfieldSize = ( tor->info.pieceCount + 7 ) / 8;
-
-    p = getMessagePointer( peer, bitfieldSize, PEER_MSG_BITFIELD );
-
-    memcpy( p, tr_cpPieceBitfield( tor->completion ), bitfieldSize );
+    uint8_t       * p;
+    tr_bitfield_t * bitfield;
+
+    bitfield = tr_cpPieceBitfield( tor->completion );
+    p = getMessagePointer( peer, bitfield->len, PEER_MSG_BITFIELD );
+
+    memcpy( p, bitfield->bits, bitfield->len );
 
     peer_dbg( "SEND bitfield" );

branches/pex/libtransmission/peerparse.h

@@ -732 +732 @@
         assert( 0 <= peer->pos );
 
-        /* don't try to parse zero-length messages */
-        if( !len )
-        {
-            continue;
-        }
-
         if( ( ret = parseMessage( tor, peer, msgid, p, len ) ) )
         {