mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-24 08:43:27 +00:00
Code Issues Releases Wiki Activity

(trunk) remove the option to build without DHT. This is because of new & improved information wrt ticket #2222

Browse source
This commit is contained in:
Charles Kerr 2009-08-10 16:09:25 +00:00
parent 51ac6b4aac
commit 6fd19fa096
4 changed files with 3 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.ac
View file

@ -203,20 +203,8 @@ dnl ----------------------------------------------------------------------------
dnl dnl
dnl dht dnl dht
DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
AC_ARG_ENABLE([dht], DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
AS_HELP_STRING([--disable-dht],[omit DHT support]),
[enable_dht=${enableval}],
[enable_dht=yes])
if test "x$enable_dht" = "xno" ; then
AC_DEFINE([WITHOUT_DHT], 1)
DHT_CFLAGS=""
DHT_LIBS=""
else
DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
fi
AM_CONDITIONAL(DHT, test "x$enable_dht" = "xyes")
AC_SUBST(DHT_CFLAGS) AC_SUBST(DHT_CFLAGS)
AC_SUBST(DHT_LIBS) AC_SUBST(DHT_LIBS)
@ -427,7 +415,6 @@ Configuration:
Source code location: ${srcdir} Source code location: ${srcdir}
Compiler: ${CXX} Compiler: ${CXX}
System or bundled libevent: ${libevent_source} System or bundled libevent: ${libevent_source}
DHT support: ${enable_dht}
Build Mac client: ${build_mac} Build Mac client: ${build_mac}
Build GTK+ client: ${build_gtk} Build GTK+ client: ${build_gtk}

8
libtransmission/session.c
View file

@ -845,11 +845,7 @@ tr_sessionInitImpl( void * vdata )
if( session->isDHTEnabled ) if( session->isDHTEnabled )
{ {
#ifdef WITHOUT_DHT
tr_inf( "DHT disabled by packager." );
#else
tr_dhtInit( session, &session->public_ipv4->addr ); tr_dhtInit( session, &session->public_ipv4->addr );
#endif
} }
} }
@ -1606,11 +1602,7 @@ tr_sessionIsPexEnabled( const tr_session * session )
tr_bool tr_bool
tr_sessionAllowsDHT( const tr_session * session UNUSED ) tr_sessionAllowsDHT( const tr_session * session UNUSED )
{ {
#ifdef WITHOUT_DHT
return 0;
#else
return tr_sessionIsDHTEnabled( session ); return tr_sessionIsDHTEnabled( session );
#endif
} }
tr_bool tr_bool

21
libtransmission/tr-dht.c
View file

@ -50,25 +50,6 @@ THE SOFTWARE.
#include "utils.h" #include "utils.h"
#include "version.h" #include "version.h"
#ifdef WITHOUT_DHT
/* These are the stubs for when we're building without DHT support */
int tr_dhtInit( tr_session * session UNUSED ) { return TR_DHT_STOPPED; }
void tr_dhtUninit( tr_session * session UNUSED ) { }
tr_bool tr_dhtEnabled( const tr_session * session UNUSED ) { return FALSE; }
tr_port tr_dhtPort ( const tr_session * sesssion UNUSED ) { return 0; }
int tr_dhtStatus( tr_session * session UNUSED,
int * setmeCount UNUSED ) { return TR_DHT_STOPPED; }
int tr_dhtAddNode( tr_session * session UNUSED,
tr_address * addr UNUSED,
tr_port port UNUSED,
tr_bool bootstrap UNUSED ) { return 0; }
int tr_dhtAnnounce( tr_torrent * session UNUSED,
tr_bool announce UNUSED ) { return -1; }
#else
static int dht_socket; static int dht_socket;
static struct event dht_event; static struct event dht_event;
static tr_port dht_port; static tr_port dht_port;
@ -458,5 +439,3 @@ dht_random_bytes( void * buf, size_t size )
tr_cryptoRandBuf( buf, size ); tr_cryptoRandBuf( buf, size );
return size; return size;
} }
#endif

8
third-party/Makefile.am vendored
View file

@ -1,10 +1,4 @@
if DHT SUBDIRS = libnatpmp miniupnp libevent dht
DHT_DIR = dht
else
DHT_DIR =
endif
SUBDIRS = libnatpmp miniupnp libevent $(DHT_DIR)
EXTRA_DIST = \ EXTRA_DIST = \
macosx-libevent-config.h \ macosx-libevent-config.h \