diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-07-20 13:53:25 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-07-20 13:53:25 +0200 |
commit | b1bec02ce51301a59185fd856c7d85208cbcc422 (patch) | |
tree | a312b84b85877a2bb99f1e8c690ffc69187d5229 /src/daemon/rpc_command_executor.cpp | |
parent | Merge pull request #899 (diff) | |
parent | daemon: fix ban seconds being misinterpreted as absolute (diff) | |
download | monero-b1bec02ce51301a59185fd856c7d85208cbcc422.tar.xz |
Merge pull request #900
78cc10f daemon: fix ban seconds being misinterpreted as absolute (moneromooo-monero)
34ecfdb rpc: fix get_bans and set_bans RPC names, they were missing a _ (moneromooo-monero)
Diffstat (limited to 'src/daemon/rpc_command_executor.cpp')
-rw-r--r-- | src/daemon/rpc_command_executor.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index ae9492111..0a0fc793d 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -1123,11 +1123,9 @@ bool t_rpc_command_executor::print_bans() } } - time_t now = time(nullptr); for (auto i = res.bans.begin(); i != res.bans.end(); ++i) { - time_t seconds = i->seconds - now; - tools::msg_writer() << epee::string_tools::get_ip_string_from_int32(i->ip) << " banned for " << seconds << " seconds"; + tools::msg_writer() << epee::string_tools::get_ip_string_from_int32(i->ip) << " banned for " << i->seconds << " seconds"; } return true; |