Bugfix: Allow -noproxy and -proxy= command line options

Hacky but simple alternative to bitcoin#24830
bitcoinknots · Apr 19, 2022 · 17c0fc3 · 17c0fc3
1 parent 7540a95
commit 17c0fc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1026,7 +1026,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
 
     nMaxTipAge = args.GetIntArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
 
-    if (args.IsArgSet("-proxy") && args.GetArg("-proxy", "").empty()) {
+    if (args.IsArgSet("-proxy") && args.GetArg("-proxy", "") == std::string(1, 0)) {
         return InitError(_("No proxy server specified. Use -proxy=<ip> or -proxy=<ip:port>."));
     }
 

diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -360,6 +360,11 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
         std::optional<util::SettingsValue> value = InterpretValue(keyinfo, val, *flags, error);
         if (!value) return false;
 
+        if (is_index == std::string::npos && keyinfo.name == "proxy" && !keyinfo.negated) {
+            assert(value->get_str() == "");
+            value = std::string(1, 0);
+        }
+
         m_settings.command_line_options[keyinfo.name].push_back(*value);
     }