Changeset 7705

Timestamp:

Jan 13, 2009, 4:32:43 PM (12 years ago)

Author:

charles

Message:

(trunk libT) Get rid of peer-mgr-private.h (from wereHamster)

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (1 diff)
• peer-mgr-private.h (deleted)
• peer-mgr.c (modified) (1 diff)
• peer-mgr.h (modified) (3 diffs)
• peer-msgs.c (modified) (1 diff)

trunk/libtransmission/Makefile.am

@@ -81 +81 @@
     peer-io.h \
     peer-mgr.h \
-    peer-mgr-private.h \
     peer-msgs.h \
     platform.h \

trunk/libtransmission/peer-mgr.c

@@ -33 +33 @@
 #include "peer-io.h"
 #include "peer-mgr.h"
-#include "peer-mgr-private.h"
 #include "peer-msgs.h"
 #include "ptrarray.h"

trunk/libtransmission/peer-mgr.h

@@ -25 +25 @@
 
 #include "net.h"
+#include "publish.h" /* tr_publisher_tag */
 
 struct tr_peer_stat;
@@ -46 +47 @@
 }
 tr_pex;
+
+
+struct tr_bandwidth;
+struct tr_bitfield;
+struct tr_peerIo;
+struct tr_peermsgs;
+
+enum
+{
+    ENCRYPTION_PREFERENCE_UNKNOWN,
+    ENCRYPTION_PREFERENCE_YES,
+    ENCRYPTION_PREFERENCE_NO
+};
+
+/**
+ * State information about a connected peer.
+ *
+ * @see struct peer_atom
+ * @see tr_peermsgs
+ */
+typedef struct tr_peer
+{
+    tr_bool                  peerIsChoked;
+    tr_bool                  peerIsInterested;
+    tr_bool                  clientIsChoked;
+    tr_bool                  clientIsInterested;
+    tr_bool                  doPurge;
+
+    /* number of bad pieces they've contributed to */
+    uint8_t                  strikes;
+
+    uint8_t                  encryption_preference;
+    tr_port                  port;
+    tr_address               addr;
+    struct tr_peerIo       * io;
+
+    struct tr_bitfield     * blame;
+    struct tr_bitfield     * have;
+
+    /** how complete the peer's copy of the torrent is. [0.0...1.0] */
+    float                    progress;
+
+    /* the client name from the `v' string in LTEP's handshake dictionary */
+    char                   * client;
+
+    time_t                   chokeChangedAt;
+
+    struct tr_peermsgs     * msgs;
+    tr_publisher_tag         msgsTag;
+}
+tr_peer;
+
 
 int tr_pexCompare( const void * a, const void * b );
@@ -134 +187 @@
 
 
+double tr_peerGetPieceSpeed( const tr_peer    * peer,
+                             uint64_t           now,
+                             tr_direction       direction );
+
 #endif

trunk/libtransmission/peer-msgs.c

@@ -31 +31 @@
 #include "peer-io.h"
 #include "peer-mgr.h"
-#include "peer-mgr-private.h"
 #include "peer-msgs.h"
 #include "platform.h" /* MAX_STACK_ARRAY_SIZE */