Changeset 8460

Timestamp:

May 21, 2009, 12:15:54 AM (13 years ago)

Author:

charles

Message:

(trunk) add hooks for disabling/enabling DHT in gtk client, qt client, and transmission-remote

Location:

trunk

Files:

• daemon/remote.c (modified) (2 diffs)
• daemon/transmission-remote.1 (modified) (2 diffs)
• doc/rpc-spec.txt (modified) (1 diff)
• gtk/main.c (modified) (1 diff)
• gtk/relocate.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (2 diffs)
• libtransmission/session.c (modified) (4 diffs)
• libtransmission/transmission.h (modified) (2 diffs)
• qt/prefs-dialog.cc (modified) (1 diff)
• qt/prefs.cc (modified) (1 diff)
• qt/prefs.h (modified) (1 diff)
• qt/session.cc (modified) (1 diff)

trunk/daemon/remote.c

@@ -82 +82 @@
     { 'n', "auth",                 "Set authentication info", "n",  1, "<username:password>" },
     { 'N', "netrc",                "Set authentication info from a .netrc file", "N",  1, "<filename>" },
+    { 'o', "dht",                  "Enable distributed hash tables (DHT)", "o", 0, NULL },
+    { 'O', "no-dht",               "Disable distributed hash tables (DHT)", "O", 0, NULL },
     { 'p', "port",                 "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "p", 1, "<port>" },
     { 'P', "random-port",          "Random port for incomping peers", "P", 0, NULL },
@@ -496 +498 @@
             }
 
+            case 'o':
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddBool( args, TR_PREFS_KEY_DHT_ENABLED, TRUE );
+                break;
+
+            case 'O':
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddBool( args, TR_PREFS_KEY_DHT_ENABLED, FALSE );
+                break;
+
             case 'x':
                 tr_bencDictAddStr( &top, "method", "session-set" );

trunk/daemon/transmission-remote.1

@@ -28 +28 @@
 .Op Fl n Ar user:pass
 .Op Fl N Ar netrc
+.Op Fl o | O
 .Op Fl p Ar port
 .Op Fl ph Ar files
@@ -135 +136 @@
 See netrc(5) for more information.
 
+.It Fl o Fl -dht
+Enable distributed hash table (DHT).
+.It Fl O Fl -no-dht
+Disable distribued hash table (DHT).
+
 .It Fl p Fl -port Ar port
 Set the

trunk/doc/rpc-spec.txt

@@ -375 +375 @@
    "blocklist-enabled"        | boolean    true means enabled
    "blocklist-size"           | number     number of rules in the blocklist
+   "dht-enabled"              | boolean    true means allow dht in public torrents
    "encryption"               | string     "required", "preferred", "tolerated"
    "download-dir"             | string     default path to download torrents

trunk/gtk/main.c

@@ -1010 +1010 @@
         tr_sessionSetPexEnabled( tr, pref_flag_get( key ) );
     }
+    else if( !strcmp( key, TR_PREFS_KEY_DHT_ENABLED ) )
+    {
+        tr_sessionSetDHTEnabled( tr, pref_flag_get( key ) );
+    }
     else if( !strcmp( key, TR_PREFS_KEY_RPC_PORT ) )
     {

trunk/gtk/relocate.c

@@ -26 +26 @@
 {
     GtkDialog * dialog;
-    tr_bool done;
+    int done;
 };
 

trunk/gtk/tr-prefs.c

@@ -539 +539 @@
     hig_workarea_add_row( t, &row, s, w, NULL );
 
-    s = _( "Use peer e_xchange" );
+    s = _( "Use peer e_xchange (PEX)" );
     w = new_check_button( s, TR_PREFS_KEY_PEX_ENABLED, core );
+    hig_workarea_add_wide_control( t, &row, w );
+
+    s = _( "Use _distributed hash table (DHT)" );
+    w = new_check_button( s, TR_PREFS_KEY_DHT_ENABLED, core );
     hig_workarea_add_wide_control( t, &row, w );
 

trunk/libtransmission/rpcimpl.c

@@ -1137 +1137 @@
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_PEX_ENABLED, &boolVal ) )
         tr_sessionSetPexEnabled( session, boolVal );
+    if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_DHT_ENABLED, &boolVal ) )
+        tr_sessionSetDHTEnabled( session, boolVal );
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START, &boolVal ) )
         tr_sessionSetPeerPortRandomOnStart( session, boolVal );
@@ -1239 +1241 @@
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_LIMIT_TORRENT, tr_sessionGetPeerLimitPerTorrent( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_PEX_ENABLED, tr_sessionIsPexEnabled( s ) );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED, tr_sessionIsDHTEnabled( s ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT, tr_sessionGetPeerPort( s ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START, tr_sessionGetPeerPortRandomOnStart( s ) );

trunk/libtransmission/session.c

@@ -348 +348 @@
     tr_bencDictReserve( d, 35 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        FALSE );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              TRUE );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_DOWNLOAD_DIR,             tr_getDefaultDownloadDir( ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED,                   100 );
@@ -404 +405 @@
     tr_bencDictReserve( d, 30 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        tr_blocklistIsEnabled( s ) );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              s->isDHTEnabled );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_DOWNLOAD_DIR,             s->downloadDir );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED,                   tr_sessionGetSpeedLimit( s, TR_DOWN ) );
@@ -623 +625 @@
     assert( found );
     session->isPexEnabled = boolVal;
-    /* This really ought to be a separate preference. */
+
+    found = tr_bencDictFindBool( &settings, TR_PREFS_KEY_DHT_ENABLED, &boolVal );
+    assert( found );
     session->isDHTEnabled = boolVal;
 
@@ -1595 +1599 @@
 
     return session->isDHTEnabled;
+}
+
+void
+tr_sessionSetDHTEnabled( tr_session * session, tr_bool enabled )
+{
+    assert( tr_isSession( session ) );
+
+    if( ( enabled!=0 ) != (session->isDHTEnabled!=0) )
+    {
+        if( session->isDHTEnabled )
+            tr_dhtUninit( session );
+
+        session->isDHTEnabled = enabled!=0;
+
+        if( session->isDHTEnabled )
+            tr_dhtInit( session );
+    }
 }
 

trunk/libtransmission/transmission.h

@@ -180 +180 @@
 #define TR_PREFS_KEY_BIND_ADDRESS_IPV6          "bind-address-ipv6"
 #define TR_PREFS_KEY_BLOCKLIST_ENABLED          "blocklist-enabled"
+#define TR_PREFS_KEY_DHT_ENABLED                "dht-enabled"
 #define TR_PREFS_KEY_DOWNLOAD_DIR               "download-dir"
 #define TR_PREFS_KEY_ENCRYPTION                 "encryption"
@@ -533 +534 @@
 tr_bool            tr_sessionIsDHTEnabled( const tr_session * session );
 
+void               tr_sessionSetDHTEnabled( tr_session * session, tr_bool );
+
 void               tr_sessionSetLazyBitfieldEnabled( tr_session * session,
                                                      tr_bool       enabled );

trunk/qt/prefs-dialog.cc

@@ -472 +472 @@
     hig->addSectionTitle( tr( "Privacy" ) );
     hig->addRow( tr( "&Encryption mode:" ), box );
-    hig->addWideControl( checkBoxNew( tr( "Use peer e&xchange" ), Prefs::PEX_ENABLED ) );
+    hig->addWideControl( checkBoxNew( tr( "Use peer e&xchange (PEX)" ), Prefs::PEX_ENABLED ) );
+    hig->addWideControl( checkBoxNew( tr( "Use &distributed hash table (DHT)" ), Prefs::PEX_ENABLED ) );
 
     hig->finish( );

trunk/qt/prefs.cc

@@ -88 +88 @@
     { SOCKET_TOS, TR_PREFS_KEY_PEER_SOCKET_TOS, QVariant::Int },
     { PEX_ENABLED, TR_PREFS_KEY_PEX_ENABLED, QVariant::Bool },
+    { DHT_ENABLED, TR_PREFS_KEY_DHT_ENABLED, QVariant::Bool },
     { PORT_FORWARDING, TR_PREFS_KEY_PORT_FORWARDING, QVariant::Bool },
     { PROXY_AUTH_ENABLED, TR_PREFS_KEY_PROXY_AUTH_ENABLED, QVariant::Bool },

trunk/qt/prefs.h

@@ -92 +92 @@
             SOCKET_TOS,
             PEX_ENABLED,
+            DHT_ENABLED,
             PORT_FORWARDING,
             PROXY_AUTH_ENABLED,

trunk/qt/session.cc

@@ -121 +121 @@
         case Prefs :: BLOCKLIST_ENABLED:
         case Prefs :: BLOCKLIST_DATE:
+        case Prefs :: DHT_ENABLED:
         case Prefs :: DOWNLOAD_DIR:
         case Prefs :: PEER_LIMIT_GLOBAL: