Skip to content

Commit 043b9de

Browse files
vasildvasild
committed
scripted-diff: rename ToStringIP[Port]() to ToStringAddr[Port]()
"IP" stands for "Internet Protocol". "IP address" is sometimes shortened to just "IP" or "address". However, Tor or I2P addresses are not "IP addresses", nor "IPs". Thus, use "Addr" instead of "IP" for addresses that could be IP, Tor or I2P addresses: `CService::ToStringIPPort()` -> `CService::ToStringAddrPort()` `CNetAddr::ToStringIP()` -> `CNetAddr::ToStringAddr()` -BEGIN VERIFY SCRIPT- sed -i 's/ToStringIPPort/ToStringAddrPort/g' -- $(git grep -l ToStringIPPort src) sed -i 's/ToStringIP/ToStringAddr/g' -- $(git grep -l ToStringIP src) -END VERIFY SCRIPT-
1 parent 6061eb6 commit 043b9de

File tree

10 files changed

+23
-23
lines changed

10 files changed

+23
-23
lines changed

‎src/i2p.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ bool Session::Connect(const CService& to, Connection& conn, bool& proxy_error)
206206
}
207207

208208
const Reply& lookup_reply =
209-
SendRequestAndGetReply(*sock, strprintf("NAMING LOOKUP NAME=%s", to.ToStringIP()));
209+
SendRequestAndGetReply(*sock, strprintf("NAMING LOOKUP NAME=%s", to.ToStringAddr()));
210210

211211
const std::string& dest = lookup_reply.Get("VALUE");
212212

‎src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
17841784
if (connOptions.onion_binds.size() > 1) {
17851785
InitWarning(strprintf(_("More than one onion bind address is provided. Using %s "
17861786
"for the automatically created Tor onion service."),
1787-
onion_service_target.ToStringIPPort()));
1787+
onion_service_target.ToStringAddrPort()));
17881788
}
17891789
StartTorControl(onion_service_target);
17901790
}

‎src/net.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ CNode* CConnman::FindNode(const CService& addr)
405405

406406
bool CConnman::AlreadyConnectedToAddress(const CAddress& addr)
407407
{
408-
return FindNode(static_cast<CNetAddr>(addr)) || FindNode(addr.ToStringIPPort());
408+
return FindNode(static_cast<CNetAddr>(addr)) || FindNode(addr.ToStringAddrPort());
409409
}
410410

