-
Notifications
You must be signed in to change notification settings - Fork 36.9k
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
Revert "net: do not advertise address where nobody is listening" #24648
Conversation
This reverts commit a381374.
I'm very ~0 on last-minute reverting bug fixes to |
I am a bit ~ |
I don't think there is anything wrong with reverting a hunk that was never released in a release |
In comparison the "bug" that had been fixed in #20769 with the bitcoin-core/gui#567, the latter looks much more seriously. And, considering #20657 (comment):
we already do in Lines 688 to 689 in d6f225f
|
What about this: --- i/src/qt/optionsmodel.cpp
+++ w/src/qt/optionsmodel.cpp
@@ -148,14 +148,17 @@ void OptionsModel::Init(bool resetSettings)
if (!gArgs.SoftSetBoolArg("-natpmp", settings.value("fUseNatpmp").toBool())) {
addOverriddenOption("-natpmp");
}
if (!settings.contains("fListen"))
settings.setValue("fListen", DEFAULT_LISTEN);
- if (!gArgs.SoftSetBoolArg("-listen", settings.value("fListen").toBool()))
+ if (!gArgs.SoftSetBoolArg("-listen", settings.value("fListen").toBool())) {
addOverriddenOption("-listen");
+ } else if (!settings.value("fListen").toBool()) {
+ gArgs.SoftSetBoolArg("-listenonion", false);
+ }
if (!settings.contains("server")) {
settings.setValue("server", false);
}
if (!gArgs.SoftSetBoolArg("-server", settings.value("server").toBool())) {
addOverriddenOption("-server"); It fixes bitcoin-core/gui#567 without reintroducing #20657. |
Mind submitting a PR in https://github.com/bitcoin-core/gui/pulls? |
Okay, closing in favor of bitcoin-core/gui#568. |
This is a quick fix bitcoin-core/gui#567 which is assumed to be backported to 23.0rc3.
Effectively, this PR reverts #20769 which could be implemented later in a better way.