Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-29 04:07:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'PurpleI2P-openssl' into ui

Browse source
This commit is contained in:
dr|z3d 2021-08-12 00:25:51 +00:00
commit cbe033146a
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/webconsole/style.css
View file

@ -21,7 +21,6 @@ a.button {
-moz-appearance: button; -moz-appearance: button;
appearance: button; appearance: button;
text-decoration: none; text-decoration: none;
color: initial;
padding: 0 5px; padding: 0 5px;
border: 1px solid #894C84; border: 1px solid #894C84;
} }
@ -198,7 +197,6 @@ textarea {
-moz-appearance: button; -moz-appearance: button;
appearance: button; appearance: button;
text-decoration: none; text-decoration: none;
color: initial;
margin-top: 10px; margin-top: 10px;
padding: 6px; padding: 6px;
border: 1px solid #894c84; border: 1px solid #894c84;

16
libi2pd/Streaming.cpp
View file

@ -104,6 +104,7 @@ namespace stream
void Stream::Terminate (bool deleteFromDestination) // shoudl be called from StreamingDestination::Stop only void Stream::Terminate (bool deleteFromDestination) // shoudl be called from StreamingDestination::Stop only
{ {
m_Status = eStreamStatusTerminated;
m_AckSendTimer.cancel (); m_AckSendTimer.cancel ();
m_ReceiveTimer.cancel (); m_ReceiveTimer.cancel ();
m_ResendTimer.cancel (); m_ResendTimer.cancel ();
@ -857,12 +858,15 @@ namespace stream
void Stream::ScheduleResend () void Stream::ScheduleResend ()
{ {
m_ResendTimer.cancel (); if (m_Status != eStreamStatusTerminated)
// check for invalid value {
if (m_RTO <= 0) m_RTO = INITIAL_RTO; m_ResendTimer.cancel ();
m_ResendTimer.expires_from_now (boost::posix_time::milliseconds(m_RTO)); // check for invalid value
m_ResendTimer.async_wait (std::bind (&Stream::HandleResendTimer, if (m_RTO <= 0) m_RTO = INITIAL_RTO;
shared_from_this (), std::placeholders::_1)); m_ResendTimer.expires_from_now (boost::posix_time::milliseconds(m_RTO));
m_ResendTimer.async_wait (std::bind (&Stream::HandleResendTimer,
shared_from_this (), std::placeholders::_1));
}
} }
void Stream::HandleResendTimer (const boost::system::error_code& ecode) void Stream::HandleResendTimer (const boost::system::error_code& ecode)

3
libi2pd/Streaming.h
View file

@ -152,7 +152,8 @@ namespace stream
eStreamStatusOpen, eStreamStatusOpen,
eStreamStatusReset, eStreamStatusReset,
eStreamStatusClosing, eStreamStatusClosing,
eStreamStatusClosed eStreamStatusClosed,
eStreamStatusTerminated
}; };
class StreamingDestination; class StreamingDestination;

4
libi2pd_client/SAM.cpp
View file

@ -1207,7 +1207,11 @@ namespace client
void SAMSingleSession::StopLocalDestination () void SAMSingleSession::StopLocalDestination ()
{ {
localDestination->Release (); localDestination->Release ();
// stop accepting new streams
localDestination->StopAcceptingStreams (); localDestination->StopAcceptingStreams ();
// terminate existing streams
auto s = localDestination->GetStreamingDestination (); // TODO: take care about datagrams
if (s) s->Stop ();
} }
void SAMMasterSession::Close () void SAMMasterSession::Close ()