Changeset 10090

Timestamp:

Feb 3, 2010, 6:32:14 AM (12 years ago)

Author:

charles

Message:

(trunk libT) remove dead announce fields like supportscrypto and requirescrypto. these don't appear to be supported by any of the major clients so why waste the announce bandwidth...

Location:

trunk/libtransmission

Files:

• announcer.c (modified) (5 diffs)
• web.c (modified) (4 diffs)

trunk/libtransmission/announcer.c

@@ -662 +662 @@
     struct evbuffer * buf = evbuffer_new( );
     char * ret;
+    const char * str;
     const unsigned char * ipv6;
 
@@ -674 +675 @@
                               "&numwant=%d"
                               "&key=%s"
-                              "&compact=1"
-                              "&supportcrypto=1",
+                              "&compact=1",
                               ann,
                               strchr( ann, '?' ) ? '&' : '?',
@@ -690 +690 @@
         evbuffer_add_printf( buf, "&corrupt=%" PRIu64, torrent->corruptCur );
 
-    if( !isStopping )
-        evbuffer_add_printf( buf, "&upload_only=%d", tr_torrentIsSeed( torrent ) ? 1 : 0 );
-
-    if( announcer->session->encryptionMode == TR_ENCRYPTION_REQUIRED )
-        evbuffer_add_printf( buf, "&requirecrypto=1" );
-
-    if( eventName && *eventName )
-        evbuffer_add_printf( buf, "&event=%s", eventName );
-
-    if( tracker->tracker_id && *tracker->tracker_id )
-        evbuffer_add_printf( buf, "&trackerid=%s", tracker->tracker_id );
+    str = eventName;
+    if( str && *str )
+        evbuffer_add_printf( buf, "&event=%s", str );
+
+    str = tracker->tracker_id;
+    if( str && *str )
+        evbuffer_add_printf( buf, "&trackerid=%s", str );
 
     /* There are two incompatible techniques for announcing an IPv6 address.
@@ -720 +716 @@
 
     ret = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
+    dbgmsg( tier, "announce URL is \"%s\"", ret );
     evbuffer_free( buf );
-
-    dbgmsg( tier, "announce URL is \"%s\"", ret );
     return ret;
 }
@@ -1269 +1264 @@
         if( responseCode == 0 )
         {
-            const int interval = 120 + tr_cryptoWeakRandInt( 120 );
+            const int interval = tr_cryptoWeakRandInt( 120 );
             dbgmsg( tier, "No response from tracker... retrying in %d seconds.", interval );
             tier->manualAnnounceAllowedAt = ~(time_t)0;

trunk/libtransmission/web.c

@@ -295 +295 @@
 {
     if( strstr( url, "scrape" ) != NULL ) return 20;
-    if( strstr( url, "announce" ) != NULL ) return 45;
+    if( strstr( url, "announce" ) != NULL ) return 60;
     return 240;
 }
@@ -322 +322 @@
         const int timeout = getTimeoutFromURL( task->url );
         const long verbose = getenv( "TR_CURL_VERBOSE" ) != NULL;
-        const char * user_agent = TR_NAME "/" LONG_VERSION_STRING;
+        const char * user_agent = TR_NAME "/" SHORT_VERSION_STRING;
         char * url = NULL;
 
@@ -350 +350 @@
 
             task->slist = curl_slist_append( NULL, host );
+            task->slist = curl_slist_append( task->slist, tr_strdup_printf( "Accept:" ) );
             curl_easy_setopt( e, CURLOPT_HTTPHEADER, task->slist );
             tr_free( host );
@@ -386 +387 @@
         curl_easy_setopt( e, CURLOPT_FOLLOWLOCATION, 1L );
         curl_easy_setopt( e, CURLOPT_AUTOREFERER, 1L );
-        curl_easy_setopt( e, CURLOPT_MAXREDIRS, 4L );
-        curl_easy_setopt( e, CURLOPT_NOSIGNAL, 1L );
         curl_easy_setopt( e, CURLOPT_PRIVATE, task );
         curl_easy_setopt( e, CURLOPT_SSL_VERIFYHOST, 0L );