diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-05-26 14:52:05 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-05-26 15:02:16 +0200 |
| commit | c028c7b7557da2baff7af8840108e8be4db8e0c6 (patch) | |
| tree | 89d5448cf5ddc26fa2232e8aa68714a722868fc5 /src/net.cpp | |
| parent | 6fc6325f77ee1ca53f9180140ddcaf7f2d72d9d3 (diff) | |
| parent | 1ab1dc3140ff521df42f1f396a49a50e91bf2740 (diff) | |
| download | bitcoin-c028c7b7557da2baff7af8840108e8be4db8e0c6.tar.xz | |
Merge #8049: Expose information on whether transaction relay is enabled in `getnetwork`
1ab1dc3 rpc: Add `relaytxes` flag to `getnetworkinfo` (Wladimir J. van der Laan)
581ddff net: Add fRelayTxes flag (Wladimir J. van der Laan)
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp index bbd23d292a..44cdfd2ae2 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -76,6 +76,7 @@ const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*"; bool fDiscover = true; bool fListen = true; uint64_t nLocalServices = NODE_NETWORK; +bool fRelayTxes = true; CCriticalSection cs_mapLocalHost; std::map<CNetAddr, LocalServiceInfo> mapLocalHost; static bool vfLimited[NET_MAX] = {}; @@ -470,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, !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)); + nLocalHostNonce, strSubVersion, nBestHeight, fRelayTxes); } |