Changeset 2837

Timestamp:

Aug 18, 2007, 8:28:57 AM (15 years ago)

Author:

charles

Message:

• more work on the tracker... getting closer.
• oops! make sure autoconf is giving the `0.80+' in the User-Agent header.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• libtransmission/tracker.c (modified) (7 diffs)
• libtransmission/version.h.in (modified) (1 diff)

trunk/configure.ac

@@ -1 @@
-AC_INIT([Transmission],[0.80],[http://transmission.m0k.org/trac/newticket])
-PEERID_PREFIX="-TR0800-"
-USERAGENT_PREFIX="0.80"
+AC_INIT([Transmission],[0.80+],[http://transmission.m0k.org/trac/newticket])
+PEERID_PREFIX="-TR080Z-"
+USERAGENT_PREFIX="0.80+"
 
 AC_PREREQ(2.54)

trunk/libtransmission/tracker.c

@@ -53 +53 @@
 
 /* the length of the 'key' argument passed in tracker requests */
-#define TR_KEY_LEN 20
+#define TR_KEY_LEN 10
 
 
@@ -151 +151 @@
     const Torrent * b = (const Torrent*) vb;
     return memcmp( a->hash, b->hash, SHA_DIGEST_LENGTH );
+}
+
+/***
+****
+***/
+
+typedef struct
+{
+    char * address;
+    int port;
+    struct evhttp_connection * evconn;
+}
+connection_key_t;
+
+static int
+connectionCompare( const void * va, const void * vb )
+{
+    const connection_key_t * a = (const connection_key_t *) va;
+    const connection_key_t * b = (const connection_key_t *) vb;
+    int ret = strcmp( a->address, b->address );
+    if( ret ) return ret;
+    return a->port - b->port;
+}
+
+static struct evhttp_connection*
+getConnection( const char * address, int port )
+{
+    connection_key_t *val, tmp;
+
+    static tr_ptrArray_t * connections = NULL;
+    if( !connections )
+        connections = tr_ptrArrayNew( );
+
+    tmp.address = (char*) address;
+    tmp.port = port;
+    val = tr_ptrArrayFindSorted( connections, &tmp, connectionCompare );
+
+    if( !val )
+    {
+        val = tr_new( connection_key_t, 1 );
+        val->address = tr_strdup( address );
+        val->port = port;
+        val->evconn = evhttp_connection_new( address, port );
+        tr_ptrArrayInsertSorted( connections, val, connectionCompare );
+    }
+
+    return val->evconn;
 }
 
@@ -598 +645 @@
             t->multiscrapeMax = numResponses;
     }
+    else if( !req )
+    {
+        int i, n;
+        Torrent ** torrents = (Torrent**)
+            tr_ptrArrayPeek( t->scraping, &n );
+        for( i=0; i<n; ++i ) {
+            fprintf( stderr, "null req -- torent #%d is %s\n", i, torrents[i]->torrent->info.name );
+            torrents[i]->scrapeTag = tr_timerNew( t->handle,
+                                                  onTorrentScrapeNow,
+                                                  torrents[i], NULL,
+                                                  t->scrapeIntervalMsec );
+        }
+        tr_ptrArrayClear( t->scraping );
+
+        t->multiscrapeMax = INT_MAX;
+    }
 
     if (( errmsg = updateAddresses( t, req ) )) {
@@ -668 +731 @@
         /* ping the tracker */
         tr_inf( "scrape to %s:%d: %s", address->address, address->port, uri );
-        evcon = evhttp_connection_new( address->address, address->port );
+        evcon = getConnection( address->address, address->port );
         assert( evcon != NULL );
         evhttp_connection_set_timeout( evcon, SCRAPE_TIMEOUT_INTERVAL_SEC );
@@ -861 +924 @@
     else
     {
-        tr_inf( "Bad response from tracker '%s' on request '%s'"
+        tr_inf( "Bad response from tracker '%s' on request '%s' "
                 "for torrent '%s'... trying again in 30 seconds",
                 tor->tracker->primaryAddress,
@@ -905 +968 @@
     tr_timerFree( &tor->reannounceTag );
 
-    evcon = evhttp_connection_new( address->address, address->port );
+    evcon = getConnection( address->address, address->port );
     if ( !evcon )
         tr_err( "Can't make a connection to %s:%d", address->address, address->port );
@@ -917 +980 @@
     }
 
-    tr_free( uri );
-
     return FALSE;
 }

trunk/libtransmission/version.h.in

@@ -3 +3 @@
 #define SVN_REVISION          "@SVN_REVISION@"
 #define SHORT_VERSION_STRING  "@USERAGENT_PREFIX@"
-#define LONG_VERSION_STRING   "@USERAGENT_PREFIX@ r(@SVN_REVISION@)"
+#define LONG_VERSION_STRING   "@USERAGENT_PREFIX@ (r@SVN_REVISION@)"