PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-02 06:54:15 +00:00
Code Issues Releases Activity

select really other remote lease

Browse Source
This commit is contained in:
orignal 2015-03-23 22:18:30 -04:00
parent 7f91c9e63e
commit 6125288e95
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Streaming.cpp
View File

@ -608,17 +608,16 @@ namespace stream
LogPrint (eLogInfo, "All leases are expired. Trying to request"); LogPrint (eLogInfo, "All leases are expired. Trying to request");
m_RemoteLeaseSet = nullptr; m_RemoteLeaseSet = nullptr;
m_LocalDestination.GetOwner ().RequestDestination (m_RemoteIdentity.GetIdentHash (), m_LocalDestination.GetOwner ().RequestDestination (m_RemoteIdentity.GetIdentHash (),
std::bind (&Stream::HandleLeaseSetRequestComplete, shared_from_this (), std::bind (&Stream::HandleLeaseSetRequestComplete, shared_from_this (), std::placeholders::_1));
std::placeholders::_1, packets));
} }
} }
void Stream::HandleLeaseSetRequestComplete (bool success, std::vector<Packet *> packets) void Stream::HandleLeaseSetRequestComplete (bool success)
{ {
if (success) if (success)
{ {
LogPrint (eLogInfo, "New LeaseSet found. Sending packets"); LogPrint (eLogInfo, "New LeaseSet found");
SendPackets (packets); UpdateCurrentRemoteLease ();
} }
} }
@ -717,7 +716,10 @@ namespace stream
if (!leases.empty ()) if (!leases.empty ())
{ {
uint32_t i = i2p::context.GetRandomNumberGenerator ().GenerateWord32 (0, leases.size () - 1); uint32_t i = i2p::context.GetRandomNumberGenerator ().GenerateWord32 (0, leases.size () - 1);
m_CurrentRemoteLease = leases[i]; if (m_CurrentRemoteLease.endDate && leases[i].tunnelID == m_CurrentRemoteLease.tunnelID)
// make sure we don't select previous
i = (i + 1) % leases.size (); // if so, pick next
m_CurrentRemoteLease = leases[i];
} }
else else
{ {

2
Streaming.h
View File

@ -147,7 +147,7 @@ namespace stream
template<typename Buffer, typename ReceiveHandler> template<typename Buffer, typename ReceiveHandler>
void HandleReceiveTimer (const boost::system::error_code& ecode, const Buffer& buffer, ReceiveHandler handler); void HandleReceiveTimer (const boost::system::error_code& ecode, const Buffer& buffer, ReceiveHandler handler);
void HandleLeaseSetRequestComplete (bool success, std::vector<Packet *> packets); void HandleLeaseSetRequestComplete (bool success);
void ScheduleResend (); void ScheduleResend ();
void HandleResendTimer (const boost::system::error_code& ecode); void HandleResendTimer (const boost::system::error_code& ecode);