highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 22:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

p2p: remove torv2/ADDR_TORV2_SIZE from SetTor()

Browse Source
This commit is contained in:
Jon Atack
2021-05-24 18:00:08 +02:00
parent 0f1c58ae87
commit f8e94002fc
4 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/netaddress.cpp
View File

@@ -254,12 +254,7 @@ bool CNetAddr::SetTor(const std::string& addr)
return false;
}
switch (input.size()) {
case ADDR_TORV2_SIZE:
m_net = NET_ONION;
m_addr.assign(input.begin(), input.end());
return true;
case torv3::TOTAL_LEN: {
if (input.size() == torv3::TOTAL_LEN) {
Span<const uint8_t> input_pubkey{input.data(), ADDR_TORV3_SIZE};
Span<const uint8_t> input_checksum{input.data() + ADDR_TORV3_SIZE, torv3::CHECKSUM_LEN};
Span<const uint8_t> input_version{input.data() + ADDR_TORV3_SIZE + torv3::CHECKSUM_LEN, sizeof(torv3::VERSION)};
@@ -279,7 +274,6 @@ bool CNetAddr::SetTor(const std::string& addr)
m_addr.assign(input_pubkey.begin(), input_pubkey.end());
return true;
}
}
return false;
}