Skip to content

Commit 5f9d3c0

Browse files
committed
p2p: remove torv2 from CNetAddr::ToStringIP()
1 parent 3d39042 commit 5f9d3c0

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

src/netaddress.cpp

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -603,24 +603,13 @@ std::string CNetAddr::ToStringIP() const
603603
return IPv6ToString(m_addr, m_scope_id);
604604
}
605605
case NET_ONION:
606-
switch (m_addr.size()) {
607-
case ADDR_TORV2_SIZE:
608-
return EncodeBase32(m_addr) + ".onion";
609-
case ADDR_TORV3_SIZE: {
610-
611-
uint8_t checksum[torv3::CHECKSUM_LEN];
612-
torv3::Checksum(m_addr, checksum);
613-
614-
// TORv3 onion_address = base32(PUBKEY | CHECKSUM | VERSION) + ".onion"
615-
prevector<torv3::TOTAL_LEN, uint8_t> address{m_addr.begin(), m_addr.end()};
616-
address.insert(address.end(), checksum, checksum + torv3::CHECKSUM_LEN);
617-
address.insert(address.end(), torv3::VERSION, torv3::VERSION + sizeof(torv3::VERSION));
618-
619-
return EncodeBase32(address) + ".onion";
620-
}
621-
default:
622-
assert(false);
623-
}
606+
uint8_t checksum[torv3::CHECKSUM_LEN];
607+
torv3::Checksum(m_addr, checksum);
608+
// TORv3 onion_address = base32(PUBKEY | CHECKSUM | VERSION) + ".onion"
609+
prevector<torv3::TOTAL_LEN, uint8_t> address{m_addr.begin(), m_addr.end()};
610+
address.insert(address.end(), checksum, checksum + torv3::CHECKSUM_LEN);
611+
address.insert(address.end(), torv3::VERSION, torv3::VERSION + sizeof(torv3::VERSION));
612+
return EncodeBase32(address) + ".onion";
624613
case NET_I2P:
625614
return EncodeBase32(m_addr, false /* don't pad with = */) + ".b32.i2p";
626615
case NET_CJDNS:

0 commit comments

Comments
 (0)