Merge branch 'master' of github.com:majestrate/i2pd

This commit is contained in:
Jeff Becker committed 2016-12-17 07:35:24 -05:00
commit 88d1aab7a3
15 files changed
+133 -72

No files matched your search

+1 -3
View File
@@ -243,9 +243,6 @@ namespace datagram
if (sz) {
auto idx = rand() % sz;
m_CurrentRemoteLease = ls[idx];
} else {
// no more leases, bail
LogPrint(eLogWarning, "DatagramSession: no more valid remote leases to ", m_RemoteIdent.ToBase32());
}
} else {
// no remote lease set?
@@ -293,6 +290,7 @@ namespace datagram
void DatagramSession::HandleLeaseSetUpdated(std::shared_ptr<i2p::data::LeaseSet> ls)
{
if(!ls) return;
// only update lease set if found and newer than previous lease set
uint64_t oldExpire = 0;
if(m_RemoteLeaseSet) oldExpire = m_RemoteLeaseSet->GetExpirationTime();