Changeset 6 for trunk/libtransmission

Timestamp:

Jan 12, 2006, 6:33:20 PM (17 years ago)

Author:

root

Message:

Update 2005-11-21

Location:

trunk/libtransmission

Files:

• internal.h (modified) (1 diff)
• metainfo.c (modified) (2 diffs)
• tracker.c (modified) (2 diffs)
• tracker.h (modified) (1 diff)
• transmission.c (modified) (4 diffs)
• transmission.h (modified) (2 diffs)

trunk/libtransmission/internal.h

@@ -128 +128 @@
 
     int               status;
+        int                               finished;
     char              error[128];
 

trunk/libtransmission/metainfo.c

@@ -42 +42 @@
     struct stat sb;
 
-    snprintf( inf->torrent, MAX_PATH_LENGTH, path );
+    snprintf( inf->torrent, MAX_PATH_LENGTH, "%s", path );
 
     if( stat( path, &sb ) )
@@ -143 +143 @@
         return 1;
     }
-    snprintf( inf->trackerAnnounce, MAX_PATH_LENGTH, s2 );
+    snprintf( inf->trackerAnnounce, MAX_PATH_LENGTH, "%s", s2 );
 
     /* Piece length */

trunk/libtransmission/tracker.c

@@ -359 +359 @@
         tor->status |= TR_TRACKER_ERROR;
         snprintf( tor->error, sizeof( tor->error ),
-                  bePeers->val.s.s );
+                  "%s", bePeers->val.s.s );
         goto cleanup;
     }
@@ -607 +607 @@
     return 0;
 }
+
+int tr_trackerSeeders( tr_torrent_t * tor)
+{
+        if (tor->status != TR_STATUS_PAUSE)
+        {
+                return (tor->tracker)->seeders;
+        }
+        return 0;
+}
+
+int tr_trackerLeechers( tr_torrent_t * tor)
+{
+        if (tor->status != TR_STATUS_PAUSE) 
+        {
+                return (tor->tracker)->leechers;
+        }
+        return 0;
+}

trunk/libtransmission/tracker.h

@@ -32 +32 @@
 void           tr_trackerClose     ( tr_tracker_t * );
 
+/***********************************************************************
+ * tr_trackerSeeders
+ ***********************************************************************
+ * Looks for the seeders/leechers as returned by the tracker.
+ **********************************************************************/
+int                         tr_trackerSeeders  ( tr_torrent_t * );
+
+/***********************************************************************
+ * tr_trackerLeechers
+ ***********************************************************************
+ * Looks for the seeders/leechers as returned by the tracker.
+ **********************************************************************/
+int                         tr_trackerLeechers ( tr_torrent_t * );
+
 int            tr_trackerScrape    ( tr_torrent_t *, int *, int * );
 

trunk/libtransmission/transmission.c

@@ -173 +173 @@
     tor->id     = h->id;
     tor->key    = h->key;
+        tor->finished = 0;
+
 
     /* Guess scrape URL */
@@ -316 +318 @@
 {
     return h->torrentCount;
+}
+
+int tr_getFinished( tr_handle_t * h, int i)
+{
+        return h->torrents[i]->finished;
+}
+void tr_setFinished( tr_handle_t * h, int i, int val)
+{
+        h->torrents[i]->finished = val;
 }
 
@@ -375 +386 @@
         s[i].rateDownload = rateDownload( tor );
         s[i].rateUpload   = rateUpload( tor );
+        
+        s[i].seeders      = tr_trackerSeeders(tor);
+                s[i].leechers     = tr_trackerLeechers(tor);
 
         if( s[i].rateDownload < 0.1 )
@@ -497 +511 @@
             /* Done */
             tor->status = TR_STATUS_SEED;
+                        tor->finished = 1;
             tr_trackerCompleted( tor->tracker );
         }

trunk/libtransmission/transmission.h

@@ -72 +72 @@
 
 /***********************************************************************
+ * tr_getFinished
+ ***********************************************************************
+ * Tests to see if torrent is finished
+ **********************************************************************/
+int tr_getFinished( tr_handle_t *, int );
+
+/***********************************************************************
+ * tr_setFinished
+ ***********************************************************************
+ * Sets the boolean value finished in the torrent back to false
+ **********************************************************************/
+void tr_setFinished( tr_handle_t *, int, int );
+
+/***********************************************************************
  * tr_torrentInit
  ***********************************************************************
@@ -206 +220 @@
     int         peersDownloading;
     char        pieces[120];
+    int                 seeders;
+        int                     leechers;
 
     uint64_t    downloaded;