Mask the CInv types in CInv::operator<

CodeShark · CodeShark · commit e2ee91b6b171 · 2016-01-13T17:50:44.000-08:00
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -165,7 +165,9 @@ CInv::CInv(const std::string& strType, const uint256& hashIn)
 
 bool operator<(const CInv& a, const CInv& b)
 {
-    return (a.type < b.type || (a.type == b.type && a.hash < b.hash));
+    int aType = a.type & MSG_TYPE_MASK;
+    int bType = b.type & MSG_TYPE_MASK;
+    return (aType < bType || (aType == bType && a.hash < b.hash));
 }
 
 bool CInv::IsKnownType() const

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,9 @@ CInv::CInv(const std::string& strType, const uint256& hashIn)`
`165`	`165`
`166`	`166`	`bool operator<(const CInv& a, const CInv& b)`
`167`	`167`	`{`
`168`		`- return (a.type < b.type \|\| (a.type == b.type && a.hash < b.hash));`
	`168`	`+ int aType = a.type & MSG_TYPE_MASK;`
	`169`	`+ int bType = b.type & MSG_TYPE_MASK;`
	`170`	`+ return (aType < bType \|\| (aType == bType && a.hash < b.hash));`
`169`	`171`	`}`
`170`	`172`
`171`	`173`	`bool CInv::IsKnownType() const`