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

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 82bdad3be23b9219cfc535dc0871175c6e67a95f..069fdbdfb3cd30754b404762f219cdd8f5f2bcd5 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -595,21 +595,6 @@ tr_peerMgrFree (tr_peerMgr * manager)
   tr_free (manager);
 }
 
-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);
-}
-
 /***
 ****
 ***/
@@ -2654,10 +2639,10 @@ tr_peerMgrTorrentStats (tr_torrent  * tor,
 
       ++setmePeersFrom[atom->fromFirst];
 
-      if (clientIsDownloadingFrom (tor, msgs))
+      if (tr_peerMsgsIsClientDownloading (msgs))
         ++*setmePeersSendingToUs;
 
-      if (clientIsUploadingTo (msgs))
+      if (tr_peerMsgsIsPeerDownloading (msgs))
         ++*setmePeersGettingFromUs;
     }
 
@@ -2735,8 +2720,8 @@ tr_peerMgrPeerStats (const tr_torrent * tor, int * setmeCount)
       stat->clientIsChoked      = tr_peerMsgsIsClientChoked (msgs);
       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);
 
       stat->blocksToPeer        = tr_historyGet (&peer->blocksSentToPeer,    now, CANCEL_HISTORY_SEC);

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 8b150b32c0ddd01f8d8ce70e299130df55d05357..9826aa5fe5fed3c898cab3324e0fe7334719be48 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -2448,6 +2448,14 @@ tr_peerMsgsIsPeerInterested (const tr_peerMsgs * msgs)
   return msgs->peer_is_interested;
 }
 
+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)
 {
@@ -2464,6 +2472,16 @@ tr_peerMsgsIsClientInterested (const tr_peerMsgs * msgs)
   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);
+}
+
 bool
 tr_peerMsgsIsUtpConnection (const tr_peerMsgs * msgs)
 {

diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h
index 459166bba7658a922649f38e3227c1a6ed7f2cfb..205f039f9a75b82fd4467252d1441fd8f38be6cf 100644 (file)
--- a/libtransmission/peer-msgs.h
+++ b/libtransmission/peer-msgs.h
@@ -48,10 +48,14 @@ bool         tr_peerMsgsIsPeerChoked         (const tr_peerMsgs        * msgs);
 
 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);
 
 bool         tr_peerMsgsIsUtpConnection      (const tr_peerMsgs        * msgs);

diff --git a/libtransmission/web.c b/libtransmission/web.c
index f1b90744768c8a4a684fa2b862d726159dcb7685..cfad004c53196c06bc70156a9f92b22b9d534b79 100644 (file)
--- a/libtransmission/web.c
+++ b/libtransmission/web.c
@@ -182,7 +182,6 @@ createEasy (tr_session * s, struct tr_web * web, struct tr_web_task * task)
   task->timeout_secs = getTimeoutFromURL (task);
 
   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);
   curl_easy_setopt (e, CURLOPT_MAXREDIRS, -1L);
@@ -216,6 +215,9 @@ createEasy (tr_session * s, struct tr_web * web, struct tr_web_task * task)
   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)
     {
       curl_easy_setopt (e, CURLOPT_RANGE, task->range);
@@ -370,6 +372,7 @@ tr_select (int nfds,
 static void
 tr_webThreadFunc (void * vsession)
 {
+  char * str;
   CURLM * multi;
   struct tr_web * web;
   int taskCount = 0;
@@ -395,7 +398,11 @@ tr_webThreadFunc (void * vsession)
       tr_logAddNamedInfo ("web", "NB: this only works if you built against libcurl with openssl or gnutls, NOT nss");
       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 ();
   session->web = web;