Changeset 7533

Timestamp:

Dec 29, 2008, 9:17:48 PM (12 years ago)

Author:

charles

Message:

(trunk libT) use torrent's unique ID as the torrent's lookup key

Location:

trunk/libtransmission

Files:

• tracker.c (modified) (17 diffs)
• tracker.h (modified) (1 diff)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/libtransmission/tracker.c

@@ -99 +99 @@
     char       escaped[SHA_DIGEST_LENGTH * 3 + 1];
     char *     name;
+    int        torrentId;
 
     /* corresponds to the peer_id sent as a tracker request parameter.
@@ -175 +176 @@
 
 static tr_tracker *
-findTracker( tr_session *    session,
-             const uint8_t * hash )
-{
-    tr_torrent * torrent = tr_torrentFindFromHash( session, hash );
+findTracker( tr_session * session, int torrentId )
+{
+    tr_torrent * torrent = tr_torrentFindFromId( session, torrentId );
 
     return torrent ? torrent->tracker : NULL;
@@ -187 +187 @@
 ***/
 
-static const tr_tracker_event emptyEvent = { 0, NULL, NULL, NULL, 0, 0 };
+static const tr_tracker_event emptyEvent = { 0, NULL, NULL, 0, 0 };
 
 static void
@@ -197 +197 @@
     {
         tr_tracker_event event = emptyEvent;
-        event.hash = t->hash;
         event.messageType = type;
         event.text = msg;
@@ -233 +232 @@
     tr_tracker_event event = emptyEvent;
 
-    event.hash = t->hash;
     event.messageType = TR_TRACKER_PEERS;
     event.allAreSeeds = allAreSeeds;
@@ -383 +381 @@
 
 static void
-onStoppedResponse( tr_session *                 session,
+onStoppedResponse( tr_session    * session,
                    long            responseCode UNUSED,
                    const void    * response     UNUSED,
                    size_t          responseLen  UNUSED,
-                   void *                       torrent_hash  )
-{
-    tr_tracker * t = findTracker( session, torrent_hash );
+                   void          * torrentId )
+{
+    tr_tracker * t = findTracker( session, tr_ptr2int( torrentId ) );
     if( t )
     {
@@ -403 +401 @@
     dbgmsg( NULL, "got a response to some `stop' message" );
     onReqDone( session );
-    tr_free( torrent_hash );
 }
 
@@ -411 +408 @@
                    const void * response,
                    size_t       responseLen,
-                   void *       torrent_hash )
+                   void       * torrentId )
 {
     int retry;
@@ -419 +416 @@
 
     onReqDone( session );
-    t = findTracker( session, torrent_hash );
-    tr_free( torrent_hash );
+    t = findTracker( session, tr_ptr2int( torrentId ) );
     if( !t ) /* tracker's been closed */
         return;
@@ -610 +606 @@
                   const void * response,
                   size_t       responseLen,
-                  void       * torrent_hash )
+                  void       * torrentId )
 {
     int          success = FALSE;
@@ -617 +613 @@
 
     onReqDone( session );
-    t = findTracker( session, torrent_hash );
-    tr_free( torrent_hash );
+    t = findTracker( session, tr_ptr2int( torrentId ) );
     if( !t ) /* tracker's been closed... */
         return;
@@ -732 +727 @@
 struct tr_tracker_request
 {
-    uint8_t             torrent_hash[SHA_DIGEST_LENGTH];
     int                 reqtype; /* TR_REQ_* */
+    int                 torrentId;
     char *              url;
     tr_web_done_func *  done_func;
@@ -813 +808 @@
     req->done_func =  isStopping ? onStoppedResponse : onTrackerResponse;
     req->url = tr_strdup( EVBUFFER_DATA( url ) );
-    memcpy( req->torrent_hash, tracker->hash, SHA_DIGEST_LENGTH );
+    req->torrentId = tracker->torrentId;
 
     evbuffer_free( url );
@@ -836 +831 @@
     req->url = tr_strdup( EVBUFFER_DATA( url ) );
     req->done_func = onScrapeResponse;
-    memcpy( req->torrent_hash, tracker->hash, SHA_DIGEST_LENGTH );
+    req->torrentId = tracker->torrentId;
 
     evbuffer_free( url );
@@ -883 +878 @@
 {
     struct tr_tracker_request * req = vreq;
-    tr_tracker *                t = findTracker( req->session,
-                                                 req->torrent_hash );
+    tr_tracker * t = findTracker( req->session, req->torrentId );
 
     if( t )
@@ -905 +899 @@
     ++req->session->tracker->runningCount;
 
-    tr_webRun( req->session, req->url, NULL, req->done_func,
-              tr_memdup( req->torrent_hash, SHA_DIGEST_LENGTH ) );
+    tr_webRun( req->session, req->url, NULL,
+               req->done_func, tr_int2ptr( req->torrentId ) );
 
     freeRequest( req );
@@ -1063 +1057 @@
     t->lastScrapeResponse       = -1;
     t->manualAnnounceAllowedAt  = ~(time_t)0;
-    t->name = tr_strdup( info->name );
-    t->randOffset = tr_cryptoRandInt( 30 );
+    t->name                     = tr_strdup( info->name );
+    t->torrentId                = torrent->uniqueId;
+    t->randOffset               = tr_cryptoRandInt( 30 );
     memcpy( t->hash, info->hash, SHA_DIGEST_LENGTH );
     escape( t->escaped, info->hash, SHA_DIGEST_LENGTH );

trunk/libtransmission/tracker.h

@@ -52 +52 @@
     TrackerEventType    messageType;
 
-    /* the torrent's 20-character sha1 hash */
-    const uint8_t *  hash;
-
     /* for TR_TRACKER_WARNING and TR_TRACKER_ERROR */
     const char *  text;

trunk/libtransmission/utils.c

@@ -1285 +1285 @@
     return dir==TR_UP || dir==TR_DOWN;
 }
+
+int
+tr_ptr2int( void* v )
+{
+    return (intptr_t)v;
+}
+
+void*
+tr_int2ptr( int i )
+{
+    return (void*)(intptr_t)i;
+}

trunk/libtransmission/utils.h

@@ -402 +402 @@
     && tr_bitfieldHasFast( bitfield, nth ) )
 
-double tr_getRatio( double numerator,
-                    double denominator );
+double tr_getRatio( double numerator, double denominator );
+
+
+int tr_ptr2int( void* );
+
+void* tr_int2ptr( int );
 
 #ifdef __cplusplus