Merge remote-tracking branch 'purple/openssl' into merge_udp_tunnel

This commit is contained in:
Jeff Becker 2016-09-07 15:08:45 -04:00
commit b6b14f4957
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
8 changed files with 247 additions and 7 deletions

View file

@ -741,7 +741,15 @@ namespace stream
return;
}
if (m_Status == eStreamStatusOpen)
{
if (m_RoutingSession && m_RoutingSession->IsLeaseSetNonConfirmed ())
{
// seems something went wrong and we should re-select tunnels
m_CurrentOutboundTunnel = nullptr;
m_CurrentRemoteLease = nullptr;
}
SendQuickAck ();
}
m_IsAckSendScheduled = false;
}
}