Merge bitcoin/bitcoin#22834: net: respect -onlynet= when making outbound connections
0eea83a85escripted-diff: rename `proxyType` to `Proxy` (Vasil Dimov)e53a8505dbnet: respect -onlynet= when making outbound connections (Vasil Dimov) Pull request description: Do not make outbound connections to hosts which belong to a network which is restricted by `-onlynet`. This applies to hosts that are automatically chosen to connect to and to anchors. This does not apply to hosts given to `-connect`, `-addnode`, `addnode` RPC, dns seeds, `-seednode`. Fixes https://github.com/bitcoin/bitcoin/issues/13378 Fixes https://github.com/bitcoin/bitcoin/issues/22647 Supersedes https://github.com/bitcoin/bitcoin/pull/22651 ACKs for top commit: naumenkogs: utACK0eea83a85eprayank23: reACK https://github.com/bitcoin/bitcoin/pull/22834/commits/0eea83a85ec6b215d44facc2b16ee1b035275a6b jonatack: ACK0eea83a85ecode review, rebased to master, debug built, and did some manual testing with various config options on signet Tree-SHA512: 37d68b449dd6d2715843fc84d85f48fa2508be40ea105a7f4a28443b318d0b6bd39e3b2ca2a6186f2913836adf08d91038a8b142928e1282130f39ac81aa741b
This commit is contained in:
14 files changed
+72
-52
No files matched your search
@@ -329,7 +329,7 @@ void ClientModel::unsubscribeFromCoreSignals()
|
||||
|
||||
bool ClientModel::getProxyInfo(std::string& ip_port) const
|
||||
{
|
||||
proxyType ipv4, ipv6;
|
||||
Proxy ipv4, ipv6;
|
||||
if (m_node.getProxy((Network) 1, ipv4) && m_node.getProxy((Network) 2, ipv6)) {
|
||||
ip_port = ipv4.proxy.ToStringIPPort();
|
||||
return true;
|
||||
|
||||
@@ -395,7 +395,7 @@ void OptionsDialog::updateProxyValidationState()
|
||||
|
||||
void OptionsDialog::updateDefaultProxyNets()
|
||||
{
|
||||
proxyType proxy;
|
||||
Proxy proxy;
|
||||
std::string strProxy;
|
||||
QString strDefaultProxyGUI;
|
||||
|
||||
@@ -425,7 +425,7 @@ QValidator::State ProxyAddressValidator::validate(QString &input, int &pos) cons
|
||||
Q_UNUSED(pos);
|
||||
// Validate the proxy
|
||||
CService serv(LookupNumeric(input.toStdString(), DEFAULT_GUI_PROXY_PORT));
|
||||
proxyType addrProxy = proxyType(serv, true);
|
||||
Proxy addrProxy = Proxy(serv, true);
|
||||
if (addrProxy.IsValid())
|
||||
return QValidator::Acceptable;
|
||||
|
||||
|
||||
Reference in new issue
Block a user