diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-02-05 13:36:13 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-02-05 13:59:42 +0100 |
| commit | adea5e1b54cf5155b56bffe08af16538d5789c38 (patch) | |
| tree | 1be3497767896407fa208c24ce3bde6423708cc6 /src/net_permissions.cpp | |
| parent | bd5c4c69716e4236d2959bd733a2170afbc715f6 (diff) | |
| parent | c86bc144081f960347232546f7d22deb65d27deb (diff) | |
Merge #18023: Fix some asmap issues
c86bc144081f960347232546f7d22deb65d27deb Make asmap Interpret tolerant of malicious map data (Pieter Wuille)
38c2395d7a905c87dc4630031849fd8e403e61bf Use ASNs for mapped IPv4 addresses correctly (Pieter Wuille)
6f8c93731203c111f86c39eaf2102f9a825d1706 Mark asmap const in statistics code (Pieter Wuille)
d58bcdc4b569a667b6974c3547b7ff6f665afce9 Avoid asmap copies in initialization (Pieter Wuille)
Pull request description:
Here are a few things to improve in the asmap implementation. The first two commits are just code improvements. The last one is a bugfix (the exsting code wouldn't correctly apply ASN lookups to mapped/embedded IPv4 addresses).
ACKs for top commit:
practicalswift:
ACK c86bc144081f960347232546f7d22deb65d27deb -- patch looks correct
naumenkogs:
utACK c86bc14
laanwj:
ACK c86bc144081f960347232546f7d22deb65d27deb
jonatack:
ACK c86bc144081f960347232546f7d22deb65d27deb code looks correct, built/ran tests, bitcoind with -asmap pointed to asmap/demo.map
Tree-SHA512: 1036f43152754d621bfbecfd3b7c7276e4670598fcaed42a3d275e51fa2cf3653e2c9e9cfa714f6c7719362541510e92171e076ac4169b55a0cc8908b2d514c0
Diffstat (limited to 'src/net_permissions.cpp')
0 files changed, 0 insertions, 0 deletions