Merge #8102: Bugfix: use global ::fRelayTxes instead of CNode in version send

sipa · sipa · commit 425278d17bd0 · 2016-05-26T20:15:15.000+02:00
52b02ec Use global ::fRelayTxes instead of CNode one (Pieter Wuille)
diff --git a/src/net.cpp b/src/net.cpp
@@ -471,7 +471,7 @@ void CNode::PushVersion()
     else
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);
     PushMessage(NetMsgType::VERSION, PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
-                nLocalHostNonce, strSubVersion, nBestHeight, fRelayTxes);
+                nLocalHostNonce, strSubVersion, nBestHeight, ::fRelayTxes);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ void CNode::PushVersion()`
`471`	`471`	`else`
`472`	`472`	`LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);`
`473`	`473`	`PushMessage(NetMsgType::VERSION, PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,`
`474`		`- nLocalHostNonce, strSubVersion, nBestHeight, fRelayTxes);`
	`474`	`+ nLocalHostNonce, strSubVersion, nBestHeight, ::fRelayTxes);`
`475`	`475`	`}`
`476`	`476`
`477`	`477`