Merge #9188: Make orphan parent fetching ask for witnesses.

sipa · sipa · commit ad826b3df9f7 · 2016-12-01T13:34:49.000-08:00
5b0150a Make orphan parent fetching ask for witnesses. (Gregory Maxwell)
diff --git a/src/main.cpp b/src/main.cpp
@@ -5690,8 +5690,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
             }
             if (!fRejectedParents) {
+                uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());
                 BOOST_FOREACH(const CTxIn& txin, tx.vin) {
-                    CInv _inv(MSG_TX, txin.prevout.hash);
+                    CInv _inv(MSG_TX | nFetchFlags, txin.prevout.hash);
                     pfrom->AddInventoryKnown(_inv);
                     if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);
                 }

Original file line number	Diff line number	Diff line change
`@@ -5690,8 +5690,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`5690`	`5690`	`}`
`5691`	`5691`	`}`
`5692`	`5692`	`if (!fRejectedParents) {`
	`5693`	`+ uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());`
`5693`	`5694`	`BOOST_FOREACH(const CTxIn& txin, tx.vin) {`
`5694`		`- CInv _inv(MSG_TX, txin.prevout.hash);`
	`5695`	`+ CInv _inv(MSG_TX \| nFetchFlags, txin.prevout.hash);`
`5695`	`5696`	`pfrom->AddInventoryKnown(_inv);`
`5696`	`5697`	`if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);`
`5697`	`5698`	`}`