411411
bool CConnman::CheckIncomingNonce(uint64_t nonce)
@@ -509,7 +509,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
509509
if (!sock) {
510510
return nullptr;
511511
}
512-
connected = ConnectThroughProxy(proxy, addrConnect.ToStringIP(), addrConnect.GetPort(),
512+
connected = ConnectThroughProxy(proxy, addrConnect.ToStringAddr(), addrConnect.GetPort(),
513513
*sock, nConnectTimeout, proxyConnectionFailed);
514514
} else {
515515
// no proxy needed (none set for target network)
@@ -2742,7 +2742,7 @@ CNode::CNode(NodeId idIn,
27422742
m_connected{GetTime<std::chrono::seconds>()},
27432743
addr{addrIn},
27442744
addrBind{addrBindIn},
2745-
m_addr_name{addrNameIn.empty() ? addr.ToStringIPPort() : addrNameIn},
2745+
m_addr_name{addrNameIn.empty() ? addr.ToStringAddrPort() : addrNameIn},
27462746
m_inbound_onion{inbound_onion},
27472747
m_prefer_evict{node_opts.prefer_evict},
27482748
nKeyedNetGroup{nKeyedNetGroupIn},

‎src/netaddress.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ std::string OnionToString(Span<const uint8_t> addr)
599599
return EncodeBase32(address) + ".onion";
600600
}
601601

602-
std::string CNetAddr::ToStringIP() const
602+
std::string CNetAddr::ToStringAddr() const
603603
{
604604
switch (m_net) {
605605
case NET_IPV4:
@@ -624,7 +624,7 @@ std::string CNetAddr::ToStringIP() const
624624

625625
std::string CNetAddr::ToString() const
626626
{
627-
return ToStringIP();
627+
return ToStringAddr();
628628
}
629629

630630
bool operator==(const CNetAddr& a, const CNetAddr& b)
@@ -921,18 +921,18 @@ std::string CService::ToStringPort() const
921921
return strprintf("%u", port);
922922
}
923923

924-
std::string CService::ToStringIPPort() const
924+
std::string CService::ToStringAddrPort() const
925925
{
926926
if (IsIPv4() || IsTor() || IsI2P() || IsInternal()) {
927-
return ToStringIP() + ":" + ToStringPort();
927+
return ToStringAddr() + ":" + ToStringPort();
928928
} else {
929-
return "[" + ToStringIP() + "]:" + ToStringPort();
929+
return "[" + ToStringAddr() + "]:" + ToStringPort();
930930
}
931931
}
932932

933933
std::string CService::ToString() const
934934
{
935-
return ToStringIPPort();
935+
return ToStringAddrPort();
936936
}
937937

938938
CSubNet::CSubNet():

‎src/netaddress.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class CNetAddr
194194

195195
enum Network GetNetwork() const;
196196
std::string ToString() const;
197-
std::string ToStringIP() const;
197+
std::string ToStringAddr() const;
198198
bool GetInAddr(struct in_addr* pipv4Addr) const;
199199
Network GetNetClass() const;
200200

@@ -538,7 +538,7 @@ class CService : public CNetAddr
538538
std::vector<unsigned char> GetKey() const;
539539
std::string ToString() const;
540540
std::string ToStringPort() const;
541-
std::string ToStringIPPort() const;
541+
std::string ToStringAddrPort() const;
542542

543543
CService(const struct in6_addr& ipv6Addr, uint16_t port);
544544
explicit CService(const struct sockaddr_in6& addr);

‎src/qt/clientmodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ bool ClientModel::getProxyInfo(std::string& ip_port) const
287287
{
288288
Proxy ipv4, ipv6;
289289
if (m_node.getProxy((Network) 1, ipv4) && m_node.getProxy((Network) 2, ipv6)) {
290-
ip_port = ipv4.proxy.ToStringIPPort();
290+
ip_port = ipv4.proxy.ToStringAddrPort();
291291
return true;
292292
}
293293
return false;

‎src/qt/optionsdialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,17 +413,17 @@ void OptionsDialog::updateDefaultProxyNets()
413413
QString strDefaultProxyGUI;
414414

415415
model->node().getProxy(NET_IPV4, proxy);
416-
strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort();
416+
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
417417
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
418418
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv4->setChecked(true) : ui->proxyReachIPv4->setChecked(false);
419419

420420
model->node().getProxy(NET_IPV6, proxy);
421-
strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort();
421+
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
422422
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
423423
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv6->setChecked(true) : ui->proxyReachIPv6->setChecked(false);
424424

425425
model->node().getProxy(NET_ONION, proxy);
426-
strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort();
426+
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
427427
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
428428
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachTor->setChecked(true) : ui->proxyReachTor->setChecked(false);
429429
}

‎src/rpc/net.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ static UniValue GetNetworksInfo()
568568
obj.pushKV("name", GetNetworkName(network));
569569
obj.pushKV("limited", !IsReachable(network));
570570
obj.pushKV("reachable", IsReachable(network));
571-
obj.pushKV("proxy", proxy.IsValid() ? proxy.proxy.ToStringIPPort() : std::string());
571+
obj.pushKV("proxy", proxy.IsValid() ? proxy.proxy.ToStringAddrPort() : std::string());
572572
obj.pushKV("proxy_randomize_credentials", proxy.randomize_credentials);
573573
networks.push_back(obj);
574574
}
@@ -902,7 +902,7 @@ static RPCHelpMan getnodeaddresses()
902902
UniValue obj(UniValue::VOBJ);
903903
obj.pushKV("time", int64_t{TicksSinceEpoch<std::chrono::seconds>(addr.nTime)});
904904
obj.pushKV("services", (uint64_t)addr.nServices);
905-
obj.pushKV("address", addr.ToStringIP());
905+
obj.pushKV("address", addr.ToStringAddr());
906906
obj.pushKV("port", addr.GetPort());
907907
obj.pushKV("network", GetNetworkName(addr.GetNetClass()));
908908
ret.push_back(obj);

‎src/test/fuzz/netaddress.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ FUZZ_TARGET(netaddress)
7171
}
7272
(void)net_addr.IsValid();
7373
(void)net_addr.ToString();
74-
(void)net_addr.ToStringIP();
74+
(void)net_addr.ToStringAddr();
7575

7676
const CSubNet sub_net{net_addr, fuzzed_data_provider.ConsumeIntegral<uint8_t>()};
7777
(void)sub_net.IsValid();
@@ -81,7 +81,7 @@ FUZZ_TARGET(netaddress)
8181
(void)service.GetKey();
8282
(void)service.GetPort();
8383
(void)service.ToString();
84-
(void)service.ToStringIPPort();
84+
(void)service.ToStringAddrPort();
8585
(void)service.ToStringPort();
8686
(void)CServiceHash()(service);
8787
(void)CServiceHash(0, 0)(service);

‎src/torcontrol.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ void TorController::get_socks_cb(TorControlConnection& _conn, const TorControlRe
380380
}
381381

382382
Assume(resolved.IsValid());
383-
LogPrint(BCLog::TOR, "Configuring onion proxy for %s\n", resolved.ToStringIPPort());
383+
LogPrint(BCLog::TOR, "Configuring onion proxy for %s\n", resolved.ToStringAddrPort());
384384
Proxy addrOnion = Proxy(resolved, true);
385385
SetProxy(NET_ONION, addrOnion);
386386

@@ -453,7 +453,7 @@ void TorController::auth_cb(TorControlConnection& _conn, const TorControlReply&
453453
}
454454
// Request onion service, redirect port.
455455
// Note that the 'virtual' port is always the default port to avoid decloaking nodes using other ports.
456-
_conn.Command(strprintf("ADD_ONION %s Port=%i,%s", private_key, Params().GetDefaultPort(), m_target.ToStringIPPort()),
456+
_conn.Command(strprintf("ADD_ONION %s Port=%i,%s", private_key, Params().GetDefaultPort(), m_target.ToStringAddrPort()),
457457
std::bind(&TorController::add_onion_cb, this, std::placeholders::_1, std::placeholders::_2));
458458
} else {
459459
LogPrintf("tor: Authentication failed\n");

0 commit comments

Comments
 (0)