Skip to content
Snippets Groups Projects
Commit d6d2c9b3 authored by Sébastien Blin's avatar Sébastien Blin Committed by Adrien Béraud
Browse files

jamiaccount: add lock for incomingFileTransfers_

Change-Id: Icff5822193aea4b99437ce110c7d4fc503112fe6
parent c72b8978
Branches
No related tags found
No related merge requests found
......@@ -2190,6 +2190,7 @@ JamiAccount::doRegister_()
std::istringstream iss(tid_str);
iss >> tid;
if (dhtPeerConnector_->onIncomingChannelRequest(tid)) {
std::lock_guard<std::mutex> lk(transfersMtx_);
incomingFileTransfers_.emplace(tid_str);
return true;
}
......@@ -2210,11 +2211,13 @@ JamiAccount::doRegister_()
cacheSIPConnection(std::move(channel), peerId, deviceId);
} else if (isFile or isVCard) {
auto tid_str = isFile ? name.substr(7) : name.substr(8);
std::unique_lock<std::mutex> lk(transfersMtx_);
auto it = incomingFileTransfers_.find(tid_str);
// Note, outgoing file transfers are ignored.
if (it == incomingFileTransfers_.end())
return;
incomingFileTransfers_.erase(it);
lk.unlock();
uint64_t tid;
std::istringstream iss(tid_str);
iss >> tid;
......
......@@ -751,6 +751,7 @@ private:
const DeviceId& deviceId);
// File transfers
std::mutex transfersMtx_ {};
std::set<std::string> incomingFileTransfers_ {};
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment