Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DaemonManager: enable dns block list in simple mode #3314

Merged
merged 1 commit into from
Jan 29, 2021

Conversation

selsta
Copy link
Collaborator

@selsta selsta commented Jan 20, 2021

No description provided.

@xiphon
Copy link
Collaborator

xiphon commented Jan 21, 2021

Thinking about Advanced mode with auto bootstrap daemon, this will silently enable unwanted dns block list option.

@selsta
Copy link
Collaborator Author

selsta commented Jan 21, 2021

Will try to update it to simple mode only

@selsta
Copy link
Collaborator Author

selsta commented Jan 21, 2021

Updated to only enable block list when simple mode is used.

@xiphon
Copy link
Collaborator

xiphon commented Jan 21, 2021

Maybe we better do something like

diff --git a/main.qml b/main.qml
index 82373963..42452c64 100644
--- a/main.qml
+++ b/main.qml
@@ -1938,12 +1938,13 @@ ApplicationWindow {
             return;
         }

+        const simpleModeFlags = "--enable-dns-blocklist --out-peers 16";
         if (appWindow.daemonRunning) {
             appWindow.stopDaemon(function() {
-                appWindow.startDaemon("")
+                appWindow.startDaemon(simpleModeFlags)
             });
         } else {
-            appWindow.startDaemon("");
+            appWindow.startDaemon(simpleModeFlags);
         }
     }

diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index 86c1a2cc..9a7755fc 100644
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@@ -112,10 +112,6 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
         arguments << "--no-sync";
     }

-    if (!flags.contains("--out-peers", Qt::CaseSensitive) && bootstrapNodeAddress == "auto") {
-        arguments << "--out-peers" << "16";
-    }
-
     arguments << "--check-updates" << "disabled";

     // --max-concurrency based on threads available.

Co-authored-by: xiphon <xiphon@protonmail.com>
@selsta
Copy link
Collaborator Author

selsta commented Jan 22, 2021

Looks simpler. Updated.

@luigi1111 luigi1111 merged commit 1f0f21a into monero-project:master Jan 29, 2021
@selsta selsta deleted the dns-block-list branch February 1, 2021 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants