mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-01-22 21:37:17 +01:00
calculate min pacing time. Return wrongly removed line
This commit is contained in:
parent
0428b5ece1
commit
d843502832
|
@ -180,6 +180,7 @@ namespace client
|
|||
i2p::tunnel::tunnels.StopTunnelPool (m_Pool);
|
||||
}
|
||||
SaveTags ();
|
||||
m_Service.stop (); // make sure we don't process more messages after this point. TODO: implement it better
|
||||
CleanUp (); // GarlicDestination
|
||||
}
|
||||
|
||||
|
|
|
@ -75,13 +75,15 @@ namespace stream
|
|||
m_RemoteLeaseSet (remote), m_ReceiveTimer (m_Service), m_SendTimer (m_Service), m_ResendTimer (m_Service),
|
||||
m_AckSendTimer (m_Service), m_NumSentBytes (0), m_NumReceivedBytes (0), m_Port (port),
|
||||
m_RTT (INITIAL_RTT), m_WindowSize (INITIAL_WINDOW_SIZE), m_RTO (INITIAL_RTO),
|
||||
m_AckDelay (local.GetOwner ()->GetStreamingAckDelay ()),
|
||||
m_OutboundSpeed (local.GetOwner ()->GetStreamingOutboundSpeed ()), m_PrevRTTSample (INITIAL_RTT),
|
||||
m_PrevRTT (INITIAL_RTT), m_Jitter (0),
|
||||
m_AckDelay (local.GetOwner ()->GetStreamingAckDelay ()), m_PrevRTTSample (INITIAL_RTT),
|
||||
m_PrevRTT (INITIAL_RTT), m_Jitter (0), m_MinPacingTime (0),
|
||||
m_PacingTime (INITIAL_PACING_TIME), m_NumResendAttempts (0), m_MTU (STREAMING_MTU)
|
||||
{
|
||||
RAND_bytes ((uint8_t *)&m_RecvStreamID, 4);
|
||||
m_RemoteIdentity = remote->GetIdentity ();
|
||||
auto outboundSpeed = local.GetOwner ()->GetStreamingOutboundSpeed ();
|
||||
if (outboundSpeed)
|
||||
m_MinPacingTime = (1000000LL*STREAMING_MTU)/outboundSpeed;
|
||||
}
|
||||
|
||||
Stream::Stream (boost::asio::io_service& service, StreamingDestination& local):
|
||||
|
@ -92,11 +94,13 @@ namespace stream
|
|||
m_ReceiveTimer (m_Service), m_SendTimer (m_Service), m_ResendTimer (m_Service), m_AckSendTimer (m_Service),
|
||||
m_NumSentBytes (0), m_NumReceivedBytes (0), m_Port (0), m_RTT (INITIAL_RTT),
|
||||
m_WindowSize (INITIAL_WINDOW_SIZE), m_RTO (INITIAL_RTO), m_AckDelay (local.GetOwner ()->GetStreamingAckDelay ()),
|
||||
m_OutboundSpeed (local.GetOwner ()->GetStreamingOutboundSpeed ()),
|
||||
m_PrevRTTSample (INITIAL_RTT), m_PrevRTT (INITIAL_RTT), m_Jitter (0),
|
||||
m_PrevRTTSample (INITIAL_RTT), m_PrevRTT (INITIAL_RTT), m_Jitter (0), m_MinPacingTime (0),
|
||||
m_PacingTime (INITIAL_PACING_TIME), m_NumResendAttempts (0), m_MTU (STREAMING_MTU)
|
||||
{
|
||||
RAND_bytes ((uint8_t *)&m_RecvStreamID, 4);
|
||||
auto outboundSpeed = local.GetOwner ()->GetStreamingOutboundSpeed ();
|
||||
if (outboundSpeed)
|
||||
m_MinPacingTime = (1000000LL*STREAMING_MTU)/outboundSpeed;
|
||||
}
|
||||
|
||||
Stream::~Stream ()
|
||||
|
@ -1301,11 +1305,8 @@ namespace stream
|
|||
void Stream::UpdatePacingTime ()
|
||||
{
|
||||
m_PacingTime = std::round (m_RTT*1000/m_WindowSize);
|
||||
if (m_OutboundSpeed)
|
||||
{
|
||||
auto minTime = (1000000LL*STREAMING_MTU)/m_OutboundSpeed;
|
||||
if (m_PacingTime < minTime) m_PacingTime = minTime;
|
||||
}
|
||||
if (m_MinPacingTime && m_PacingTime < m_MinPacingTime)
|
||||
m_PacingTime = m_MinPacingTime;
|
||||
}
|
||||
|
||||
StreamingDestination::StreamingDestination (std::shared_ptr<i2p::client::ClientDestination> owner, uint16_t localPort, bool gzip):
|
||||
|
|
|
@ -271,7 +271,7 @@ namespace stream
|
|||
SendBufferQueue m_SendBuffer;
|
||||
double m_RTT;
|
||||
int m_WindowSize, m_RTO, m_AckDelay, m_OutboundSpeed, m_PrevRTTSample, m_PrevRTT, m_Jitter;
|
||||
uint64_t m_PacingTime;
|
||||
uint64_t m_MinPacingTime, m_PacingTime;
|
||||
int m_NumResendAttempts;
|
||||
size_t m_MTU;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue