1
0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
This commit is contained in:
orignal 2018-01-26 14:33:06 -05:00
parent e1527dc137
commit 8c2de4973c
2 changed files with 4 additions and 5 deletions

View File

@ -135,7 +135,7 @@ namespace data
}
}
uint64_t LeaseSet::ExtractTimestamp (const uint8_t * buf, size_t len, uint8_t& num) const
uint64_t LeaseSet::ExtractTimestamp (const uint8_t * buf, size_t len) const
{
if (!m_Identity) return 0;
size_t size = m_Identity->GetFullLen ();
@ -143,7 +143,7 @@ namespace data
size += 256; // encryption key
size += m_Identity->GetSigningPublicKeyLen (); // unused signing key
if (size > len) return 0;
num = buf[size];
uint8_t num = buf[size];
size++; // num
if (size + num*LEASE_SIZE > len) return 0;
uint64_t timestamp= 0 ;
@ -160,8 +160,7 @@ namespace data
bool LeaseSet::IsNewer (const uint8_t * buf, size_t len) const
{
uint8_t num1, num2;
return ExtractTimestamp (buf, len, num2) > ExtractTimestamp (m_Buffer, m_BufferLen, num1) || num2 < num1; // some lease might be deleted
return ExtractTimestamp (buf, len) > ExtractTimestamp (m_Buffer, m_BufferLen);
}
bool LeaseSet::ExpiresSoon(const uint64_t dlt, const uint64_t fudge) const

View File

@ -82,7 +82,7 @@ namespace data
private:
void ReadFromBuffer (bool readIdentity = true, bool verifySignature = true);
uint64_t ExtractTimestamp (const uint8_t * buf, size_t len, uint8_t& num) const; // returns max expiration time, num is number of leases
uint64_t ExtractTimestamp (const uint8_t * buf, size_t len) const; // returns max expiration time
private: