Changeset 13933

Timestamp:

Feb 2, 2013, 1:42:50 PM (8 years ago)

Author:

jordan

Message:

(libT) recycle the peer id used for public torrents after N hours of use

Location:

trunk/libtransmission

Files:

• announcer.c (modified) (4 diffs)
• handshake.c (modified) (4 diffs)
• quark.c (modified) (1 diff)
• quark.h (modified) (1 diff)
• session.c (modified) (4 diffs)
• session.h (modified) (1 diff)
• torrent.c (modified) (3 diffs)
• torrent.h (modified) (2 diffs)

trunk/libtransmission/announcer.c

@@ -906 +906 @@
 static tr_announce_request *
 announce_request_new (const tr_announcer  * announcer,
-                      const tr_torrent    * tor,
+                      tr_torrent          * tor,
                       const tr_tier       * tier,
                       tr_announce_event     event)
@@ -915 +915 @@
     req->tracker_id_str = tr_strdup (tier->currentTracker->tracker_id_str);
     memcpy (req->info_hash, tor->info.hash, SHA_DIGEST_LENGTH);
-    memcpy (req->peer_id, tor->peer_id, PEER_ID_LEN);
+    memcpy (req->peer_id, tr_torrentGetPeerId(tor), PEER_ID_LEN);
     req->up = tier->byteCounts[TR_ANN_UP];
     req->down = tier->byteCounts[TR_ANN_DOWN];
@@ -1210 +1210 @@
     fprintf (stderr, "ANNOUNCE: event %s isPartialSeed %d port %d key %d numwant %d"
                      " up %"PRIu64" down %"PRIu64" corrupt %"PRIu64" left %"PRIu64
-                     " url [%s] tracker_id_str [%s] peer_id [%8.8s]\n",
+                     " url [%s] tracker_id_str [%s] peer_id [%20.20s]\n",
              tr_announce_event_get_string (request->event),
              (int)request->partial_seed,
@@ -1241 +1241 @@
     tr_announce_request * req;
     struct announce_data * data;
-    const tr_torrent * tor = tier->tor;
+    tr_torrent * tor = tier->tor;
     const time_t now = tr_time ();
 

trunk/libtransmission/handshake.c

@@ -194 +194 @@
   uint8_t * walk = buf;
   const uint8_t * torrentHash = tr_cryptoGetTorrentHash (handshake->crypto);
-  const tr_torrent * tor = tr_torrentFindFromHash (handshake->session, torrentHash);
-  const uint8_t * peer_id = tor->peer_id;
+  tr_torrent * tor = tr_torrentFindFromHash (handshake->session, torrentHash);
+  const unsigned char * peer_id = tr_torrentGetPeerId (tor);
 
   memcpy (walk, HANDSHAKE_NAME, HANDSHAKE_NAME_LEN);
@@ -236 +236 @@
   uint8_t reserved[HANDSHAKE_FLAGS_LEN];
   uint8_t hash[SHA_DIGEST_LENGTH];
-  const tr_torrent * tor;
-  const uint8_t * tor_peer_id;
+  tr_torrent * tor;
   uint8_t peer_id[PEER_ID_LEN];
 
@@ -273 +272 @@
 
   tor = tr_torrentFindFromHash (handshake->session, hash);
-  tor_peer_id = tor->peer_id;
-  if (!memcmp (peer_id, tor_peer_id, PEER_ID_LEN))
+  if (!memcmp (peer_id, tr_torrentGetPeerId(tor), PEER_ID_LEN))
     {
       dbgmsg (handshake, "streuth!  we've connected to ourselves.");
@@ -704 +702 @@
   /* if we've somehow connected to ourselves, don't keep the connection */
   tor = tr_torrentFindFromHash (handshake->session, tr_peerIoGetTorrentHash (handshake->io));
-  connected_to_self = (tor != NULL) && !memcmp (peer_id, tor->peer_id, PEER_ID_LEN);
+  connected_to_self = (tor != NULL) && !memcmp (peer_id, tr_torrentGetPeerId(tor), PEER_ID_LEN);
 
   return tr_handshakeDone (handshake, !connected_to_self);

trunk/libtransmission/quark.c

@@ -209 +209 @@
   { "pausedTorrentCount", 18 },
   { "peer-congestion-algorithm", 25 },
+  { "peer-id-ttl-hours", 17 },
   { "peer-limit", 10 },
   { "peer-limit-global", 17 },

trunk/libtransmission/quark.h

@@ -219 +219 @@
   TR_KEY_pausedTorrentCount,
   TR_KEY_peer_congestion_algorithm,
+  TR_KEY_peer_id_ttl_hours,
   TR_KEY_peer_limit,
   TR_KEY_peer_limit_global,

trunk/libtransmission/session.c

@@ -309 +309 @@
     assert (tr_variantIsDict (d));
 
-    tr_variantDictReserve (d, 62);
+    tr_variantDictReserve (d, 63);
     tr_variantDictAddBool (d, TR_KEY_blocklist_enabled,               false);
     tr_variantDictAddStr  (d, TR_KEY_blocklist_url,                   "http://www.example.com/blocklist");
@@ -338 +338 @@
     tr_variantDictAddInt  (d, TR_KEY_preallocation,                   TR_PREALLOCATE_SPARSE);
     tr_variantDictAddBool (d, TR_KEY_prefetch_enabled,                DEFAULT_PREFETCH_ENABLED);
+    tr_variantDictAddInt  (d, TR_KEY_peer_id_ttl_hours,               6);
     tr_variantDictAddBool (d, TR_KEY_queue_stalled_enabled,           true);
     tr_variantDictAddInt  (d, TR_KEY_queue_stalled_minutes,           30);
@@ -409 +410 @@
   tr_variantDictAddInt  (d, TR_KEY_preallocation,                s->preallocationMode);
   tr_variantDictAddInt  (d, TR_KEY_prefetch_enabled,             s->isPrefetchEnabled);
+  tr_variantDictAddInt  (d, TR_KEY_peer_id_ttl_hours,            s->peer_id_ttl_hours);
   tr_variantDictAddBool (d, TR_KEY_queue_stalled_enabled,        tr_sessionGetQueueStalledEnabled (s));
   tr_variantDictAddInt  (d, TR_KEY_queue_stalled_minutes,        tr_sessionGetQueueStalledMinutes (s));
@@ -800 +802 @@
     if (tr_variantDictFindBool (settings, TR_KEY_trash_original_torrent_files, &boolVal))
         tr_sessionSetDeleteSource (session, boolVal);
+    if (tr_variantDictFindInt (settings, TR_KEY_peer_id_ttl_hours, &i))
+        session->peer_id_ttl_hours = i;
 
     /* torrent queues */

trunk/libtransmission/session.h

@@ -119 +119 @@
     bool                         scrapePausedTorrents;
 
+    uint8_t                      peer_id_ttl_hours;
+
     tr_variant                   removedTorrents;
 

trunk/libtransmission/torrent.c

@@ -176 +176 @@
 
 /***
+****
+***/
+
+static void
+tr_torrentUnsetPeerId (tr_torrent * tor)
+{
+  /* triggers a rebuild next time tr_torrentGetPeerId() is called */
+  *tor->peer_id = '\0';
+}
+
+static int
+peerIdTTL (const tr_torrent * tor)
+{
+  int ttl;
+
+  if (!tor->peer_id_creation_time)
+    ttl = 0;
+  else
+    ttl = (int)difftime(tor->peer_id_creation_time+(tor->session->peer_id_ttl_hours*3600), tr_time());
+
+  return ttl;
+}
+
+const unsigned char *
+tr_torrentGetPeerId (tr_torrent * tor)
+{
+  bool needs_new_peer_id = false;
+
+  if (!*tor->peer_id)
+    needs_new_peer_id = true;
+
+  if (!needs_new_peer_id)
+    if (!tr_torrentIsPrivate (tor))
+      if (peerIdTTL (tor) <= 0)
+        needs_new_peer_id = true;
+
+  if (needs_new_peer_id)
+    {
+      tr_peerIdInit (tor->peer_id);
+      tor->peer_id_creation_time = tr_time ();
+    }
+
+  return tor->peer_id;
+}
+/***
 ****  PER-TORRENT UL / DL SPEEDS
 ***/
@@ -821 +866 @@
     tor->queuePosition = session->torrentCount;
 
-    tr_peerIdInit (tor->peer_id);
-
     tr_sha1 (tor->obfuscatedHash, "req2", 4,
              tor->info.hash, SHA_DIGEST_LENGTH,
@@ -1661 +1704 @@
      * change the peerid. It would help sometimes if a stopped event
      * was missed to ensure that we didn't think someone was cheating. */
-    tr_peerIdInit (tor->peer_id);
-    tor->isRunning = 1;
+    tr_torrentUnsetPeerId (tor);
+    tor->isRunning = true;
     tr_torrentSetDirty (tor);
     tr_runInEventThread (tor->session, torrentStartImpl, tor);

trunk/libtransmission/torrent.h

@@ -160 +160 @@
      * and in the handshake are expected to match.
      */
-    uint8_t peer_id[PEER_ID_LEN+1];
+    unsigned char peer_id[PEER_ID_LEN+1];
+
+    time_t peer_id_creation_time;
 
     /* Where the files will be when it's complete */
@@ -436 +438 @@
 bool tr_torrentIsStalled (const tr_torrent * tor);
 
+const unsigned char * tr_torrentGetPeerId (tr_torrent * tor);
+
+
 static inline bool
 tr_torrentIsQueued (const tr_torrent * tor)