From 8b72408948746fbcc6497fd1589c1162034074af Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 13 Jan 2009 16:32:43 +0000 Subject: [PATCH] (trunk libT) Get rid of peer-mgr-private.h (from wereHamster) --- libtransmission/Makefile.am | 1 - libtransmission/peer-mgr-private.h | 82 ------------------------------ libtransmission/peer-mgr.c | 1 - libtransmission/peer-mgr.h | 57 +++++++++++++++++++++ libtransmission/peer-msgs.c | 1 - 5 files changed, 57 insertions(+), 85 deletions(-) delete mode 100644 libtransmission/peer-mgr-private.h diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am index 167d3ef70..4f869d354 100644 --- a/libtransmission/Makefile.am +++ b/libtransmission/Makefile.am @@ -80,7 +80,6 @@ noinst_HEADERS = \ peer-common.h \ peer-io.h \ peer-mgr.h \ - peer-mgr-private.h \ peer-msgs.h \ platform.h \ port-forwarding.h \ diff --git a/libtransmission/peer-mgr-private.h b/libtransmission/peer-mgr-private.h deleted file mode 100644 index c4911271e..000000000 --- a/libtransmission/peer-mgr-private.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file Copyright (C) 2007-2009 Charles Kerr - * - * This file is licensed by the GPL version 2. Works owned by the - * Transmission project are granted a special exemption to clause 2(b) - * so that the bulk of its code can remain under the MIT license. - * This exemption does not extend to derived works not owned by - * the Transmission project. - * - * $Id$ - */ - -#ifndef __TRANSMISSION__ -#error only libtransmission should #include this header. -#endif - -#ifndef TR_PEER_MGR_PRIVATE_H -#define TR_PEER_MGR_PRIVATE_H - -#include /* uint16_t */ - -#ifdef WIN32 - #include /* struct in_addr */ -#endif - -#include "publish.h" /* tr_publisher_tag */ - -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; - -double tr_peerGetPieceSpeed( const tr_peer * peer, - uint64_t now, - tr_direction direction ); - -#endif diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c index 19b7968d3..42617fcd6 100644 --- a/libtransmission/peer-mgr.c +++ b/libtransmission/peer-mgr.c @@ -32,7 +32,6 @@ #include "net.h" #include "peer-io.h" #include "peer-mgr.h" -#include "peer-mgr-private.h" #include "peer-msgs.h" #include "ptrarray.h" #include "stats.h" /* tr_statsAddUploaded, tr_statsAddDownloaded */ diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h index f9d704344..bbc4b92a8 100644 --- a/libtransmission/peer-mgr.h +++ b/libtransmission/peer-mgr.h @@ -24,6 +24,7 @@ #endif #include "net.h" +#include "publish.h" /* tr_publisher_tag */ struct tr_peer_stat; struct tr_torrent; @@ -46,6 +47,58 @@ typedef struct tr_pex } 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 ); tr_peerMgr* tr_peerMgrNew( tr_session * ); @@ -133,4 +186,8 @@ float* tr_peerMgrWebSpeeds( const tr_peerMgr * manager, const uint8_t * torrentHash ); +double tr_peerGetPieceSpeed( const tr_peer * peer, + uint64_t now, + tr_direction direction ); + #endif diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c index f0dca57ac..81ca8c418 100644 --- a/libtransmission/peer-msgs.c +++ b/libtransmission/peer-msgs.c @@ -30,7 +30,6 @@ #endif #include "peer-io.h" #include "peer-mgr.h" -#include "peer-mgr-private.h" #include "peer-msgs.h" #include "platform.h" /* MAX_STACK_ARRAY_SIZE */ #include "ratecontrol.h" -- 2.40.0