Changeset 754

Timestamp:

Aug 12, 2006, 12:38:26 AM (17 years ago)

Author:

livings124

Message:

Some new accessors for libtransmission...I don't see what harm these can do

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• libtransmission/peer.c (modified) (1 diff)
• libtransmission/peer.h (modified) (2 diffs)
• libtransmission/transmission.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Controller.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -256 +256 @@
                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; };
                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; };
-                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
+                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
                 4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; };
                 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; };

trunk/libtransmission/peer.c

@@ -297 +297 @@
 
 /***********************************************************************
+ * tr_peerId
+ ***********************************************************************
+ *
+ **********************************************************************/
+uint8_t * tr_peerId( tr_peer_t * peer )
+{
+    return & peer->id[0];
+}
+
+/***********************************************************************
  * tr_peerHash
  ***********************************************************************

trunk/libtransmission/peer.h

@@ -26 +26 @@
 #define TR_PEER_H 1
 
-typedef struct tr_peer_s tr_peer_t;
-
 void        tr_peerAddOld        ( tr_torrent_t *, char *, int );
 void        tr_peerAddCompact    ( tr_torrent_t *, struct in_addr, in_port_t );
@@ -36 +34 @@
 int         tr_peerRead          ( tr_torrent_t *, tr_peer_t * );
 uint64_t    tr_peerDate          ( tr_peer_t * );
+uint8_t *   tr_peerId            ( tr_peer_t * );
 uint8_t *   tr_peerHash          ( tr_peer_t * );
 void        tr_peerPulse         ( tr_torrent_t * );

trunk/libtransmission/transmission.c

@@ -404 +404 @@
     }
     return 0;
+}
+
+tr_peer_t * tr_getPeer( tr_torrent_t * tor, int peerNum)
+{
+    if (peerNum < 0 || peerNum >= tor->peerCount)
+        return NULL;
+    return tor->peers[peerNum];
 }
 

trunk/libtransmission/transmission.h

@@ -199 +199 @@
 
 /***********************************************************************
+ * tr_getPeer
+ ***********************************************************************
+ * Returns the peer at peerNum. Returns NULL if peerNum is not greater
+ * than 0 and less than peerCount.
+ **********************************************************************/
+typedef struct tr_peer_s tr_peer_t;
+tr_peer_t * tr_getPeer( tr_torrent_t *, int peerNum );
+
+/***********************************************************************
  * tr_torrentStat
  ***********************************************************************

trunk/macosx/Controller.m

@@ -1274 +1274 @@
         shouldBeOn = hour < offHour || hour >= onHour;
     
-    if ((!fSpeedLimitEnabled && shouldBeOn) || (fSpeedLimitEnabled && !shouldBeOn))
+    if (fSpeedLimitEnabled != shouldBeOn)
     {
         [self toggleSpeedLimit: nil];