mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

a little housekeeping: move tr_torrent stuff into its own header

This commit is contained in:
Charles Kerr 2007-12-25 05:37:32 +00:00
parent 16e273ed05
commit 473907d891
13 changed files with 167 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libtransmission/completion.c
View File

@ -27,6 +27,7 @@
#include "transmission.h"
#include "completion.h"
#include "torrent.h"
#include "utils.h"
struct tr_completion

1
libtransmission/completion.h
View File

@ -27,6 +27,7 @@
#include "transmission.h"
struct tr_bitfield;
typedef struct tr_completion tr_completion;
tr_completion * tr_cpInit( tr_torrent * );

1
libtransmission/fastresume.c
View File

@ -60,6 +60,7 @@
#include "internal.h" /* tr_torrentInitFileDLs */
#include "peer-mgr.h"
#include "platform.h"
#include "torrent.h"
#include "utils.h"
/* time_t can be 32 or 64 bits... for consistency we'll hardwire 64 */

3
libtransmission/handshake.c
View File

@ -20,12 +20,13 @@
#include <event.h>
#include "clients.h"
#include "transmission.h"
#include "bencode.h"
#include "clients.h"
#include "crypto.h"
#include "handshake.h"
#include "peer-io.h"
#include "torrent.h"
#include "trevent.h"
#include "utils.h"

1
libtransmission/inout.c
View File

@ -28,6 +28,7 @@
#include "platform.h"
#include "peer-mgr.h"
#include "stats.h"
#include "torrent.h"
#include "utils.h"
/****

128
libtransmission/internal.h
View File

@ -43,16 +43,6 @@ typedef enum { TR_NET_OK, TR_NET_ERROR, TR_NET_WAIT } tr_tristate_t;
#define FALSE 0
#endif
/* just like tr_torrentSetFileDLs but doesn't trigger a fastresume save */
void tr_torrentInitFileDLs( tr_torrent * tor,
int * files,
int fileCount,
int do_download );
int tr_torrentIsPrivate( const tr_torrent * );
void tr_torrentRecheckCompleteness( tr_torrent * );
int tr_trackerInfoInit( struct tr_tracker_info * info,
const char * address,
int address_len );
@ -61,123 +51,6 @@ void tr_trackerInfoClear( struct tr_tracker_info * info );
void tr_peerIdNew ( char* buf, int buflen );
void tr_torrentResetTransferStats( tr_torrent * );
void tr_torrentSetHasPiece( tr_torrent * tor, int pieceIndex, int has );
void tr_torrentLock ( const tr_torrent * );
void tr_torrentUnlock ( const tr_torrent * );
int tr_torrentIsSeed ( const tr_torrent * );
void tr_torrentChangeMyPort ( tr_torrent * );
int tr_torrentExists( tr_handle *, const uint8_t * );
tr_torrent* tr_torrentFindFromHash( tr_handle *, const uint8_t * );
tr_torrent* tr_torrentFindFromObfuscatedHash( tr_handle *, const uint8_t* );
void tr_torrentGetRates( const tr_torrent *, float * toClient, float * toPeer );
int tr_torrentAllowsPex( const tr_torrent * );
/* get the index of this piece's first block */
#define tr_torPieceFirstBlock(tor,piece) ( (piece) * (tor)->blockCountInPiece )
/* what piece index is this block in? */
#define tr_torBlockPiece(tor,block) ( (block) / (tor)->blockCountInPiece )
/* how many blocks are in this piece? */
#define tr_torPieceCountBlocks(tor,piece) \
( ((piece)==((tor)->info.pieceCount-1)) ? (tor)->blockCountInLastPiece : (tor)->blockCountInPiece )
/* how many bytes are in this piece? */
#define tr_torPieceCountBytes(tor,piece) \
( ((piece)==((tor)->info.pieceCount-1)) ? (tor)->lastPieceSize : (tor)->info.pieceSize )
/* how many bytes are in this block? */
#define tr_torBlockCountBytes(tor,block) \
( ((block)==((tor)->blockCount-1)) ? (tor)->lastBlockSize : (tor)->blockSize )
#define tr_block(a,b) _tr_block(tor,a,b)
int _tr_block( const tr_torrent * tor, int index, int begin );
uint64_t tr_pieceOffset( const tr_torrent * tor, int index, int begin, int length );
typedef enum
{
TR_RECHECK_NONE,
TR_RECHECK_WAIT,
TR_RECHECK_NOW
}
tr_recheck_state;
#define TR_ID_LEN 20
struct tr_torrent
{
tr_handle * handle;
tr_info info;
tr_speedlimit uploadLimitMode;
tr_speedlimit downloadLimitMode;
struct tr_ratecontrol * upload;
struct tr_ratecontrol * download;
struct tr_ratecontrol * swarmspeed;
int error;
char errorString[128];
uint8_t obfuscatedHash[SHA_DIGEST_LENGTH];
/* Where to download */
char * destination;
/* How many bytes we ask for per request */
int blockSize;
int blockCount;
int lastBlockSize;
int lastPieceSize;
int blockCountInPiece;
int blockCountInLastPiece;
struct tr_completion * completion;
struct tr_bitfield * uncheckedPieces;
cp_status_t cpStatus;
struct tr_tracker * tracker;
struct tr_publisher_tag * trackerSubscription;
uint64_t downloadedCur;
uint64_t downloadedPrev;
uint64_t uploadedCur;
uint64_t uploadedPrev;
uint64_t corruptCur;
uint64_t corruptPrev;
uint64_t startDate;
uint64_t stopDate;
uint64_t activityDate;
tr_torrent_status_func * status_func;
void * status_func_user_data;
unsigned int statCur : 1;
unsigned int isRunning : 1;
uint8_t maxUnchokedPeers;
uint16_t maxConnectedPeers;
tr_recheck_state recheckState;
time_t lastStatTime;
tr_stat stats[2];
tr_torrent * next;
};
struct tr_handle
{
tr_encryption_mode encryptionMode;
@ -214,5 +87,4 @@ void tr_globalLock ( struct tr_handle * );
void tr_globalUnlock ( struct tr_handle * );
int tr_globalIsLocked ( const struct tr_handle * );
#endif

1
libtransmission/peer-mgr.c
View File

@ -35,6 +35,7 @@
#include "ptrarray.h"
#include "ratecontrol.h"
#include "shared.h"
#include "torrent.h"
#include "trcompat.h" /* strlcpy */
#include "trevent.h"
#include "utils.h"

1
libtransmission/peer-msgs.c
View File

@ -33,6 +33,7 @@
#include "peer-msgs.h"
#include "ratecontrol.h"
#include "stats.h"
#include "torrent.h"
#include "trevent.h"
#include "utils.h"

1
libtransmission/shared.c
View File

@ -32,6 +32,7 @@
#include "net.h"
#include "peer-mgr.h"
#include "shared.h"
#include "torrent.h"
#include "trevent.h"
#include "upnp.h"
#include "utils.h"

1
libtransmission/torrent.c
View File

@ -43,6 +43,7 @@
#include "platform.h"
#include "ratecontrol.h"
#include "shared.h"
#include "torrent.h"
#include "tracker.h"
#include "trcompat.h" /* for strlcpy */
#include "trevent.h"

155
libtransmission/torrent.h Normal file
View File

@ -0,0 +1,155 @@
/******************************************************************************
* $Id:$
*
* Copyright (c) 2005-2007 Transmission authors and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#ifndef TR_TORRENT_H
#define TR_TORRENT_H 1
/* just like tr_torrentSetFileDLs but doesn't trigger a fastresume save */
void tr_torrentInitFileDLs( tr_torrent * tor,
int * files,
int fileCount,
int do_download );
int tr_torrentIsPrivate( const tr_torrent * );
void tr_torrentRecheckCompleteness( tr_torrent * );
void tr_torrentResetTransferStats( tr_torrent * );
void tr_torrentSetHasPiece( tr_torrent * tor, int pieceIndex, int has );
void tr_torrentLock ( const tr_torrent * );
void tr_torrentUnlock ( const tr_torrent * );
int tr_torrentIsSeed ( const tr_torrent * );
void tr_torrentChangeMyPort ( tr_torrent * );
int tr_torrentExists( tr_handle *, const uint8_t * );
tr_torrent* tr_torrentFindFromHash( tr_handle *, const uint8_t * );
tr_torrent* tr_torrentFindFromObfuscatedHash( tr_handle *, const uint8_t* );
void tr_torrentGetRates( const tr_torrent *, float * toClient, float * toPeer );
int tr_torrentAllowsPex( const tr_torrent * );
/* get the index of this piece's first block */
#define tr_torPieceFirstBlock(tor,piece) ( (piece) * (tor)->blockCountInPiece )
/* what piece index is this block in? */
#define tr_torBlockPiece(tor,block) ( (block) / (tor)->blockCountInPiece )
/* how many blocks are in this piece? */
#define tr_torPieceCountBlocks(tor,piece) \
( ((piece)==((tor)->info.pieceCount-1)) ? (tor)->blockCountInLastPiece : (tor)->blockCountInPiece )
/* how many bytes are in this piece? */
#define tr_torPieceCountBytes(tor,piece) \
( ((piece)==((tor)->info.pieceCount-1)) ? (tor)->lastPieceSize : (tor)->info.pieceSize )
/* how many bytes are in this block? */
#define tr_torBlockCountBytes(tor,block) \
( ((block)==((tor)->blockCount-1)) ? (tor)->lastBlockSize : (tor)->blockSize )
#define tr_block(a,b) _tr_block(tor,a,b)
int _tr_block( const tr_torrent * tor, int index, int begin );
uint64_t tr_pieceOffset( const tr_torrent * tor, int index, int begin, int length );
typedef enum
{
TR_RECHECK_NONE,
TR_RECHECK_WAIT,
TR_RECHECK_NOW
}
tr_recheck_state;
#define TR_ID_LEN 20
struct tr_torrent
{
tr_handle * handle;
tr_info info;
tr_speedlimit uploadLimitMode;
tr_speedlimit downloadLimitMode;
struct tr_ratecontrol * upload;
struct tr_ratecontrol * download;
struct tr_ratecontrol * swarmspeed;
int error;
char errorString[128];
uint8_t obfuscatedHash[SHA_DIGEST_LENGTH];
/* Where to download */
char * destination;
/* How many bytes we ask for per request */
int blockSize;
int blockCount;
int lastBlockSize;
int lastPieceSize;
int blockCountInPiece;
int blockCountInLastPiece;
struct tr_completion * completion;
struct tr_bitfield * uncheckedPieces;
cp_status_t cpStatus;
struct tr_tracker * tracker;
struct tr_publisher_tag * trackerSubscription;
uint64_t downloadedCur;
uint64_t downloadedPrev;
uint64_t uploadedCur;
uint64_t uploadedPrev;
uint64_t corruptCur;
uint64_t corruptPrev;
uint64_t startDate;
uint64_t stopDate;
uint64_t activityDate;
tr_torrent_status_func * status_func;
void * status_func_user_data;
unsigned int statCur : 1;
unsigned int isRunning : 1;
uint8_t maxUnchokedPeers;
uint16_t maxConnectedPeers;
tr_recheck_state recheckState;
time_t lastStatTime;
tr_stat stats[2];
tr_torrent * next;
};
#endif

1
libtransmission/tracker.c
View File

@ -28,6 +28,7 @@
#include "net.h"
#include "publish.h"
#include "shared.h"
#include "torrent.h"
#include "tracker.h"
#include "trevent.h"
#include "utils.h"

1
libtransmission/transmission.c
View File

@ -42,6 +42,7 @@
#include "ratecontrol.h"
#include "shared.h"
#include "stats.h"
#include "torrent.h"
#include "tracker.h"
#include "trevent.h"
#include "utils.h"