Changeset 14070 for trunk/libtransmission/web.c

Timestamp:

Apr 13, 2013, 8:25:28 PM (9 years ago)

Author:

jordan

Message:

(trunk) update web.h's API s.t. there's an explicit function to use when downloading webseed content.

File:

• trunk/libtransmission/web.c (modified) (5 diffs)

trunk/libtransmission/web.c

@@ -27 +27 @@
 #include "log.h"
 #include "net.h" /* tr_address */
+#include "torrent.h"
 #include "platform.h" /* mutex */
 #include "session.h"
@@ -63 +64 @@
 struct tr_web_task
 {
+  int torrentId;
   long code;
   long timeout_secs;
@@ -235 +237 @@
 ****/
 
-struct tr_web_task *
-tr_webRun (tr_session         * session,
-           const char         * url,
-           const char         * range,
-           const char         * cookies,
-           tr_web_done_func     done_func,
-           void               * done_func_user_data)
-{
-  return tr_webRunWithBuffer (session, url, range, cookies,
-                              done_func, done_func_user_data,
-                              NULL);
-}
-
 static void tr_webThreadFunc (void * vsession);
 
-struct tr_web_task *
-tr_webRunWithBuffer (tr_session         * session,
-                     const char         * url,
-                     const char         * range,
-                     const char         * cookies,
-                     tr_web_done_func     done_func,
-                     void               * done_func_user_data,
-                     struct evbuffer    * buffer)
+static struct tr_web_task *
+tr_webRunImpl (tr_session         * session,
+               int                  torrentId,
+               const char         * url,
+               const char         * range,
+               const char         * cookies,
+               tr_web_done_func     done_func,
+               void               * done_func_user_data,
+               struct evbuffer    * buffer)
 {
   struct tr_web_task * task = NULL;
@@ -273 +263 @@
       task = tr_new0 (struct tr_web_task, 1);
       task->session = session;
+      task->torrentId = torrentId;
       task->url = tr_strdup (url);
       task->range = tr_strdup (range);
@@ -288 +279 @@
 
   return task;
+}
+
+struct tr_web_task *
+tr_webRunWithCookies (tr_session        * session,
+                      const char        * url,
+                      const char        * cookies,
+                      tr_web_done_func    done_func,
+                      void              * done_func_user_data)
+{
+  return tr_webRunImpl (session, -1, url,
+                        NULL, cookies,
+                        done_func, done_func_user_data,
+                        NULL);
+}
+
+struct tr_web_task *
+tr_webRun (tr_session         * session,
+           const char         * url,
+           tr_web_done_func     done_func,
+           void               * done_func_user_data)
+{
+  return tr_webRunWithCookies (session, url, NULL,
+                               done_func, done_func_user_data);
+}
+
+
+struct tr_web_task *
+tr_webRunWebseed (tr_torrent        * tor,
+                  const char        * url,
+                  const char        * range,
+                  tr_web_done_func    done_func,
+                  void              * done_func_user_data,
+                  struct evbuffer   * buffer)
+{
+  return tr_webRunImpl (tor->session, tr_torrentId (tor), url,
+                        range, NULL,
+                        done_func, done_func_user_data,
+                        buffer);
 }