Changeset 1145

Timestamp:

Nov 30, 2006, 9:02:52 PM (16 years ago)

Author:

livings124

Message:

reuse http query

File:

• branches/scrape/libtransmission/tracker.c (modified) (5 diffs)

branches/scrape/libtransmission/tracker.c

@@ -61 +61 @@
 };
 
-static tr_http_t * getQuery   ( tr_tracker_t * tc );
+static tr_http_t * getQuery ( tr_tracker_t * tc );
+static tr_http_t * getScrapeQuery ( tr_tracker_t * tc );
 static void        readAnswer ( tr_tracker_t * tc, const char *, int );
-static void readScrapeAnswer( tr_tracker_t * tc, const char * data, int len );
+static void        readScrapeAnswer( tr_tracker_t * tc, const char * data, int len );
 
 tr_tracker_t * tr_trackerInit( tr_torrent_t * tor )
@@ -235 +236 @@
         }
         tc->dateScrape = tr_date();
-        tc->httpScrape = tr_httpClient( TR_HTTP_GET, inf->trackerAddress, inf->trackerPort,
-                            "%s%sinfo_hash=%s", tor->scrape, strchr( tor->scrape, '?' ) ?
-                            "&" : "?", tor->escapedHashString );
+        tc->httpScrape = getScrapeQuery( tc );
         tr_inf( "Scrape: sent http request to %s:%d",
                     inf->trackerAddress, inf->trackerPort );
@@ -281 +280 @@
     if( NULL != tc->http )
     {
-        /* If we are already sendy a query at the moment, we need to
+        /* If we are already sending a query at the moment, we need to
            reconnect */
         tr_httpClose( tc->http );
@@ -388 +387 @@
 }
 
+static tr_http_t * getScrapeQuery( tr_tracker_t * tc )
+{
+    tr_torrent_t * tor = tc->tor;
+    tr_info_t    * inf = &tor->info;
+
+    return tr_httpClient( TR_HTTP_GET, inf->trackerAddress, inf->trackerPort,
+                          "%s%sinfo_hash=%s", tor->scrape, strchr( tor->scrape, '?' ) ?
+                          "&" : "?", tor->escapedHashString );
+}
+
 static void readAnswer( tr_tracker_t * tc, const char * data, int len )
 {
@@ -774 +783 @@
 
     tc = tr_trackerInit( tor );
-    http = tr_httpClient( TR_HTTP_GET, inf->trackerAddress, inf->trackerPort,
-                          "%s%sinfo_hash=%s", tor->scrape, strchr( tor->scrape, '?' ) ?
-                          "&" : "?", tor->escapedHashString );
+    http = getScrapeQuery( tc );
 
     for( data = NULL; !data; tr_wait( 10 ) )