Commit 03f6c1e1 authored by Sébastien Blin's avatar Sébastien Blin Committed by Adrien Béraud

file transfer: fix cancel

Change-Id: If13deebef78da9864522969c595beb5fc6a095de
Gitlab: #141
parent 7043f9d3
......@@ -493,14 +493,7 @@ TlsSocketEndpoint::TlsSocketEndpoint(AbstractSocketEndpoint& tr,
}
TlsSocketEndpoint::~TlsSocketEndpoint() {
shutdown();
}
void
TlsSocketEndpoint::shutdown() {
pimpl_->tr.shutdown();
}
TlsSocketEndpoint::~TlsSocketEndpoint() = default;
bool
TlsSocketEndpoint::isInitiator() const
......
......@@ -187,7 +187,6 @@ public:
std::function<bool(const dht::crypto::Certificate&)>&& cert_check);
~TlsSocketEndpoint();
void shutdown() override;
bool isReliable() const override { return true; }
bool isInitiator() const override;
int maxPayload() const override;
......
......@@ -735,9 +735,6 @@ TlsSession::TlsSessionImpl::cleanup()
state_ = TlsSessionState::SHUTDOWN; // be sure to block any user operations
stateCondition_.notify_all();
// This will stop current read of the ice_transport.cpp
transport_.shutdown();
{
std::lock_guard<std::mutex> lk(sessionMutex_);
if (session_) {
......@@ -752,6 +749,8 @@ TlsSession::TlsSessionImpl::cleanup()
if (cookie_key_.data)
gnutls_free(cookie_key_.data);
transport_.shutdown();
}
TlsSessionState
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment