From 883cea7dea3cedc9b45b6191f7d4e7be2d9a11ca Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Mon, 12 Oct 2020 14:20:28 -0700 Subject: [PATCH] Restore compatibility with old CSubNet serialization --- src/netaddress.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/netaddress.h b/src/netaddress.h index 3bcf6d35ca..aea0875511 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -468,7 +468,21 @@ class CSubNet friend bool operator!=(const CSubNet& a, const CSubNet& b) { return !(a == b); } friend bool operator<(const CSubNet& a, const CSubNet& b); - SERIALIZE_METHODS(CSubNet, obj) { READWRITE(obj.network, obj.netmask, obj.valid); } + SERIALIZE_METHODS(CSubNet, obj) + { + READWRITE(obj.network); + if (obj.network.IsIPv4()) { + // Before commit 102867c587f5f7954232fb8ed8e85cda78bb4d32, CSubNet used the last 4 bytes of netmask + // to store the relevant bytes for an IPv4 mask. For compatiblity reasons, keep doing so in + // serialized form. + unsigned char dummy[12] = {0}; + READWRITE(dummy); + READWRITE(MakeSpan(obj.netmask).first(4)); + } else { + READWRITE(obj.netmask); + } + READWRITE(obj.valid); + } }; /** A combination of a network address (CNetAddr) and a (TCP) port */