This is a followup to #20852 which allowed non-IP subnets, but some of them, e.g. torv3, cannot be serialized in 16 bytes (addrv1) and must use addrv2.
This PR changes the format of banlist.dat in such a way that old
versions (before this commit) will not be able to read a file written by
new versions (after this commit).
This is a followup to https://github.com/bitcoin/bitcoin/pull/20852
which allowed non-IP subnets, but some of them, e.g. torv3, cannot be
serialized in 16 bytes (addrv1) and must use addrv2.
This commit changes the format of `banlist.dat` in such a way that old
versions (before this commit) will not be able to read a file written by
new versions (after this commit).
If we would try to write a torv3 subnet in addrv1 format, it would
serialize as a dummy-all-0s IPv6 address and subsequently, when
deserialized will not result in the same subnet.
Change the `peer_discouragement` test to use `CNode` pointers so that
the nodes it uses can be added to `CConnman::vNodes` and cleaned up
properly. Make it use `CConnmanTest` instead of `CConnman`. This is
needed because we want to check `CNode::fDisconnect` and for this flag
to be flipped by `CConnman::DisconnectNode()` the node must be in
`CConnman::vNodes`.
Extend the test with one torv3 peer and check that it is discouraged and
disconnected as expected.
TODO:
CSubNet somewhere else in the code, other than in BanMan and if yes, then what are the implications for that other code.banlist.dat, e.g. #19825.222@@ -223,47 +223,84 @@ BOOST_AUTO_TEST_CASE(peer_discouragement)
223 {
224 const CChainParams& chainparams = Params();
225 auto banman = MakeUnique<BanMan>(GetDataDir() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
226- auto connman = MakeUnique<CConnman>(0x1337, 0x1337);
227+ auto connman = MakeUnique<CConnmanTest>(0x1337, 0x1337);
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
How does this maintain forward compatibility (new versions being able to read subnets written by old versions)?
I does not, but it should.
Labels
P2P