dead code removal
This commit is contained in:
Charles Kerr
parent
863c026ce0
commit
0938cb88d4
|
|
@ -1,344 +0,0 @@
|
|||
/******************************************************************************
|
||||
* $Id$
|
||||
*
|
||||
* Copyright (c) 2006-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.
|
||||
*****************************************************************************/
|
||||
|
||||
#define EXTENDED_HANDSHAKE_ID 0
|
||||
#define EXTENDED_PEX_ID 1
|
||||
|
||||
static int
|
||||
makeCommonPex( tr_torrent * tor, tr_peer_t * peer,
|
||||
int ( *peerfunc )( tr_peertree_t *, benc_val_t * ),
|
||||
const char * extrakey, benc_val_t * extraval,
|
||||
char ** retbuf, int * retlen )
|
||||
{
|
||||
tr_peertree_t * sent, added, common;
|
||||
int ii;
|
||||
tr_peer_t * pp;
|
||||
tr_peertree_entry_t * found;
|
||||
benc_val_t val, * addval, * delval, * extra;
|
||||
|
||||
assert( tor != NULL );
|
||||
assert( peer != NULL );
|
||||
assert( retbuf != NULL );
|
||||
assert( retlen != NULL );
|
||||
|
||||
*retbuf = NULL;
|
||||
*retlen = 0;
|
||||
sent = &peer->sentPeers;
|
||||
peertreeInit( &added );
|
||||
peertreeInit( &common );
|
||||
|
||||
/* build trees of peers added and deleted since the last pex */
|
||||
for( ii = 0; ii < tor->peerCount; ii++ )
|
||||
{
|
||||
pp = tor->peers[ii];
|
||||
if( 0 == pp->port || 0 == tr_addrcmp( &peer->addr, &pp->addr ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
found = peertreeGet( sent, &pp->addr, pp->port );
|
||||
if( NULL != found )
|
||||
{
|
||||
peertreeMove( &common, sent, found );
|
||||
}
|
||||
else if( NULL == peertreeAdd( &added, &pp->addr, pp->port ) )
|
||||
{
|
||||
peertreeMerge( sent, &common );
|
||||
peertreeFree( &added );
|
||||
tr_bencFree( extraval );
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* check if there were any added or deleted peers */
|
||||
if( peertreeEmpty( &added ) && peertreeEmpty( sent ) )
|
||||
{
|
||||
peertreeMerge( sent, &common );
|
||||
peertreeFree( &added );
|
||||
tr_bencFree( extraval );
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* build the dictionaries */
|
||||
tr_bencInit( &val, TYPE_DICT );
|
||||
if( tr_bencDictReserve( &val, 3 ) )
|
||||
{
|
||||
tr_bencFree( &val );
|
||||
peertreeMerge( sent, &common );
|
||||
peertreeFree( &added );
|
||||
tr_bencFree( extraval );
|
||||
return 1;
|
||||
}
|
||||
extra = tr_bencDictAdd( &val, extrakey );
|
||||
addval = tr_bencDictAdd( &val, "added" );
|
||||
delval = tr_bencDictAdd( &val, "dropped" );
|
||||
assert( NULL != extra && NULL != addval && NULL != delval );
|
||||
if( (*peerfunc)( &added, addval ) || (*peerfunc)( sent, delval ) )
|
||||
{
|
||||
tr_bencFree( &val );
|
||||
peertreeMerge( sent, &common );
|
||||
peertreeFree( &added );
|
||||
tr_bencFree( extraval );
|
||||
return 1;
|
||||
}
|
||||
*extra = *extraval;
|
||||
memset( extraval, 0, sizeof( extraval ) );
|
||||
|
||||
/* bencode it */
|
||||
*retbuf = tr_bencSaveMalloc( &val, retlen );
|
||||
tr_bencFree( &val );
|
||||
if( NULL == *retbuf )
|
||||
{
|
||||
peertreeMerge( sent, &common );
|
||||
peertreeFree( &added );
|
||||
return 1;
|
||||
}
|
||||
|
||||
peertreeSwap( sent, &common );
|
||||
peertreeMerge( sent, &added );
|
||||
peertreeFree( &common );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static char *
|
||||
makeExtendedHandshake( tr_torrent * tor, tr_peer_t * peer, int * len )
|
||||
{
|
||||
benc_val_t val, * msgsval;
|
||||
char * buf;
|
||||
char * vers = tr_strdup( TR_NAME " " SHORT_VERSION_STRING );
|
||||
|
||||
/* reserve space in toplevel dictionary for v, m, and possibly p */
|
||||
tr_bencInit( &val, TYPE_DICT );
|
||||
if( tr_bencDictReserve( &val, ( 0 < tor->publicPort ? 3 : 2 ) ) )
|
||||
{
|
||||
tr_bencFree( &val );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* human readable version string */
|
||||
tr_bencInitStr( tr_bencDictAdd( &val, "v" ), vers, 0, 0 );
|
||||
|
||||
/* create dict of supported extended messages */
|
||||
msgsval = tr_bencDictAdd( &val, "m" );
|
||||
tr_bencInit( msgsval, TYPE_DICT );
|
||||
if( tr_bencDictReserve( msgsval, 1 ) )
|
||||
{
|
||||
tr_bencFree( &val );
|
||||
return NULL;
|
||||
}
|
||||
/* for public torrents advertise utorrent pex message */
|
||||
tr_bencInitInt( tr_bencDictAdd( msgsval, "ut_pex" ),
|
||||
( peer->private ? 0 : EXTENDED_PEX_ID ) );
|
||||
|
||||
/* our listening port */
|
||||
if( 0 < tor->publicPort )
|
||||
{
|
||||
/* XXX should inform peer when we no longer have a valid port */
|
||||
tr_bencInitInt( tr_bencDictAdd( &val, "p" ), tor->publicPort );
|
||||
}
|
||||
|
||||
/* bencode it */
|
||||
buf = tr_bencSaveMalloc( &val, len );
|
||||
tr_bencFree( &val );
|
||||
if( NULL == buf )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
peer->advertisedPort = tor->publicPort;
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
static int
|
||||
peertreeToBencUT( tr_peertree_t * tree, benc_val_t * val )
|
||||
{
|
||||
char * buf;
|
||||
tr_peertree_entry_t * ii;
|
||||
int count;
|
||||
|
||||
count = peertreeCount( tree );
|
||||
if( 0 == count )
|
||||
{
|
||||
tr_bencInitStr( val, NULL, 0, 1 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
buf = malloc( 6 * count );
|
||||
if( NULL == buf )
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
tr_bencInitStr( val, buf, 6 * count, 0 );
|
||||
|
||||
for( ii = peertreeFirst( tree ); NULL != ii;
|
||||
ii = peertreeNext( tree, ii ) )
|
||||
{
|
||||
assert( 0 < count );
|
||||
count--;
|
||||
memcpy( buf + 6 * count, ii->peer, 6 );
|
||||
}
|
||||
assert( 0 == count );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
makeUTPex( tr_torrent * tor, tr_peer_t * peer, char ** buf, int * len )
|
||||
{
|
||||
benc_val_t val;
|
||||
|
||||
assert( !peer->private );
|
||||
tr_bencInitStr( &val, NULL, 0, 1 );
|
||||
return makeCommonPex( tor, peer, peertreeToBencUT, "added.f", &val,
|
||||
buf, len );
|
||||
}
|
||||
|
||||
static int
|
||||
parseExtendedHandshake( tr_peer_t * peer, uint8_t * buf, int len )
|
||||
{
|
||||
benc_val_t val, * sub;
|
||||
int dbgport, dbgpex, dbgclient, grow;
|
||||
size_t size;
|
||||
|
||||
if( tr_bencLoad( buf, len, &val, NULL ) )
|
||||
{
|
||||
peer_dbg( "GET extended-handshake, invalid bencoding" );
|
||||
return TR_ERROR;
|
||||
}
|
||||
if( TYPE_DICT != val.type )
|
||||
{
|
||||
peer_dbg( "GET extended-handshake, not a dictionary" );
|
||||
tr_bencFree( &val );
|
||||
return TR_ERROR;
|
||||
}
|
||||
|
||||
/* check supported messages for utorrent pex */
|
||||
sub = tr_bencDictFind( &val, "m" );
|
||||
dbgpex = -1;
|
||||
if( NULL != sub && TYPE_DICT == sub->type )
|
||||
{
|
||||
sub = tr_bencDictFind( sub, "ut_pex" );
|
||||
if( NULL != sub && TYPE_INT == sub->type )
|
||||
{
|
||||
peer->pexStatus = 0;
|
||||
if( 0x0 < sub->val.i && 0xff >= sub->val.i )
|
||||
{
|
||||
peer->pexStatus = sub->val.i;
|
||||
dbgpex = sub->val.i;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* get peer's client name */
|
||||
dbgclient = 0;
|
||||
if( !peer->extclient )
|
||||
{
|
||||
sub = tr_bencDictFind( &val, "v" );
|
||||
if( NULL != sub && TYPE_STR == sub->type )
|
||||
{
|
||||
dbgclient = 1;
|
||||
free( peer->client );
|
||||
size = bufsize_utf8( sub->val.s.s, &grow );
|
||||
if( grow )
|
||||
{
|
||||
peer->client = calloc( size, 1 );
|
||||
if( NULL == peer->client )
|
||||
{
|
||||
tr_bencFree( &val );
|
||||
return TR_ERROR;
|
||||
}
|
||||
strlcat_utf8( peer->client, sub->val.s.s, size, 0 );
|
||||
}
|
||||
else
|
||||
peer->client = tr_bencStealStr( sub );
|
||||
peer->extclient = 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* get peer's listening port */
|
||||
sub = tr_bencDictFind( &val, "p" );
|
||||
dbgport = -1;
|
||||
if( NULL != sub && TYPE_INT == sub->type &&
|
||||
0x0 < sub->val.i && 0xffff >= sub->val.i )
|
||||
{
|
||||
peer->port = htons( (uint16_t) sub->val.i );
|
||||
dbgport = sub->val.i;
|
||||
}
|
||||
|
||||
if( dbgclient )
|
||||
peer_dbg( "GET extended-handshake, ok port=%d pex=%d client=%s",
|
||||
dbgport, dbgpex, peer->client );
|
||||
else
|
||||
peer_dbg( "GET extended-handshake, ok port=%d pex=%d",
|
||||
dbgport, dbgpex );
|
||||
|
||||
tr_bencFree( &val );
|
||||
return TR_OK;
|
||||
}
|
||||
|
||||
static int
|
||||
parseUTPex( tr_torrent * tor, tr_peer_t * peer, uint8_t * buf, int len )
|
||||
{
|
||||
benc_val_t val, * sub;
|
||||
int used;
|
||||
|
||||
if( peer->private || PEX_PEER_CUTOFF <= tor->peerCount )
|
||||
{
|
||||
peer_dbg( "GET extended-pex, ignoring p=%i c=(%i<=%i)",
|
||||
peer->private, PEX_PEER_CUTOFF, tor->peerCount );
|
||||
return TR_OK;
|
||||
}
|
||||
|
||||
if( tr_bencLoad( buf, len, &val, NULL ) )
|
||||
{
|
||||
peer_dbg( "GET extended-pex, invalid bencoding" );
|
||||
return TR_ERROR;
|
||||
}
|
||||
if( TYPE_DICT != val.type )
|
||||
{
|
||||
tr_bencFree( &val );
|
||||
peer_dbg( "GET extended-pex, not a dictionary" );
|
||||
return TR_ERROR;
|
||||
}
|
||||
|
||||
sub = tr_bencDictFind( &val, "added" );
|
||||
if( NULL != sub && TYPE_STR == sub->type && 0 == sub->val.s.i % 6 )
|
||||
{
|
||||
#if 0
|
||||
used = tr_torrentAddCompact( tor, TR_PEER_FROM_PEX,
|
||||
( uint8_t * )sub->val.s.s,
|
||||
sub->val.s.i / 6 );
|
||||
peer_dbg( "GET extended-pex, got %i peers, used %i",
|
||||
sub->val.s.i / 6, used );
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
peer_dbg( "GET extended-pex, no peers" );
|
||||
}
|
||||
|
||||
tr_bencFree( &val );
|
||||
return TR_OK;
|
||||
}
|
||||
|
|
@ -1,145 +0,0 @@
|
|||
/******************************************************************************
|
||||
* $Id$
|
||||
*
|
||||
* Copyright (c) 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.
|
||||
*****************************************************************************/
|
||||
|
||||
#include "bsdtree.h"
|
||||
|
||||
typedef struct tr_peertree_entry_s
|
||||
{
|
||||
RB_ENTRY( tr_peertree_entry_s ) magic;
|
||||
uint8_t peer[6];
|
||||
} tr_peertree_entry_t;
|
||||
|
||||
typedef
|
||||
RB_HEAD( tr_peertree_s, tr_peertree_entry_s )
|
||||
tr_peertree_t;
|
||||
|
||||
#define peertreeInit(tree) RB_INIT( (tree) )
|
||||
#define peertreeEmpty(tree) RB_EMPTY( (tree) )
|
||||
#define peertreeFirst(tree) RB_MIN( tr_peertree_s, (tree) )
|
||||
#define peertreeNext(tree, item) RB_NEXT( tr_peertree_s, (tree), (item) )
|
||||
#define peertreeFind(tree, item) RB_FIND( tr_peertree_s, (tree), (item) )
|
||||
|
||||
static int
|
||||
peertreekeycmp( tr_peertree_entry_t * aa, tr_peertree_entry_t * bb )
|
||||
{
|
||||
return memcmp( aa->peer, bb->peer, 6 );
|
||||
}
|
||||
|
||||
RB_GENERATE_STATIC( tr_peertree_s, tr_peertree_entry_s, magic, peertreekeycmp )
|
||||
|
||||
static int
|
||||
peertreeCount( tr_peertree_t * tree )
|
||||
{
|
||||
tr_peertree_entry_t * ii;
|
||||
int count;
|
||||
|
||||
count = 0;
|
||||
RB_FOREACH( ii, tr_peertree_s, tree )
|
||||
{
|
||||
count++;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
static tr_peertree_entry_t *
|
||||
peertreeGet( tr_peertree_t * tree, struct in_addr * addr, tr_port_t port )
|
||||
{
|
||||
tr_peertree_entry_t entry;
|
||||
|
||||
memset( &entry, 0, sizeof( entry ) );
|
||||
memcpy( entry.peer, addr, 4 );
|
||||
memcpy( entry.peer + 4, &port, 2 );
|
||||
|
||||
return RB_FIND( tr_peertree_s, tree, &entry );
|
||||
}
|
||||
|
||||
static tr_peertree_entry_t *
|
||||
peertreeAdd( tr_peertree_t * tree, struct in_addr * addr, tr_port_t port )
|
||||
{
|
||||
tr_peertree_entry_t * entry;
|
||||
|
||||
entry = calloc( 1, sizeof( *entry) );
|
||||
if( NULL == entry )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
memcpy( entry->peer, addr, 4 );
|
||||
memcpy( entry->peer + 4, &port, 2 );
|
||||
if( NULL == RB_INSERT( tr_peertree_s, tree, entry ) )
|
||||
{
|
||||
return entry;
|
||||
}
|
||||
free( entry );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
peertreeMove( tr_peertree_t * dest, tr_peertree_t * src,
|
||||
tr_peertree_entry_t * entry )
|
||||
{
|
||||
tr_peertree_entry_t * sanity;
|
||||
|
||||
sanity = RB_REMOVE( tr_peertree_s, src, entry );
|
||||
assert( sanity == entry );
|
||||
sanity = RB_INSERT( tr_peertree_s, dest, entry );
|
||||
assert( NULL == sanity );
|
||||
}
|
||||
|
||||
static void
|
||||
peertreeMerge( tr_peertree_t * dest, tr_peertree_t * src )
|
||||
{
|
||||
tr_peertree_entry_t * ii, * next, * sanity;
|
||||
|
||||
for( ii = peertreeFirst( src ); NULL != ii; ii = next )
|
||||
{
|
||||
next = peertreeNext( src, ii );
|
||||
sanity = RB_REMOVE( tr_peertree_s, src, ii );
|
||||
assert( sanity == ii );
|
||||
sanity = RB_INSERT( tr_peertree_s, dest, ii );
|
||||
assert( NULL == sanity );
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
peertreeSwap( tr_peertree_t * dest, tr_peertree_t * src )
|
||||
{
|
||||
tr_peertree_t buf;
|
||||
|
||||
RB_ROOT( &buf ) = RB_ROOT( dest );
|
||||
RB_ROOT( dest ) = RB_ROOT( src );
|
||||
RB_ROOT( src ) = RB_ROOT( &buf );
|
||||
}
|
||||
|
||||
static void
|
||||
peertreeFree( tr_peertree_t * tree )
|
||||
{
|
||||
tr_peertree_entry_t * ii, * next;
|
||||
for( ii = RB_MIN( tr_peertree_s, tree ); NULL != ii; ii = next )
|
||||
{
|
||||
next = RB_NEXT( tr_peertree_s, tree, ii );
|
||||
RB_REMOVE( tr_peertree_s, tree, ii );
|
||||
free( ii );
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue