Changeset 9522

Timestamp:

Nov 14, 2009, 2:43:31 PM (13 years ago)

Author:

charles

Message:

(trunk) #2222: revert r8967, as foreshadowed in ​http://trac.transmissionbt.com/ticket/2222#comment:20

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• gtk/tr-prefs.c (modified) (2 diffs)
• libtransmission/session.c (modified) (2 diffs)
• libtransmission/tr-dht.c (modified) (2 diffs)
• third-party/Makefile.am (modified) (1 diff)

trunk/configure.ac

@@ -209 +209 @@
 
 
-AC_ARG_ENABLE([dht], 
-              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") 
+DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
+DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
 AC_SUBST(DHT_CFLAGS)
 AC_SUBST(DHT_LIBS)

trunk/gtk/tr-prefs.c

@@ -541 +541 @@
     hig_workarea_add_wide_control( t, &row, w );
 
-#ifndef WITHOUT_DHT
     s = _( "Use _DHT to find more peers" );
     w = new_check_button( s, TR_PREFS_KEY_DHT_ENABLED, core );
@@ -547 +546 @@
     gtr_widget_set_tooltip_text( w, s );
     hig_workarea_add_wide_control( t, &row, w );
-#endif
 
     hig_workarea_finish( t, &row );

trunk/libtransmission/session.c

@@ -701 +701 @@
     if( session->isDHTEnabled )
     {
-#ifdef WITHOUT_DHT
-        tr_inf( "DHT disabled by packager." );
-#else
         tr_dhtInit( session, &session->public_ipv4->addr );
-#endif
     }
 
@@ -1705 +1701 @@
 tr_sessionAllowsDHT( const tr_session * session UNUSED )
 {
-#ifdef WITHOUT_DHT
-    return 0;
-#else
     return tr_sessionIsDHTEnabled( session );
-#endif
 }
 

trunk/libtransmission/tr-dht.c

@@ -50 +50 @@
 #include "utils.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,
-                  tr_address * address 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,
-                     const 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;
@@ -471 +442 @@
     return size;
 }
-
-#endif

trunk/third-party/Makefile.am

@@ -1 @@
-if DHT
-  DHT_DIR = dht
-else
-  DHT_DIR =
-endif
-
-SUBDIRS = libnatpmp miniupnp libevent $(DHT_DIR)
+SUBDIRS = libnatpmp miniupnp libevent dht
 
 EXTRA_DIST = \