Skip to content

Commit 5edef20

Browse files
author
MarcoFalke
committed
Merge bitcoin#19797: net: Remove old check for 3-byte shifted IP addresses from pre-0.2.9 nodes
7b6d0f1 Remove old check for 3-byte shifted IP addresses from pre-0.2.9 node messages (Raúl Martínez (RME)) Pull request description: The change removes an old check for IPv6 addresses in range ::ff:ff00:0:0:0/72 that were created due to a bug in size field of addr messages for 0.2.8 nodes and before. This check is no longer needed as they are no more pre 0.2.9 nodes on the network (as per bitnodes network snapshot). Credits for discovering this go to sipa in bitcoin#19628 (comment) Thanks for the attention! ACKs for top commit: sipa: utACK 7b6d0f1 vasild: ACK 7b6d0f1 Tree-SHA512: c5fab59dda2acafe143f607a4c5b636a54ac76fba651cad1ad1b09c94e88ab39503a31c2244c8f2664da68456c2a870c601d8894139c55cde9ece8161913ed2e
2 parents 9632b7e + 7b6d0f1 commit 5edef20

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/netaddress.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -270,17 +270,6 @@ bool CNetAddr::IsLocal() const
270270
*/
271271
bool CNetAddr::IsValid() const
272272
{
273-
// Cleanup 3-byte shifted addresses caused by garbage in size field
274-
// of addr messages from versions before 0.2.9 checksum.
275-
// Two consecutive addr messages look like this:
276-
// header20 vectorlen3 addr26 addr26 addr26 header20 vectorlen3 addr26 addr26 addr26...
277-
// so if the first length field is garbled, it reads the second batch
278-
// of addr misaligned by 3 bytes.
279-
if (IsIPv6() && memcmp(m_addr.data(), IPV4_IN_IPV6_PREFIX.data() + 3,
280-
sizeof(IPV4_IN_IPV6_PREFIX) - 3) == 0) {
281-
return false;
282-
}
283-
284273
// unspecified IPv6 address (::/128)
285274
unsigned char ipNone6[16] = {};
286275
if (IsIPv6() && memcmp(m_addr.data(), ipNone6, sizeof(ipNone6)) == 0) {

0 commit comments

Comments
 (0)