Add option to change DHT/LSD/PeX (#540)

Closes #532
picotorrent · Mar 6, 2018 · 8d4f9d2 · 8d4f9d2
1 parent eb1f9d8
commit 8d4f9d2
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 11 deletions.
diff --git a/lang/1033.json b/lang/1033.json
@@ -217,6 +217,11 @@
         "add_trackers": "Add trackers",
         "tracker_urls": "Tracker URLs",
         "force_reannounce": "Force reannounce",
-        "copy_url": "Copy URL"
+        "copy_url": "Copy URL",
+        "enable_dht": "Enable DHT",
+        "enable_lsd": "Enable LSD",
+        "enable_pex": "Enable PeX",
+        "changing_pex_settings_requires_restart": "Changing the PeX setting requires a restart",
+        "restart_required": "Restart required"
     }
 }
diff --git a/src/picotorrent/config.hpp b/src/picotorrent/config.hpp
@@ -69,10 +69,13 @@ namespace pt
             int ActiveTrackerLimit();
 
             bool EnableAnonymousMode();
+            void EnableAnonymousMode(bool value);
             bool EnableDht();
             void EnableDht(bool value);
             bool EnableLsd();
             void EnableLsd(bool value);
+            bool EnablePex();
+            void EnablePex(bool value);
 
             bool RequireIncomingEncryption();
             void RequireIncomingEncryption(bool value);

diff --git a/src/picotorrent/config_sessionsection.cpp b/src/picotorrent/config_sessionsection.cpp
@@ -62,6 +62,11 @@ bool Configuration::SessionSection::EnableAnonymousMode()
     return Get("session", "anonymous_mode", false);
 }
 
+void Configuration::SessionSection::EnableAnonymousMode(bool value)
+{
+    Set("session", "anonymous_mode", value);
+}
+
 bool Configuration::SessionSection::EnableDht()
 {
     return Get("session", "enable_dht", true);
@@ -82,6 +87,16 @@ void Configuration::SessionSection::EnableLsd(bool value)
     Set("session", "enable_lsd", value);
 }
 
+bool Configuration::SessionSection::EnablePex()
+{
+    return Get("session", "enable_pex", true);
+}
+
+void Configuration::SessionSection::EnablePex(bool value)
+{
+    Set("session", "enable_pex", value);
+}
+
 bool Configuration::SessionSection::EnableDownloadRateLimit()
 {
     return Get("session", "enable_download_rate_limit", false);

diff --git a/src/picotorrent/connectionpage.cpp b/src/picotorrent/connectionpage.cpp
@@ -8,7 +8,9 @@ using pt::ConnectionPage;
 
 ConnectionPage::ConnectionPage(wxWindow* parent, std::shared_ptr<pt::Configuration> config, std::shared_ptr<pt::Translator> tr)
     : wxPanel(parent, wxID_ANY),
-    m_cfg(config)
+    m_parent(parent),
+    m_cfg(config),
+    m_translator(tr)
 {
     wxStaticBoxSizer* listenSizer = new wxStaticBoxSizer(wxVERTICAL, this, i18n(tr, "listen_interface"));
     wxFlexGridSizer* listenGrid = new wxFlexGridSizer(1, 10, 10);
@@ -26,23 +28,45 @@ ConnectionPage::ConnectionPage(wxWindow* parent, std::shared_ptr<pt::Configurati
     listenGrid->Add(m_listenInterfaces, 1, wxEXPAND);
     listenSizer->Add(listenGrid, 1, wxEXPAND | wxALL, 5);
 
-    wxStaticBoxSizer* privacySizer = new wxStaticBoxSizer(wxVERTICAL, this, i18n(tr, "encryption"));
-    wxFlexGridSizer* privacyGrid = new wxFlexGridSizer(1, 10, 10);
+    wxStaticBoxSizer* encryptionSizer = new wxStaticBoxSizer(wxVERTICAL, this, i18n(tr, "encryption"));
+    wxFlexGridSizer* encryptionGrid = new wxFlexGridSizer(1, 10, 10);
 
-    m_incomingEncryption = new wxCheckBox(privacySizer->GetStaticBox(), wxID_ANY, i18n(tr, "require_encryption_incoming"));
+    m_incomingEncryption = new wxCheckBox(encryptionSizer->GetStaticBox(), wxID_ANY, i18n(tr, "require_encryption_incoming"));
     m_incomingEncryption->SetValue(m_cfg->Session()->RequireIncomingEncryption());
 
-    m_outgoingEncryption = new wxCheckBox(privacySizer->GetStaticBox(), wxID_ANY, i18n(tr, "require_encryption_outgoing"));
+    m_outgoingEncryption = new wxCheckBox(encryptionSizer->GetStaticBox(), wxID_ANY, i18n(tr, "require_encryption_outgoing"));
     m_outgoingEncryption->SetValue(m_cfg->Session()->RequireOutgoingEncryption());
 
+    encryptionGrid->AddGrowableCol(0, 1);
+    encryptionGrid->Add(m_incomingEncryption, 1, wxEXPAND);
+    encryptionGrid->Add(m_outgoingEncryption, 1, wxEXPAND);
+    encryptionSizer->Add(encryptionGrid, 1, wxEXPAND | wxALL, 5);
+
+    wxStaticBoxSizer* privacySizer = new wxStaticBoxSizer(wxVERTICAL, this, i18n(tr, "privacy"));
+    wxFlexGridSizer* privacyGrid = new wxFlexGridSizer(3, 10, 10);
+
+    m_enableDht = new wxCheckBox(privacySizer->GetStaticBox(), wxID_ANY, i18n(tr, "enable_dht"));
+    m_enableDht->SetValue(m_cfg->Session()->EnableDht());
+
+    m_enableLsd = new wxCheckBox(privacySizer->GetStaticBox(), wxID_ANY, i18n(tr, "enable_lsd"));
+    m_enableLsd->SetValue(m_cfg->Session()->EnableLsd());
+
+    m_enablePex = new wxCheckBox(privacySizer->GetStaticBox(), wxID_ANY, i18n(tr, "enable_pex"));
+    m_enablePex->SetValue(m_cfg->Session()->EnablePex());
+
     privacyGrid->AddGrowableCol(0, 1);
-    privacyGrid->Add(m_incomingEncryption, 1, wxEXPAND);
-    privacyGrid->Add(m_outgoingEncryption, 1, wxEXPAND);
+    privacyGrid->AddGrowableCol(1, 1);
+    privacyGrid->AddGrowableCol(2, 1);
+    privacyGrid->Add(m_enableDht, 1, wxEXPAND);
+    privacyGrid->Add(m_enableLsd, 1, wxEXPAND);
+    privacyGrid->Add(m_enablePex, 1, wxEXPAND);
     privacySizer->Add(privacyGrid, 1, wxEXPAND | wxALL, 5);
 
     wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
     sizer->Add(listenSizer, 0, wxEXPAND);
     sizer->AddSpacer(10);
+    sizer->Add(encryptionSizer, 0, wxEXPAND);
+    sizer->AddSpacer(10);
     sizer->Add(privacySizer, 0, wxEXPAND);
     sizer->AddStretchSpacer();
 
@@ -68,9 +92,22 @@ void ConnectionPage::ApplyConfiguration()
     m_cfg->ListenInterfaces(ifs);
     m_cfg->Session()->RequireIncomingEncryption(m_incomingEncryption->GetValue());
     m_cfg->Session()->RequireOutgoingEncryption(m_outgoingEncryption->GetValue());
+
+    m_cfg->Session()->EnableDht(m_enableDht->GetValue());
+    m_cfg->Session()->EnableLsd(m_enableLsd->GetValue());
+    m_cfg->Session()->EnablePex(m_enablePex->GetValue());
 }
 
 bool ConnectionPage::ValidateConfiguration(wxString& error)
 {
+    if (m_enablePex->GetValue() != m_cfg->Session()->EnablePex())
+    {
+        wxMessageBox(
+            i18n(m_translator, "changing_pex_settings_requires_restart"),
+            i18n(m_translator, "restart_required"),
+            wxOK | wxCENTRE,
+            m_parent);
+    }
+
     return true;
 }
diff --git a/src/picotorrent/connectionpage.hpp b/src/picotorrent/connectionpage.hpp
@@ -21,10 +21,17 @@ namespace pt
         bool ValidateConfiguration(wxString& error);
 
     private:
+        wxWindow* m_parent;
+
         wxTextCtrl* m_listenInterfaces;
         wxCheckBox* m_incomingEncryption;
         wxCheckBox* m_outgoingEncryption;
 
+        wxCheckBox* m_enableDht;
+        wxCheckBox* m_enableLsd;
+        wxCheckBox* m_enablePex;
+
         std::shared_ptr<Configuration> m_cfg;
+        std::shared_ptr<Translator> m_translator;
     };
 }
diff --git a/src/picotorrent/mainframe.cpp b/src/picotorrent/mainframe.cpp
@@ -317,7 +317,11 @@ void MainFrame::OnSessionAlert()
             lt::span<const int64_t> counters = ssa->counters();
             int idx = -1;
 
-            if ((idx = lt::find_metric_idx("dht.dht_nodes")) >= 0)
+            if (!m_config->Session()->EnableDht())
+            {
+                m_status->UpdateDhtNodesCount(-1);
+            }
+            else if ((idx = lt::find_metric_idx("dht.dht_nodes")) >= 0)
             {
                 m_status->UpdateDhtNodesCount(counters[idx]);
             }

diff --git a/src/picotorrent/sessionloader.cpp b/src/picotorrent/sessionloader.cpp
@@ -8,6 +8,9 @@
 #include <filesystem>
 #include <fstream>
 #include <libtorrent/add_torrent_params.hpp>
+#include <libtorrent/extensions/smart_ban.hpp>
+#include <libtorrent/extensions/ut_metadata.hpp>
+#include <libtorrent/extensions/ut_pex.hpp>
 #include <libtorrent/magnet_uri.hpp>
 #include <libtorrent/read_resume_data.hpp>
 #include <libtorrent/session.hpp>
@@ -43,7 +46,18 @@ std::shared_ptr<pt::SessionState> SessionLoader::Load(std::shared_ptr<pt::Enviro
     lt::settings_pack settings = SessionSettings::Get(cfg);
 
     std::shared_ptr<SessionState> state = std::make_shared<SessionState>();
-    state->session = std::make_unique<lt::session>(settings);
+    state->session = std::make_unique<lt::session>(
+        settings,
+        lt::session_flags_t{ lt::session_handle::start_default_features });
+
+    // Enable plugins
+    state->session->add_extension(lt::create_smart_ban_plugin);
+    state->session->add_extension(lt::create_ut_metadata_plugin);
+
+    if (cfg->Session()->EnablePex())
+    {
+        state->session->add_extension(lt::create_ut_pex_plugin);
+    }
 
     // Load state
     if (fs::exists(stateFile))

diff --git a/src/picotorrent/statusbar.cpp b/src/picotorrent/statusbar.cpp
@@ -20,7 +20,14 @@ StatusBar::StatusBar(wxWindow* parent)
 
 void StatusBar::UpdateDhtNodesCount(int64_t nodes)
 {
-    SetStatusText(wxString::Format("DHT: %I64d node(s)", nodes), 1);
+    if (nodes < 0)
+    {
+        SetStatusText("DHT: disabled", 1);
+    }
+    else
+    {
+        SetStatusText(wxString::Format("DHT: %I64d node(s)", nodes), 1);
+    }
 }
 
 void StatusBar::UpdateTorrentCount(int64_t torrents)