highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-05 20:50:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#32500: init: drop -upnp

Browse Source 
301993ebf7f8ec23050e91377e0fd05823bb372a init: drop -upnp (fanquake)

Pull request description:

  This was slated for removal in `30.0`, so remove it.

ACKs for top commit:
  i-am-yuvi:
    ACK 301993ebf7f8ec23050e91377e0fd05823bb372a
  maflcko:
    review ACK 301993ebf7f8ec23050e91377e0fd05823bb372a
  darosior:
    tACK 301993ebf7f8ec23050e91377e0fd05823bb372a

Tree-SHA512: 635e374c013fa08c4cda7caadc465c89bb376d3ee2c66f67a27e3ed9031844674d3e996169aaffb9b65a67b0d44d92aaec000aaf69abe3dd10fce2f4138f3e27
This commit is contained in:
merge-script 2025-05-16 09:31:45 +01:00
commit c60455a645
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/release-notes-32500.md Normal file
View File

@ -0,0 +1,3 @@
### Updated Settings
- The `-upnp` setting has now been fully removed. Use `-natpmp` instead. (#32500)

28
src/init.cpp
View File

@ -561,8 +561,6 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
argsman.AddArg("-peertimeout=<n>", strprintf("Specify a p2p connection timeout delay in seconds. After connecting to a peer, wait this amount of time before considering disconnection based on inactivity (minimum: 1, default: %d)", DEFAULT_PEER_CONNECT_TIMEOUT), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CONNECTION);
argsman.AddArg("-torcontrol=<ip>:<port>", strprintf("Tor control host and port to use if onion listening enabled (default: %s). If no port is specified, the default port of %i will be used.", DEFAULT_TOR_CONTROL, DEFAULT_TOR_CONTROL_PORT), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-torpassword=<pass>", "Tor control port password (default: empty)", ArgsManager::ALLOW_ANY | ArgsManager::SENSITIVE, OptionsCategory::CONNECTION);
// UPnP support was dropped. We keep `-upnp` as a hidden arg to display a more user friendly error when set. TODO: remove (here and below) for 30.0. NOTE: removing this option may prevent the GUI from starting, see https://github.com/bitcoin-core/gui/issues/843.
argsman.AddArg("-upnp", "", ArgsManager::ALLOW_ANY, OptionsCategory::HIDDEN);
argsman.AddArg("-natpmp", strprintf("Use PCP or NAT-PMP to map the listening port (default: %u)", DEFAULT_NATPMP), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-whitebind=<[permissions@]addr>", "Bind to the given address and add permission flags to the peers connecting to it. "
"Use [host]:port notation for IPv6. Allowed permissions: " + Join(NET_PERMISSIONS_DOC, ", ") + ". "
@ -791,32 +789,6 @@ void InitParameterInteraction(ArgsManager& args)
LogInfo("parameter interaction: -onlynet excludes IPv4 and IPv6 -> setting -dnsseed=0\n");
}
}
// If settings.json contains a "upnp" option, migrate it to use "natpmp" instead
bool settings_changed{false}; // Whether settings.json file needs to be rewritten
args.LockSettings([&](common::Settings& settings) {
if (auto* upnp{common::FindKey(settings.rw_settings, "upnp")}) {
if (common::FindKey(settings.rw_settings, "natpmp") == nullptr) {
LogWarning(R"(Adding "natpmp": %s to settings.json to replace obsolete "upnp" setting)", upnp->write());
settings.rw_settings["natpmp"] = *upnp;
}
LogWarning(R"(Removing obsolete "upnp" setting from settings.json)");
settings.rw_settings.erase("upnp");
settings_changed = true;
}
});
if (settings_changed) args.WriteSettingsFile();
// We dropped UPnP support but kept the arg as hidden for now to display a friendlier error to user who has the
// option in their config, and migrate the setting to -natpmp.
if (const auto arg{args.GetBoolArg("-upnp")}) {
std::string message;
if (args.SoftSetBoolArg("-natpmp", *arg)) {
message = strprintf(" Substituting '-natpmp=%s'.", *arg);
}
LogWarning("Option '-upnp=%s' is given but UPnP support was dropped in version 29.0.%s",
*arg, message);
}
}
/**