Net: Proper CService deserialization + GetIn6Addr return false if addr isn't an IPv6 addr

furszy · furszy · commit ed5abe1c6400 · 2021-08-10T09:43:20.000-03:00
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -318,7 +318,7 @@ bool operator==(const CNetAddr& a, const CNetAddr& b)
 
 bool operator!=(const CNetAddr& a, const CNetAddr& b)
 {
-    return (memcmp(a.ip, b.ip, 16) != 0);
+    return a.m_net != b.m_net || (memcmp(a.ip, b.ip, 16) != 0);
 }
 
 bool operator<(const CNetAddr& a, const CNetAddr& b)
@@ -334,8 +334,21 @@ bool CNetAddr::GetInAddr(struct in_addr* pipv4Addr) const
     return true;
 }
 
+/**
+ * Try to get our IPv6 address.
+ *
+ * @param[out] pipv6Addr The in6_addr struct to which to copy.
+ *
+ * @returns Whether or not the operation was successful, in particular, whether
+ *          or not our address was an IPv6 address.
+ *
+ * @see CNetAddr::IsIPv6()
+ */
 bool CNetAddr::GetIn6Addr(struct in6_addr* pipv6Addr) const
 {
+    if (!IsIPv6()) {
+        return false;
+    }
     memcpy(pipv6Addr, ip, 16);
     return true;
 }
diff --git a/src/netaddress.h b/src/netaddress.h
@@ -223,7 +223,11 @@ class CService : public CNetAddr
     CService(const struct in6_addr& ipv6Addr, uint16_t port);
     CService(const struct sockaddr_in6& addr);
 
-    SERIALIZE_METHODS(CService, obj) { READWRITE(obj.ip, Using<BigEndianFormatter<2>>(obj.port)); }
+    SERIALIZE_METHODS(CService, obj)
+    {
+        READWRITEAS(CNetAddr, obj);
+        READWRITE(Using<BigEndianFormatter<2>>(obj.port));
+    }
 };
 
 #endif // PIVX_NETADDRESS_H

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ bool operator==(const CNetAddr& a, const CNetAddr& b)`
`318`	`318`
`319`	`319`	`bool operator!=(const CNetAddr& a, const CNetAddr& b)`
`320`	`320`	`{`
`321`		`- return (memcmp(a.ip, b.ip, 16) != 0);`
	`321`	`+ return a.m_net != b.m_net \|\| (memcmp(a.ip, b.ip, 16) != 0);`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`bool operator<(const CNetAddr& a, const CNetAddr& b)`
`@@ -334,8 +334,21 @@ bool CNetAddr::GetInAddr(struct in_addr* pipv4Addr) const`
`334`	`334`	`return true;`
`335`	`335`	`}`
`336`	`336`
	`337`	`+/**`
	`338`	`+ * Try to get our IPv6 address.`
	`339`	`+ *`
	`340`	`+ * @param[out] pipv6Addr The in6_addr struct to which to copy.`
	`341`	`+ *`
	`342`	`+ * @returns Whether or not the operation was successful, in particular, whether`
	`343`	`+ * or not our address was an IPv6 address.`
	`344`	`+ *`
	`345`	`+ * @see CNetAddr::IsIPv6()`
	`346`	`+ */`
`337`	`347`	`bool CNetAddr::GetIn6Addr(struct in6_addr* pipv6Addr) const`
`338`	`348`	`{`
	`349`	`+ if (!IsIPv6()) {`
	`350`	`+ return false;`
	`351`	`+ }`
`339`	`352`	`memcpy(pipv6Addr, ip, 16);`
`340`	`353`	`return true;`
`341`	`354`	`}`