Fixed CInv::IsKnownType()

sipa · Jan 11, 2016 · c602f23 · c602f23
1 parent 0f9efb0
commit c602f23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -184,7 +184,8 @@ bool operator<(const CInv& a, const CInv& b)
 
 bool CInv::IsKnownType() const
 {
-    return (type >= 1 && type < (int)ARRAYLEN(ppszTypeName));
+    int masked = type & MSG_TYPE_MASK;
+    return (masked >= 1 && masked <= MSG_TYPE_MAX);
 }
 
 const char* CInv::GetCommand() const

diff --git a/src/protocol.h b/src/protocol.h
@@ -315,13 +315,17 @@ class CInv
     uint256 hash;
 };
 
+const uint32_t MSG_WITNESS_FLAG = 1 << 30;
+const uint32_t MSG_TYPE_MASK    = 0xffffffff >> 2;
 enum {
     MSG_TX = 1,
     MSG_BLOCK,
     // The following can only occur in getdata. Invs always use TX or BLOCK.
     MSG_FILTERED_BLOCK,
-    MSG_WITNESS_BLOCK = MSG_BLOCK | 0x40000000,
-    MSG_WITNESS_TX = MSG_TX | 0x40000000,
+    MSG_WITNESS_BLOCK = MSG_BLOCK | MSG_WITNESS_FLAG,
+    MSG_WITNESS_TX = MSG_TX | MSG_WITNESS_FLAG,
 };
 
+const int MSG_TYPE_MAX = MSG_FILTERED_BLOCK;
+
 #endif // BITCOIN_PROTOCOL_H