Changeset 14075

Timestamp:

May 22, 2013, 7:02:07 PM (9 years ago)

Author:

jordan

Message:

(trunk, libT) #5356 'only set CURLOPT_COOKIEFILE if cookies.txt exists on startup' -- fixed.

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (3 diffs)
• peer-msgs.c (modified) (2 diffs)
• peer-msgs.h (modified) (1 diff)
• web.c (modified) (4 diffs)

trunk/libtransmission/peer-mgr.c

@@ -596 +596 @@
 }
 
-static int
-clientIsDownloadingFrom (const tr_torrent * tor, const tr_peerMsgs * p)
-{
-  if (!tr_torrentHasMetadata (tor))
-    return true;
-
-  return tr_peerMsgsIsClientInterested (p) && !tr_peerMsgsIsClientChoked (p);
-}
-
-static int
-clientIsUploadingTo (const tr_peerMsgs * p)
-{
-  return tr_peerMsgsIsPeerInterested (p) && !tr_peerMsgsIsPeerChoked (p);
-}
-
 /***
 ****
@@ -2655 +2640 @@
       ++setmePeersFrom[atom->fromFirst];
 
-      if (clientIsDownloadingFrom (tor, msgs))
+      if (tr_peerMsgsIsClientDownloading (msgs))
         ++*setmePeersSendingToUs;
 
-      if (clientIsUploadingTo (msgs))
+      if (tr_peerMsgsIsPeerDownloading (msgs))
         ++*setmePeersGettingFromUs;
     }
@@ -2736 +2721 @@
       stat->clientIsInterested  = tr_peerMsgsIsClientInterested (msgs);
       stat->isIncoming          = tr_peerMsgsIsIncomingConnection (msgs);
-      stat->isDownloadingFrom   = clientIsDownloadingFrom (tor, msgs);
-      stat->isUploadingTo       = clientIsUploadingTo (msgs);
+      stat->isDownloadingFrom   = tr_peerMsgsIsClientDownloading (msgs);
+      stat->isUploadingTo       = tr_peerMsgsIsPeerDownloading (msgs);
       stat->isSeed              = peerIsSeed (peer);
 

trunk/libtransmission/peer-msgs.c

@@ -2450 +2450 @@
 
 bool
+tr_peerMsgsIsPeerDownloading (const tr_peerMsgs * msgs)
+{
+  assert (tr_isPeerMsgs (msgs));
+
+  return msgs->peer_is_interested && !msgs->peer_is_choked;
+}
+
+bool
 tr_peerMsgsIsClientChoked (const tr_peerMsgs * msgs)
 {
@@ -2463 +2471 @@
 
   return msgs->client_is_interested;
+}
+
+bool
+tr_peerMsgsIsClientDownloading (const tr_peerMsgs * msgs)
+{
+  assert (tr_isPeerMsgs (msgs));
+
+  return msgs->client_is_interested
+     && !msgs->client_is_choked
+     && tr_torrentHasMetadata (msgs->torrent);
 }
 

trunk/libtransmission/peer-msgs.h

@@ -49 +49 @@
 bool         tr_peerMsgsIsPeerInterested     (const tr_peerMsgs        * msgs);
 
+bool         tr_peerMsgsIsPeerDownloading    (const tr_peerMsgs        * msgs);
+
 bool         tr_peerMsgsIsClientChoked       (const tr_peerMsgs        * msgs);
 
 bool         tr_peerMsgsIsClientInterested   (const tr_peerMsgs        * msgs);
+
+bool         tr_peerMsgsIsClientDownloading  (const tr_peerMsgs        * msgs);
 
 time_t       tr_peerMsgsGetConnectionAge     (const tr_peerMsgs        * msgs);

trunk/libtransmission/web.c

@@ -183 +183 @@
 
   curl_easy_setopt (e, CURLOPT_AUTOREFERER, 1L);
-  curl_easy_setopt (e, CURLOPT_COOKIEFILE, web->cookie_filename);
   curl_easy_setopt (e, CURLOPT_ENCODING, "gzip;q=1.0, deflate, identity");
   curl_easy_setopt (e, CURLOPT_FOLLOWLOCATION, 1L);
@@ -216 +215 @@
   if (task->cookies != NULL)
     curl_easy_setopt (e, CURLOPT_COOKIE, task->cookies);
+
+  if (web->cookie_filename != NULL)
+    curl_easy_setopt (e, CURLOPT_COOKIEFILE, web->cookie_filename);
 
   if (task->range != NULL)
@@ -371 +373 @@
 tr_webThreadFunc (void * vsession)
 {
+  char * str;
   CURLM * multi;
   struct tr_web * web;
@@ -396 +399 @@
       tr_logAddNamedInfo ("web", "NB: invalid certs will show up as 'Could not connect to tracker' like many other errors");
     }
-  web->cookie_filename = tr_buildPath (session->configDir, "cookies.txt", NULL);
+
+  str = tr_buildPath (session->configDir, "cookies.txt", NULL);
+  if (tr_fileExists (str, NULL))
+    web->cookie_filename = tr_strdup (str);
+  tr_free (str);
 
   multi = curl_multi_init ();