Skip to content

Commit

Permalink
net: change CNetAddr::ip to have flexible size
Browse files Browse the repository at this point in the history
Adaptation of btc@102867c587f5f7954232fb8ed8e85cda78bb4d32

Before this change `CNetAddr::ip` was a fixed-size array of 16 bytes,
not being able to store larger addresses (e.g. TORv3) and encoded
smaller ones as 16-byte IPv6 addresses.

Change its type to `prevector`, so that it can hold larger addresses and
do not disguise non-IPv6 addresses as IPv6. So the IPv4 address
`1.2.3.4` is now encoded as `01020304` instead of
`00000000000000000000FFFF01020304`.

Rename `CNetAddr::ip` to `CNetAddr::m_addr` because it is not an "IP" or
"IP address" (TOR addresses are not IP addresses).

In order to preserve backward compatibility with serialization (where
e.g. `1.2.3.4` is serialized as `00000000000000000000FFFF01020304`)
introduce `CNetAddr` dedicated legacy serialize/unserialize methods.

Adjust `CSubNet` accordingly. Still use `CSubNet::netmask[]` of fixed 16
bytes, but use the first 4 for IPv4 (not the last 4). Only allow
subnetting for IPv4 and IPv6.
  • Loading branch information
furszy committed Aug 10, 2021
1 parent 3337219 commit 08ad06d
Show file tree
Hide file tree
Showing 7 changed files with 475 additions and 191 deletions.
Loading

0 comments on commit 08ad06d

Please sign in to comment.