Merge pull request #6611

dc1a053 rpc: fix comparison of seconds vs microseconds (moneromooo-monero)
This commit is contained in:
luigi1111 2020-07-08 17:21:31 -05:00
commit 0376195015
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 1 additions and 1 deletions

View File

@ -366,7 +366,7 @@ namespace cryptonote
for (std::unordered_map<crypto::public_key, client_info>::iterator i = m_client_info.begin(); i != m_client_info.end(); ) for (std::unordered_map<crypto::public_key, client_info>::iterator i = m_client_info.begin(); i != m_client_info.end(); )
{ {
std::unordered_map<crypto::public_key, client_info>::iterator j = i++; std::unordered_map<crypto::public_key, client_info>::iterator j = i++;
const time_t t = std::max(j->second.last_request_timestamp, j->second.update_time); const time_t t = std::max(j->second.last_request_timestamp / 1000000, j->second.update_time);
const bool erase = t < ((j->second.credits == 0) ? threshold0 : threshold); const bool erase = t < ((j->second.credits == 0) ? threshold0 : threshold);
if (erase) if (erase)
{ {