highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-10 14:48:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Return std::optional from GetProxy

Browse Source
This commit is contained in:
MarcoFalke
2026-02-05 16:35:14 +01:00
parent faeac1a931
commit fa270fdacf
8 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/interfaces/node.h
View File

@@ -19,6 +19,7 @@
#include <cstdint>
#include <functional>
#include <memory>
#include <optional>
#include <string>
#include <tuple>
#include <vector>
@@ -123,7 +124,7 @@ public:
virtual void mapPort(bool enable) = 0;
//! Get proxy.
virtual bool getProxy(Network net, Proxy& proxy_info) = 0;
virtual std::optional<Proxy> getProxy(Network net) = 0;
//! Get number of connections.
virtual size_t getNodeCount(ConnectionDirection flags) = 0;

35
src/net.cpp
View File

@@ -438,16 +438,11 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
assert(!addr_bind.IsValid());
std::unique_ptr<i2p::sam::Session> i2p_transient_session;
for (auto& target_addr: connect_to) {
for (auto& target_addr : connect_to) {
if (target_addr.IsValid()) {
bool use_proxy;
Proxy proxy;
if (proxy_override.has_value()) {
use_proxy = true;
proxy = proxy_override.value();
} else {
use_proxy = GetProxy(target_addr.GetNetwork(), proxy);
}
const std::optional<Proxy> use_proxy{
proxy_override.has_value() ? proxy_override : GetProxy(target_addr.GetNetwork()),
};
bool proxyConnectionFailed = false;
if (target_addr.IsI2P() && use_proxy) {
@@ -464,7 +459,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
LOCK(m_unused_i2p_sessions_mutex);
if (m_unused_i2p_sessions.empty()) {
i2p_transient_session =
std::make_unique<i2p::sam::Session>(proxy, m_interrupt_net);
std::make_unique<i2p::sam::Session>(*use_proxy, m_interrupt_net);
} else {
i2p_transient_session.swap(m_unused_i2p_sessions.front());
m_unused_i2p_sessions.pop();
@@ -484,8 +479,8 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
addr_bind = conn.me;
}
} else if (use_proxy) {
LogDebug(BCLog::PROXY, "Using proxy: %s to connect to %s\n", proxy.ToString(), target_addr.ToStringAddrPort());
sock = ConnectThroughProxy(proxy, target_addr.ToStringAddr(), target_addr.GetPort(), proxyConnectionFailed);
LogDebug(BCLog::PROXY, "Using proxy: %s to connect to %s\n", use_proxy->ToString(), target_addr.ToStringAddrPort());
sock = ConnectThroughProxy(*use_proxy, target_addr.ToStringAddr(), target_addr.GetPort(), proxyConnectionFailed);
} else {
// no proxy needed (none set for target network)
sock = ConnectDirectly(target_addr, conn_type == ConnectionType::MANUAL);
@@ -3114,9 +3109,10 @@ void CConnman::PrivateBroadcast::NumToOpenWait() const
std::optional<Proxy> CConnman::PrivateBroadcast::ProxyForIPv4or6() const
{
Proxy tor_proxy;
if (m_outbound_tor_ok_at_least_once.load() && GetProxy(NET_ONION, tor_proxy)) {
return tor_proxy;
if (m_outbound_tor_ok_at_least_once.load()) {
if (const auto tor_proxy = GetProxy(NET_ONION)) {
return tor_proxy;
}
}
return std::nullopt;
}
@@ -3472,10 +3468,11 @@ bool CConnman::Start(CScheduler& scheduler, const Options& connOptions)
return false;
}
Proxy i2p_sam;
if (GetProxy(NET_I2P, i2p_sam) && connOptions.m_i2p_accept_incoming) {
m_i2p_sam_session = std::make_unique<i2p::sam::Session>(gArgs.GetDataDirNet() / "i2p_private_key",
i2p_sam, m_interrupt_net);
if (connOptions.m_i2p_accept_incoming) {
if (const auto i2p_sam = GetProxy(NET_I2P)) {
m_i2p_sam_session = std::make_unique<i2p::sam::Session>(gArgs.GetDataDirNet() / "i2p_private_key",
*i2p_sam, m_interrupt_net);
}
}
// Randomize the order in which we may query seednode to potentially prevent connecting to the same one every restart (and signal that we have restarted)

11
src/netbase.cpp
View File

@@ -706,13 +706,14 @@ bool SetProxy(enum Network net, const Proxy &addrProxy) {
return true;
}
bool GetProxy(enum Network net, Proxy &proxyInfoOut) {
std::optional<Proxy> GetProxy(enum Network net)
{
assert(net >= 0 && net < NET_MAX);
LOCK(g_proxyinfo_mutex);
if (!proxyInfo[net].IsValid())
return false;
proxyInfoOut = proxyInfo[net];
return true;
if (!proxyInfo[net].IsValid()) {
return std::nullopt;
}
return proxyInfo[net];
}
bool SetNameProxy(const Proxy &addrProxy) {

3
src/netbase.h
View File

@@ -14,6 +14,7 @@
#include <cstdint>
#include <functional>
#include <memory>
#include <optional>
#include <string>
#include <type_traits>
#include <unordered_set>
@@ -179,7 +180,7 @@ std::string GetNetworkName(enum Network net);
/** Return a vector of publicly routable Network names; optionally append NET_UNROUTABLE. */
std::vector<std::string> GetNetworkNames(bool append_unroutable = false);
bool SetProxy(enum Network net, const Proxy &addrProxy);
bool GetProxy(enum Network net, Proxy &proxyInfoOut);
std::optional<Proxy> GetProxy(enum Network net);
bool IsProxy(const CNetAddr &addr);
/**
* Set the name proxy to use for all connections to nodes specified by a

2
src/node/interfaces.cpp
View File

@@ -187,7 +187,7 @@ public:
args().WriteSettingsFile();
}
void mapPort(bool enable) override { StartMapPort(enable); }
bool getProxy(Network net, Proxy& proxy_info) override { return GetProxy(net, proxy_info); }
std::optional<Proxy> getProxy(Network net) override { return GetProxy(net); }
size_t getNodeCount(ConnectionDirection flags) override
{
return m_context->connman ? m_context->connman->GetNodeCount(flags) : 0;

9
src/qt/clientmodel.cpp
View File

@@ -287,10 +287,11 @@ void ClientModel::unsubscribeFromCoreSignals()
bool ClientModel::getProxyInfo(std::string& ip_port) const
{
Proxy ipv4, ipv6;
if (m_node.getProxy((Network) 1, ipv4) && m_node.getProxy((Network) 2, ipv6)) {
ip_port = ipv4.proxy.ToStringAddrPort();
return true;
const auto ipv4 = m_node.getProxy(NET_IPV4);
const auto ipv6 = m_node.getProxy(NET_IPV6);
if (ipv4 && ipv6) {
ip_port = ipv4->proxy.ToStringAddrPort();
return true;
}
return false;
}

15
src/qt/optionsdialog.cpp
View File

@@ -456,17 +456,14 @@ void OptionsDialog::updateDefaultProxyNets()
proxyIpText = ui_proxy.ToStringAddrPort();
}
Proxy proxy;
bool has_proxy;
const auto proxy_ipv4 = model->node().getProxy(NET_IPV4);
ui->proxyReachIPv4->setChecked(proxy_ipv4 && proxy_ipv4->ToString() == proxyIpText);
has_proxy = model->node().getProxy(NET_IPV4, proxy);
ui->proxyReachIPv4->setChecked(has_proxy && proxy.ToString() == proxyIpText);
const auto proxy_ipv6 = model->node().getProxy(NET_IPV6);
ui->proxyReachIPv6->setChecked(proxy_ipv6 && proxy_ipv6->ToString() == proxyIpText);
has_proxy = model->node().getProxy(NET_IPV6, proxy);
ui->proxyReachIPv6->setChecked(has_proxy && proxy.ToString() == proxyIpText);
has_proxy = model->node().getProxy(NET_ONION, proxy);
ui->proxyReachTor->setChecked(has_proxy && proxy.ToString() == proxyIpText);
const auto proxy_onion = model->node().getProxy(NET_ONION);
ui->proxyReachTor->setChecked(proxy_onion && proxy_onion->ToString() == proxyIpText);
}
ProxyAddressValidator::ProxyAddressValidator(QObject *parent) :

11
src/rpc/net.cpp
View File

@@ -617,14 +617,17 @@ static UniValue GetNetworksInfo()
for (int n = 0; n < NET_MAX; ++n) {
enum Network network = static_cast<enum Network>(n);
if (network == NET_UNROUTABLE || network == NET_INTERNAL) continue;
Proxy proxy;
UniValue obj(UniValue::VOBJ);
GetProxy(network, proxy);
obj.pushKV("name", GetNetworkName(network));
obj.pushKV("limited", !g_reachable_nets.Contains(network));
obj.pushKV("reachable", g_reachable_nets.Contains(network));
obj.pushKV("proxy", proxy.IsValid() ? proxy.ToString() : std::string());
obj.pushKV("proxy_randomize_credentials", proxy.m_tor_stream_isolation);
if (const auto proxy = GetProxy(network)) {
obj.pushKV("proxy", proxy->ToString());
obj.pushKV("proxy_randomize_credentials", proxy->m_tor_stream_isolation);
} else {
obj.pushKV("proxy", std::string());
obj.pushKV("proxy_randomize_credentials", false);
}
networks.push_back(std::move(obj));
}
return networks;