Changeset 2983

Timestamp:

Sep 7, 2007, 4:49:05 AM (15 years ago)

Author:

charles

Message:

a little more work on requests

File:

• branches/encryption/libtransmission/peer-msgs.c (modified) (7 diffs)

branches/encryption/libtransmission/peer-msgs.c

@@ -158 +158 @@
 
 static int
-isInteresting( const tr_peermsgs * peer )
+isPeerInteresting( const tr_peermsgs * peer )
 {
     int i;
@@ -190 +190 @@
 updateInterest( tr_peermsgs * peer )
 {
-    const int i = isInteresting( peer );
+    const int i = isPeerInteresting( peer );
     if( i != peer->info->clientIsInterested )
         sendInterest( peer, i );
@@ -225 +225 @@
 tr_peerMsgsAddRequest( tr_peermsgs * peer,
                        uint32_t      index, 
-                       uint32_t      begin, 
+                       uint32_t      offset, 
                        uint32_t      length )
 {
@@ -234 +234 @@
         const uint8_t bt_msgid = BT_REQUEST;
         const uint32_t len = sizeof(uint8_t) + 3 * sizeof(uint32_t);
-        struct peer_request * req = tr_new( peer_request, 1 );
+        struct peer_request * req = tr_new( struct peer_request, 1 );
 
         tr_peerIoWriteUint32( peer->io, peer->outMessages, len );
         tr_peerIoWriteBytes( peer->io, peer->outMessages, &bt_msgid, 1 );
         tr_peerIoWriteUint32( peer->io, peer->outMessages, index );
-        tr_peerIoWriteUint32( peer->io, peer->outMessages, begin );
+        tr_peerIoWriteUint32( peer->io, peer->outMessages, offset );
         tr_peerIoWriteUint32( peer->io, peer->outMessages, length );
-        fprintf( stderr, "peer %p: requesting a block from piece %u, begin %u, length %u\n",
-                         peer, (unsigned int)index, (unsigned int)begin, (unsigned int)length );
+        fprintf( stderr, "peer %p: requesting a block from piece %u, offset %u, length %u\n",
+                         peer, (unsigned int)index, (unsigned int)offset, (unsigned int)length );
 
         req->index = index;
-        req->begin = begin;
+        req->offset = offset;
         req->length = length;
         tr_list_append( &peer->clientAskedFor, req );
@@ -538 +538 @@
 
 static int
-weAskedForThisBlock( const tr_peermsgs * peer, uint32_t index, uint32_t offset, uint32_t
+weAskedForThisBlock( const tr_peermsgs * peer, uint32_t index, uint32_t offset, uint32_t length )
+{
+    struct peer_request tmp;
+    tmp.index = index;
+    tmp.offset = offset;
+    tmp.length = length;
+
+    return tr_list_find( peer->clientAskedFor, &tmp, peer_request_compare_func ) != NULL;
+}
 
 static void
@@ -556 +564 @@
         return;
     }
-
-cc
-struct peer_request
-{
-    uint32_t index;
-    uint32_t offset;
-    uint32_t length;
-};
-
-
-        tr_list_append( &peer->clientAskedFor, req );
-
-ccc
-    --peer->outReqCount;
+    if( !weAskedForThisBlock( peer, index, offset, len ) ) {
+        tr_dbg( "we didn't ask the peer for this message..." );
+        return;
+    }
 
     /* write to disk */
@@ -585 +583 @@
     tr_rcTransferred( tor->download, len );
     tr_rcTransferred( tor->handle->download, len );
-
-//    broadcastCancel( tor, index, begin, len - 8 );
 }