From 419ef3b7cc04e3ab26252d7024da847dfd5ab1a3 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Mon, 16 Dec 2019 19:42:18 -0800 Subject: [PATCH 1/2] CNetAddr: fix IsRFC2544 comment --- src/netaddress.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/netaddress.h b/src/netaddress.h index fbb15533384..32f4476facd 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -54,7 +54,7 @@ class CNetAddr bool IsIPv4() const; // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0) bool IsIPv6() const; // IPv6 address (not mapped IPv4, not Tor) bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12) - bool IsRFC2544() const; // IPv4 inter-network communications (192.18.0.0/15) + bool IsRFC2544() const; // IPv4 inter-network communications (198.18.0.0/15) bool IsRFC6598() const; // IPv4 ISP-level NAT (100.64.0.0/10) bool IsRFC5737() const; // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24) bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32) From 529d332fbfe633d60845a97e1a06f552bd63d0d4 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Mon, 16 Dec 2019 19:43:15 -0800 Subject: [PATCH 2/2] test: add IsRFC2544 tests --- src/test/netbase_tests.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 78c11ff2022..481dedc3568 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -54,6 +54,8 @@ BOOST_AUTO_TEST_CASE(netbase_properties) BOOST_CHECK(ResolveIP("10.0.0.1").IsRFC1918()); BOOST_CHECK(ResolveIP("192.168.1.1").IsRFC1918()); BOOST_CHECK(ResolveIP("172.31.255.255").IsRFC1918()); + BOOST_CHECK(ResolveIP("198.18.0.0").IsRFC2544()); + BOOST_CHECK(ResolveIP("198.19.255.255").IsRFC2544()); BOOST_CHECK(ResolveIP("2001:0DB8::").IsRFC3849()); BOOST_CHECK(ResolveIP("169.254.1.1").IsRFC3927()); BOOST_CHECK(ResolveIP("2002::1").IsRFC3964());