summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/FileTransfer/JingleFileTransfer.cpp')
-rw-r--r--Swiften/FileTransfer/JingleFileTransfer.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/Swiften/FileTransfer/JingleFileTransfer.cpp b/Swiften/FileTransfer/JingleFileTransfer.cpp
index 62c3a53..cc1cd1c 100644
--- a/Swiften/FileTransfer/JingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/JingleFileTransfer.cpp
@@ -1,19 +1,17 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/FileTransfer/JingleFileTransfer.h>
-#include <boost/typeof/typeof.hpp>
-
#include <Swiften/Base/Log.h>
#include <Swiften/Crypto/CryptoProvider.h>
#include <Swiften/FileTransfer/FileTransferTransporter.h>
#include <Swiften/JID/JID.h>
#include <Swiften/Jingle/JingleSession.h>
#include <Swiften/StringCodecs/Hexify.h>
using namespace Swift;
@@ -23,19 +21,18 @@ JingleFileTransfer::JingleFileTransfer(
FileTransferTransporterFactory* transporterFactory) :
session(session),
target(target),
transporterFactory(transporterFactory),
transporter(nullptr),
ourCandidateSelectFinished(false),
theirCandidateSelectFinished(false) {
session->addListener(this);
-
}
JingleFileTransfer::~JingleFileTransfer() {
session->removeListener(this);
}
void JingleFileTransfer::fillCandidateMap(CandidateMap& map, const std::vector<JingleS5BTransportPayload::Candidate>& candidates) {
map.clear();
for (auto&& candidate : candidates) {
@@ -170,19 +167,19 @@ void JingleFileTransfer::handleTransportInfoReceived(
SWIFT_LOG(debug) << std::endl;
if (JingleS5BTransportPayload::ref s5bPayload = std::dynamic_pointer_cast<JingleS5BTransportPayload>(transport)) {
if (s5bPayload->hasCandidateError() || !s5bPayload->getCandidateUsed().empty()) {
SWIFT_LOG(debug) << "Received candidate decision from peer" << std::endl;
if (!isTryingCandidates()) { SWIFT_LOG(warning) << "Incorrect state" << std::endl; return; }
theirCandidateSelectFinished = true;
if (!s5bPayload->hasCandidateError()) {
- BOOST_AUTO(theirCandidate, localCandidates.find(s5bPayload->getCandidateUsed()));
+ auto theirCandidate = localCandidates.find(s5bPayload->getCandidateUsed());
if (theirCandidate == localCandidates.end()) {
SWIFT_LOG(warning) << "Got invalid candidate" << std::endl;
terminate(JinglePayload::Reason::GeneralError);
return;
}
theirCandidateChoice = theirCandidate->second;
}
decideOnCandidates();
}
@@ -225,10 +222,9 @@ void JingleFileTransfer::setTransporter(FileTransferTransporter* transporter) {
void JingleFileTransfer::removeTransporter() {
if (transporter) {
localTransportCandidatesGeneratedConnection.release();
remoteTransportCandidateSelectFinishedConnection.release();
proxyActivatedConnection.release();
delete transporter;
transporter = nullptr;
}
}
-