Allow MSG_FILTERED_BLOCK and MSG_FILTERED_WITNESS_BLOCK in getdata.

sipa · Jan 14, 2016 · 7429425 · 7429425
1 parent caf4b5f
commit 7429425
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -179,8 +179,9 @@ const char* CInv::GetCommand() const
     int masked = type & MSG_TYPE_MASK;
     switch (masked)
     {
-    case MSG_TX:    return NetMsgType::TX;
-    case MSG_BLOCK: return NetMsgType::BLOCK;
+    case MSG_TX:                return NetMsgType::TX;
+    case MSG_BLOCK:             return NetMsgType::BLOCK;
+    case MSG_FILTERED_BLOCK:    return NetMsgType::MERKLEBLOCK;
     default:
         throw std::out_of_range(strprintf("CInv::GetCommand(): type=%d unknown type", type));
     }

diff --git a/src/protocol.h b/src/protocol.h
@@ -291,9 +291,9 @@ enum GetDataMsg
 {
     MSG_TX = 1,
     MSG_BLOCK,
-    MSG_TYPE_MAX = MSG_BLOCK,
     // The following can only occur in getdata. Invs always use TX or BLOCK.
     MSG_FILTERED_BLOCK,
+    MSG_TYPE_MAX = MSG_FILTERED_BLOCK,
     UNDEFINED,
 };