aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/core_rpc_server.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-01-14 13:01:21 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-01-14 13:07:05 +0000
commit81c384e408edef2eeced88ea1cf976720b6fed32 (patch)
tree878d7c3bdd4410f99aa0eb4167d7d82a7ba7e816 /src/rpc/core_rpc_server.cpp
parentMerge pull request #1562 (diff)
downloadmonero-81c384e408edef2eeced88ea1cf976720b6fed32.tar.xz
fix do_not_relay not preventing relaying on a timer
Also print its value when printing pool
Diffstat (limited to 'src/rpc/core_rpc_server.cpp')
-rw-r--r--src/rpc/core_rpc_server.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index ddf892cae..cfa1b3b4b 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -528,7 +528,7 @@ namespace cryptonote
cryptonote_connection_context fake_context = AUTO_VAL_INIT(fake_context);
tx_verification_context tvc = AUTO_VAL_INIT(tvc);
- if(!m_core.handle_incoming_tx(tx_blob, tvc, false, false) || tvc.m_verifivation_failed)
+ if(!m_core.handle_incoming_tx(tx_blob, tvc, false, false, req.do_not_relay) || tvc.m_verifivation_failed)
{
if (tvc.m_verifivation_failed)
{
@@ -558,7 +558,7 @@ namespace cryptonote
return true;
}
- if(!tvc.m_should_be_relayed || req.do_not_relay)
+ if(!tvc.m_should_be_relayed)
{
LOG_PRINT_L0("[on_send_raw_tx]: tx accepted, but not relayed");
res.reason = "Not relayed";