Changeset 1160

Timestamp:

Dec 6, 2006, 8:21:00 PM (16 years ago)

Author:

livings124

Message:

tracker should be set when added rather than when started

Location:

branches/multitracker/libtransmission

Files:

• metainfo.c (modified) (1 diff)
• tracker.c (modified) (4 diffs)
• transmission.c (modified) (2 diffs)
• transmission.h (modified) (1 diff)

branches/multitracker/libtransmission/metainfo.c

@@ -302 +302 @@
     }
     
+    tr_setTorrentAnnounce( inf, &inf->trackerAnnounceList[0] );
+    
     free( address );
     free( announce );

branches/multitracker/libtransmission/tracker.c

@@ -66 +66 @@
 };
 
-static void        setAnnounce( tr_tracker_t * tc, tr_announce_list_item_t * announceItem );
-static int         announceToScrape( char * announce, char * scrape );
+static void        setAnnounce      ( tr_tracker_t * tc, tr_announce_list_item_t * announceItem );
 static void        failureAnnouncing( tr_tracker_t * tc );
 static tr_http_t * getQuery         ( tr_tracker_t * tc );
@@ -82 +81 @@
     tc->tor            = tor;
     tc->id             = tor->id;
-    
-    setAnnounce( tc, &tor->info.trackerAnnounceList[0] );
 
     tc->started        = 1;
@@ -103 +100 @@
 static void setAnnounce( tr_tracker_t * tc, tr_announce_list_item_t * announceItem )
 {
-    tr_torrent_t * tor = tc->tor;
-    tr_info_t    * inf = &tor->info;
-    
-    tr_lockLock( &tor->lock );
-    
-    snprintf( inf->trackerAddress, 256, "%s", announceItem->address );
-    inf->trackerPort = announceItem->port;
-    snprintf( inf->trackerAnnounce, MAX_PATH_LENGTH, "%s", announceItem->announce );
-    
-    inf->trackerCanScrape = announceToScrape( announceItem->announce, inf->trackerScrape );
+    tr_lockLock( &tc->tor->lock );
+    
+    tr_setTorrentAnnounce( &tc->tor->info, announceItem);
     tc->dateScrape = 0;
     
-    tr_lockUnlock( &tor->lock );
-}
-
-static int announceToScrape( char * announce, char * scrape )
-{   
-    char * slash, * nextSlash;
-    int pre, post;
-    
-    slash = strchr( announce, '/' );
-    while( ( nextSlash = strchr( slash + 1, '/' ) ) )
-    {
-        slash = nextSlash;
-    }
-    slash++;
-    
-    if( !strncmp( slash, "announce", 8 ) )
-    {
-        pre  = (long) slash - (long) announce;
-        post = strlen( announce ) - pre - 8;
-        memcpy( scrape, announce, pre );
-        sprintf( &scrape[pre], "scrape" );
-        memcpy( &scrape[pre+6], &announce[pre+8], post );
-        scrape[pre+6+post] = 0;
-        
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
+    tr_lockUnlock( &tc->tor->lock );
 }
 
@@ -319 +280 @@
             
             setAnnounce( tc, &inf->trackerAnnounceList[tc->announceTier] );
-            
             tc->shouldChangeAnnounce = 0;
         }

branches/multitracker/libtransmission/transmission.c

@@ -34 +34 @@
 static void  acceptLoop( void * );
 static void acceptStop( tr_handle_t * h );
+static int announceToScrape( char * announce, char * scrape );
 
 /***********************************************************************
@@ -543 +544 @@
 
     return s;
+}
+
+static int announceToScrape( char * announce, char * scrape )
+{   
+    char * slash, * nextSlash;
+    int pre, post;
+    
+    slash = strchr( announce, '/' );
+    while( ( nextSlash = strchr( slash + 1, '/' ) ) )
+    {
+        slash = nextSlash;
+    }
+    slash++;
+    
+    if( !strncmp( slash, "announce", 8 ) )
+    {
+        pre  = (long) slash - (long) announce;
+        post = strlen( announce ) - pre - 8;
+        memcpy( scrape, announce, pre );
+        sprintf( &scrape[pre], "scrape" );
+        memcpy( &scrape[pre+6], &announce[pre+8], post );
+        scrape[pre+6+post] = 0;
+        
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+/* Must lock torrent before use */
+void tr_setTorrentAnnounce( tr_info_t * inf, tr_announce_list_item_t * announceItem )
+{
+    snprintf( inf->trackerAddress, 256, "%s", announceItem->address );
+    inf->trackerPort = announceItem->port;
+    snprintf( inf->trackerAnnounce, MAX_PATH_LENGTH, "%s", announceItem->announce );
+    
+    inf->trackerCanScrape = announceToScrape( announceItem->announce, inf->trackerScrape );
 }
 

branches/multitracker/libtransmission/transmission.h

@@ -260 +260 @@
 
 /***********************************************************************
+ * tr_setTorrentAnnounce
+ ***********************************************************************/
+void tr_setTorrentAnnounce( tr_info_t * inf, tr_announce_list_item_t * announceItem );
+
+/***********************************************************************
  * tr_torrentPeers
  ***********************************************************************/