Changeset 2982

Timestamp:

Sep 6, 2007, 9:00:39 PM (15 years ago)

Author:

charles

Message:

requests

Location:

branches/encryption/libtransmission

Files:

• list.c (modified) (1 diff)
• list.h (modified) (1 diff)
• peer-msgs.c (modified) (5 diffs)
• peer-msgs.h (modified) (1 diff)

branches/encryption/libtransmission/list.c

@@ -137 +137 @@
     }
 }
+
+int
+tr_list_size( const tr_list * list )
+{
+    int ret = 0;
+
+    while( list )
+    {
+        ++list;
+        list = list->next;
+    }
+
+    return ret;
+}

branches/encryption/libtransmission/list.h

@@ -24 +24 @@
 typedef int (*TrListCompareFunc)(const void * a, const void * b);
 typedef void (*TrListForeachFunc)(void *);
+
+int         tr_list_size           ( const tr_list    * list );
 
 void        tr_list_free           ( tr_list         ** list );

branches/encryption/libtransmission/peer-msgs.c

@@ -44 +44 @@
 #define PEX_INTERVAL (MINUTES_TO_MSEC(1))
 
+/* the most requests we'll batch up for this peer */
+#define MAX_OUT_REQUESTS 10
+
 enum
 {
@@ -112 +115 @@
     struct evbuffer * inBlock;     /* the block we're currently receiving */
     tr_list * peerAskedFor;
-    tr_list * outPieces;
+    tr_list * clientAskedFor;
 
     tr_timer_tag pulseTag;
@@ -213 +216 @@
         tr_peerIoWriteBytes( peer->io, peer->outMessages, &bt_msgid, 1 );
     }
+}
+
+/**
+***
+**/
+
+int
+tr_peerMsgsAddRequest( tr_peermsgs * peer,
+                       uint32_t      index, 
+                       uint32_t      begin, 
+                       uint32_t      length )
+{
+    int ret =-1;
+
+    if( tr_list_size(peer->clientAskedFor) < MAX_OUT_REQUESTS )
+    {
+        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 );
+
+        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, 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 );
+
+        req->index = index;
+        req->begin = begin;
+        req->length = length;
+        tr_list_append( &peer->clientAskedFor, req );
+
+        ret = 0;
+    }
+
+    return ret;
 }
 
@@ -497 +537 @@
 }
 
+static int
+weAskedForThisBlock( const tr_peermsgs * peer, uint32_t index, uint32_t offset, uint32_t
+
 static void
 gotBlock( tr_peermsgs * peer, int index, int offset, struct evbuffer * inbuf )
@@ -513 +556 @@
         return;
     }
+
+cc
+struct peer_request
+{
+    uint32_t index;
+    uint32_t offset;
+    uint32_t length;
+};
+
+
+        tr_list_append( &peer->clientAskedFor, req );
+
+ccc
+    --peer->outReqCount;
 
     /* write to disk */

branches/encryption/libtransmission/peer-msgs.h

@@ -26 +26 @@
 void         tr_peerMsgsFree( tr_peermsgs* );
 
+int          tr_peerMsgsAddRequest( tr_peermsgs * peer,
+                                    uint32_t      index,
+                                    uint32_t      begin,
+                                    uint32_t      length );
+
+
 #endif