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

@ -104,6 +104,7 @@ namespace garlic
{
if (m_LeaseSetUpdateStatus != eLeaseSetDoNotSend) m_LeaseSetUpdateStatus = eLeaseSetUpdated;
};
bool IsLeaseSetNonConfirmed () const { return m_LeaseSetUpdateStatus == eLeaseSetSubmitted; };
std::shared_ptr<GarlicRoutingPath> GetSharedRoutingPath ();
void SetSharedRoutingPath (std::shared_ptr<GarlicRoutingPath> path);