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

p2p: remove torv2 from CNetAddr::ToStringIP()

Browse Source
This commit is contained in:
Jon Atack 2021-05-27 18:35:55 +02:00
parent 3d39042144
commit 5f9d3c09b4
No known key found for this signature in database
GPG Key ID: 4F5721B3D0E3921D
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/netaddress.cpp
View File

@ -603,24 +603,13 @@ std::string CNetAddr::ToStringIP() const
return IPv6ToString(m_addr, m_scope_id); return IPv6ToString(m_addr, m_scope_id);
} }
case NET_ONION: case NET_ONION:
switch (m_addr.size()) { uint8_t checksum[torv3::CHECKSUM_LEN];
case ADDR_TORV2_SIZE: torv3::Checksum(m_addr, checksum);
return EncodeBase32(m_addr) + ".onion"; // TORv3 onion_address = base32(PUBKEY | CHECKSUM | VERSION) + ".onion"
case ADDR_TORV3_SIZE: { prevector<torv3::TOTAL_LEN, uint8_t> address{m_addr.begin(), m_addr.end()};
address.insert(address.end(), checksum, checksum + torv3::CHECKSUM_LEN);
uint8_t checksum[torv3::CHECKSUM_LEN]; address.insert(address.end(), torv3::VERSION, torv3::VERSION + sizeof(torv3::VERSION));
torv3::Checksum(m_addr, checksum); return EncodeBase32(address) + ".onion";
// TORv3 onion_address = base32(PUBKEY | CHECKSUM | VERSION) + ".onion"
prevector<torv3::TOTAL_LEN, uint8_t> address{m_addr.begin(), m_addr.end()};
address.insert(address.end(), checksum, checksum + torv3::CHECKSUM_LEN);
address.insert(address.end(), torv3::VERSION, torv3::VERSION + sizeof(torv3::VERSION));
return EncodeBase32(address) + ".onion";
}
default:
assert(false);
}
case NET_I2P: case NET_I2P:
return EncodeBase32(m_addr, false /* don't pad with = */) + ".b32.i2p"; return EncodeBase32(m_addr, false /* don't pad with = */) + ".b32.i2p";
case NET_CJDNS: case NET_CJDNS: