Changeset 1060

Timestamp:

Nov 9, 2006, 4:45:14 AM (16 years ago)

Author:

titer

Message:

Saves a list of peers when you pause a torrent, and tries to reconnect to them next time you resume it

Location:

trunk/libtransmission

Files:

• fastresume.h (modified) (4 diffs)
• peer.c (modified) (2 diffs)
• peer.h (modified) (2 diffs)

trunk/libtransmission/fastresume.h

@@ -51 +51 @@
 /* number of bytes uploaded */
 #define FR_ID_UPLOADED          0x03
+/* IPs and ports of connectable peers */
+#define FR_ID_PEERS             0x04
 
 /* macros for the length of various pieces of the progress data */
@@ -127 +129 @@
     uint8_t * buf;
     uint64_t  total;
+    int       size;
 
     buf = malloc( FR_PROGRESS_LEN( tor ) );
@@ -167 +170 @@
     total = tor->uploadedCur + tor->uploadedPrev;
     fastResumeWriteData( FR_ID_UPLOADED, &total, 8, 1, file );
+
+    /* Write IPs and ports of connectable peers, if any */
+    if( ( size = tr_peerGetConnectable( tor, &buf ) ) > 0 )
+    {
+        fastResumeWriteData( FR_ID_PEERS, buf, size, 1, file );
+        free( buf );
+    }
 
     fclose( file );
@@ -359 +369 @@
                 break;
 
+            case FR_ID_PEERS:
+            {
+                uint8_t * buf = malloc( len );
+                if( 1 != fread( buf, len, 1, file ) )
+                {
+                    free( buf );
+                    fclose( file );
+                    return 1;
+                }
+                tr_peerAddCompactMany( tor, buf, len );
+                free( buf );
+                continue;
+            }
+
             default:
                 break;

trunk/libtransmission/peer.c

@@ -152 +152 @@
 
 /***********************************************************************
+ * tr_peerAddCompactMany
+ ***********************************************************************
+ * Adds several peers in compact form
+ **********************************************************************/
+void tr_peerAddCompactMany( tr_torrent_t * tor, uint8_t * buf, int len )
+{
+    struct in_addr addr;
+    in_port_t port;
+    int i;
+
+    len /= 6;
+    for( i = 0; i < len; i++ )
+    {
+        memcpy( &addr, buf, 4 ); buf += 4;
+        memcpy( &port, buf, 2 ); buf += 2;
+        tr_peerAddCompact( tor, addr, port );
+    }
+}
+
+/***********************************************************************
  * tr_peerInit
  ***********************************************************************
@@ -617 +637 @@
     tr_bitfieldRem( peer->blamefield, piece );
 }
+
+int tr_peerGetConnectable( tr_torrent_t * tor, uint8_t ** _buf )
+{
+    int count = 0;
+    uint8_t * buf = malloc( 6 * tor->peerCount );
+    tr_peer_t * peer;
+    int i;
+
+    for( i = 0; i < tor->peerCount; i++ )
+    {
+        peer = tor->peers[i];
+
+        /* Skip peers for which the connection isn't established,
+         * and peers that came from incoming connections */
+        if( peer->status < PEER_STATUS_CONNECTED )
+            continue;
+        if( peer->incoming )
+            continue;
+
+        memcpy( &buf[count*6], &peer->addr, 4 );
+        memcpy( &buf[count*6+4], &peer->port, 2 );
+        count++;
+    }
+
+    if( count < 1 )
+    {
+        free( buf );
+        *_buf = NULL;
+    }
+    else
+    {
+        *_buf = buf;
+    }
+
+    return count * 6;
+}

trunk/libtransmission/peer.h

@@ -30 +30 @@
 void        tr_peerAddOld        ( tr_torrent_t *, char *, int );
 void        tr_peerAddCompact    ( tr_torrent_t *, struct in_addr, in_port_t );
+void        tr_peerAddCompactMany( tr_torrent_t *, uint8_t *, int );
 tr_peer_t * tr_peerInit          ( struct in_addr, in_port_t, int );
 void        tr_peerAttach        ( tr_torrent_t *, tr_peer_t * );
@@ -55 +56 @@
                                    int piece, int success );
 struct in_addr * tr_peerAddress  ( tr_peer_t * );
+int         tr_peerGetConnectable( tr_torrent_t *, uint8_t ** );
 
 #endif