Make GetFetchFlags always request witness objects from witness peers

TheBlueMatt · sipa · commit 06128da75137 · 2016-10-04T18:24:10.000+02:00
This fixes a bug where we might (in exceedingly rare circumstances)
accidentally ban a node for sending us the first (potentially few)
segwit blocks in non-segwit mode.
diff --git a/src/main.cpp b/src/main.cpp
@@ -4922,7 +4922,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
 
 uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) {
     uint32_t nFetchFlags = 0;
-    if (IsWitnessEnabled(pprev, chainparams) && State(pfrom->GetId())->fHaveWitness) {
+    if ((pfrom->GetLocalServices() & NODE_WITNESS) && State(pfrom->GetId())->fHaveWitness) {
         nFetchFlags |= MSG_WITNESS_FLAG;
     }
     return nFetchFlags;

Original file line number	Diff line number	Diff line change
`@@ -4922,7 +4922,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam`
`4922`	`4922`
`4923`	`4923`	`uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) {`
`4924`	`4924`	`uint32_t nFetchFlags = 0;`
`4925`		`- if (IsWitnessEnabled(pprev, chainparams) && State(pfrom->GetId())->fHaveWitness) {`
	`4925`	`+ if ((pfrom->GetLocalServices() & NODE_WITNESS) && State(pfrom->GetId())->fHaveWitness) {`
`4926`	`4926`	`nFetchFlags \|= MSG_WITNESS_FLAG;`
`4927`	`4927`	`}`
`4928`	`4928`	`return nFetchFlags;`