summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-07-11 16:19:30 (GMT)
committerTobias Markmann <tm@ayena.de>2017-07-11 16:20:04 (GMT)
commite5111d0125ad107e12150e0cb5447209189c5338 (patch)
tree876a2f18e7da2e5d4c4bd605563b763f784f5935 /Swiften/FileTransfer
parent8b3082e5fa56540714f3ce9b72f87965a62b5d14 (diff)
downloadswift-e5111d0125ad107e12150e0cb5447209189c5338.zip
swift-e5111d0125ad107e12150e0cb5447209189c5338.tar.bz2
Add missing SWIFTEN_OVERRIDE statements to dtors
Also removes -Winconsistent-missing-destructor-override from the list of ignored clang warnings. Test-Information: Tested on macOS 10.12.5 with clang trunk. Change-Id: Iad951879e01eb951a2a393399f55e4e37437c6a2
Diffstat (limited to 'Swiften/FileTransfer')
-rw-r--r--Swiften/FileTransfer/DefaultFileTransferTransporter.h4
-rw-r--r--Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h4
-rw-r--r--Swiften/FileTransfer/FailingTransportSession.h4
-rw-r--r--Swiften/FileTransfer/FileTransferManagerImpl.h4
-rw-r--r--Swiften/FileTransfer/IBBReceiveTransportSession.h4
-rw-r--r--Swiften/FileTransfer/IBBSendTransportSession.h4
-rw-r--r--Swiften/FileTransfer/IncomingJingleFileTransfer.h2
-rw-r--r--Swiften/FileTransfer/OutgoingJingleFileTransfer.h2
-rw-r--r--Swiften/FileTransfer/S5BTransportSession.h4
9 files changed, 16 insertions, 16 deletions
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.h b/Swiften/FileTransfer/DefaultFileTransferTransporter.h
index 339232f..8843de8 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporter.h
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.h
@@ -1,81 +1,81 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <Swiften/Base/API.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/ErrorPayload.h>
#include <Swiften/FileTransfer/FileTransferTransporter.h>
namespace Swift {
class LocalJingleTransportCandidateGenerator;
class RemoteJingleTransportCandidateSelector;
class SOCKS5BytestreamRegistry;
class SOCKS5BytestreamServerManager;
class SOCKS5BytestreamProxiesManager;
class SOCKS5BytestreamClientSession;
class SOCKS5BytestreamServerSession;
class IDGenerator;
class IQRouter;
class ReadBytestream;
class WriteBytestream;
class ConnectionFactory;
class TimerFactory;
class CryptoProvider;
class FileTransferOptions;
class SWIFTEN_API DefaultFileTransferTransporter : public FileTransferTransporter {
public:
enum Role {
Initiator,
Responder
};
DefaultFileTransferTransporter(
const JID& initiator,
const JID& responder,
Role role,
SOCKS5BytestreamRegistry*,
SOCKS5BytestreamServerManager* s5bServerManager,
SOCKS5BytestreamProxiesManager* s5bProxy,
IDGenerator* idGenerator,
ConnectionFactory*,
TimerFactory*,
CryptoProvider*,
IQRouter*,
const FileTransferOptions&);
- virtual ~DefaultFileTransferTransporter();
+ virtual ~DefaultFileTransferTransporter() SWIFTEN_OVERRIDE;
virtual void initialize();
virtual void initialize(const std::string& s5bSessionID);
virtual void startGeneratingLocalCandidates() SWIFTEN_OVERRIDE;
virtual void stopGeneratingLocalCandidates() SWIFTEN_OVERRIDE;
virtual void addRemoteCandidates(
const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string&) SWIFTEN_OVERRIDE;
virtual void startTryingRemoteCandidates() SWIFTEN_OVERRIDE;
virtual void stopTryingRemoteCandidates() SWIFTEN_OVERRIDE;
virtual void startActivatingProxy(const JID& jid) SWIFTEN_OVERRIDE;
virtual void stopActivatingProxy() SWIFTEN_OVERRIDE;
virtual std::shared_ptr<TransportSession> createIBBSendSession(
const std::string& sessionID, unsigned int blockSize, std::shared_ptr<ReadBytestream>) SWIFTEN_OVERRIDE;
virtual std::shared_ptr<TransportSession> createIBBReceiveSession(
const std::string& sessionID, unsigned long long size, std::shared_ptr<WriteBytestream>) SWIFTEN_OVERRIDE;
virtual std::shared_ptr<TransportSession> createRemoteCandidateSession(
std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
virtual std::shared_ptr<TransportSession> createRemoteCandidateSession(
std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
virtual std::shared_ptr<TransportSession> createLocalCandidateSession(
std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
virtual std::shared_ptr<TransportSession> createLocalCandidateSession(
std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
private:
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h b/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
index 3cc3455..774747a 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
@@ -1,51 +1,51 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <Swiften/Base/API.h>
#include <Swiften/Base/Override.h>
#include <Swiften/FileTransfer/FileTransferTransporterFactory.h>
namespace Swift {
class SOCKS5BytestreamRegistry;
class SOCKS5BytestreamServerManager;
class SOCKS5BytestreamProxiesManager;
class IDGenerator;
class ConnectionFactory;
class TimerFactory;
class CryptoProvider;
class IQRouter;
class SWIFTEN_API DefaultFileTransferTransporterFactory : public FileTransferTransporterFactory {
public:
DefaultFileTransferTransporterFactory(
SOCKS5BytestreamRegistry*,
SOCKS5BytestreamServerManager* s5bServerManager,
SOCKS5BytestreamProxiesManager* s5bProxy,
IDGenerator* idGenerator,
ConnectionFactory*,
TimerFactory*,
CryptoProvider*,
IQRouter*);
- virtual ~DefaultFileTransferTransporterFactory();
+ virtual ~DefaultFileTransferTransporterFactory() SWIFTEN_OVERRIDE;
virtual FileTransferTransporter* createInitiatorTransporter(
const JID& initiator, const JID& responder, const FileTransferOptions&) SWIFTEN_OVERRIDE;
virtual FileTransferTransporter* createResponderTransporter(
const JID& initiator, const JID& responder, const std::string& s5bSessionID, const FileTransferOptions&) SWIFTEN_OVERRIDE;
private:
SOCKS5BytestreamRegistry* s5bRegistry;
SOCKS5BytestreamServerManager* s5bServerManager;
SOCKS5BytestreamProxiesManager* s5bProxiesManager;
IDGenerator* idGenerator;
ConnectionFactory* connectionFactory;
TimerFactory* timerFactory;
CryptoProvider* cryptoProvider;
IQRouter* iqRouter;
};
}
diff --git a/Swiften/FileTransfer/FailingTransportSession.h b/Swiften/FileTransfer/FailingTransportSession.h
index 6e0e16e..28d9d07 100644
--- a/Swiften/FileTransfer/FailingTransportSession.h
+++ b/Swiften/FileTransfer/FailingTransportSession.h
@@ -1,22 +1,22 @@
/*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <Swiften/Base/API.h>
#include <Swiften/FileTransfer/TransportSession.h>
namespace Swift {
class SWIFTEN_API FailingTransportSession : public TransportSession {
public:
- virtual ~FailingTransportSession();
+ virtual ~FailingTransportSession() SWIFTEN_OVERRIDE;
virtual void start() SWIFTEN_OVERRIDE;
virtual void stop() SWIFTEN_OVERRIDE;
};
}
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h
index 026c8b7..e02dfc6 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.h
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.h
@@ -1,98 +1,98 @@
/*
* Copyright (c) 2011 Tobias Markmann
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <string>
#include <vector>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/Base/IDGenerator.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/S5BProxyRequest.h>
#include <Swiften/FileTransfer/FileTransferManager.h>
#include <Swiften/FileTransfer/FileTransferOptions.h>
#include <Swiften/FileTransfer/IncomingFileTransfer.h>
#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
namespace Swift {
class ConnectionFactory;
class ConnectionServerFactory;
class CryptoProvider;
class DomainNameResolver;
class EntityCapsProvider;
class FileTransferTransporterFactory;
class IQRouter;
class IncomingFileTransferManager;
class JID;
class JingleSessionManager;
class NATTraverser;
class NetworkEnvironment;
class OutgoingFileTransferManager;
class PresenceOracle;
class ReadBytestream;
class SOCKS5BytestreamProxiesManager;
class SOCKS5BytestreamRegistry;
class SOCKS5BytestreamServerManager;
class TimerFactory;
class SWIFTEN_API FileTransferManagerImpl : public FileTransferManager {
public:
FileTransferManagerImpl(
const JID& ownFullJID,
JingleSessionManager* jingleSessionManager,
IQRouter* router,
EntityCapsProvider* capsProvider,
PresenceOracle* presOracle,
ConnectionFactory* connectionFactory,
ConnectionServerFactory* connectionServerFactory,
TimerFactory* timerFactory,
DomainNameResolver* domainNameResolver,
NetworkEnvironment* networkEnvironment,
NATTraverser* natTraverser,
CryptoProvider* crypto);
- virtual ~FileTransferManagerImpl();
+ virtual ~FileTransferManagerImpl() SWIFTEN_OVERRIDE;
OutgoingFileTransfer::ref createOutgoingFileTransfer(
const JID& to,
const boost::filesystem::path& filepath,
const std::string& description,
std::shared_ptr<ReadBytestream> bytestream,
const FileTransferOptions&) SWIFTEN_OVERRIDE;
OutgoingFileTransfer::ref createOutgoingFileTransfer(
const JID& to,
const std::string& filename,
const std::string& description,
const boost::uintmax_t sizeInBytes,
const boost::posix_time::ptime& lastModified,
std::shared_ptr<ReadBytestream> bytestream,
const FileTransferOptions&) SWIFTEN_OVERRIDE;
void start();
void stop();
private:
boost::optional<JID> highestPriorityJIDSupportingFileTransfer(const JID& bareJID);
private:
OutgoingFileTransferManager* outgoingFTManager;
IncomingFileTransferManager* incomingFTManager;
FileTransferTransporterFactory* transporterFactory;
IQRouter* iqRouter;
EntityCapsProvider* capsProvider;
PresenceOracle* presenceOracle;
IDGenerator idGenerator;
diff --git a/Swiften/FileTransfer/IBBReceiveTransportSession.h b/Swiften/FileTransfer/IBBReceiveTransportSession.h
index 8b304c3..7529274 100644
--- a/Swiften/FileTransfer/IBBReceiveTransportSession.h
+++ b/Swiften/FileTransfer/IBBReceiveTransportSession.h
@@ -1,31 +1,31 @@
/*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <boost/signals2.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/FileTransfer/IBBReceiveSession.h>
#include <Swiften/FileTransfer/TransportSession.h>
namespace Swift {
class SWIFTEN_API IBBReceiveTransportSession : public TransportSession {
public:
IBBReceiveTransportSession(std::shared_ptr<IBBReceiveSession> session);
- virtual ~IBBReceiveTransportSession();
+ virtual ~IBBReceiveTransportSession() SWIFTEN_OVERRIDE;
virtual void start() SWIFTEN_OVERRIDE;
virtual void stop() SWIFTEN_OVERRIDE;
private:
std::shared_ptr<IBBReceiveSession> session;
boost::signals2::scoped_connection finishedConnection;
boost::signals2::scoped_connection bytesSentConnection;
};
}
diff --git a/Swiften/FileTransfer/IBBSendTransportSession.h b/Swiften/FileTransfer/IBBSendTransportSession.h
index d1e786b..f9bf8fb 100644
--- a/Swiften/FileTransfer/IBBSendTransportSession.h
+++ b/Swiften/FileTransfer/IBBSendTransportSession.h
@@ -1,31 +1,31 @@
/*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <boost/signals2.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/FileTransfer/IBBSendSession.h>
#include <Swiften/FileTransfer/TransportSession.h>
namespace Swift {
class SWIFTEN_API IBBSendTransportSession : public TransportSession {
public:
IBBSendTransportSession(std::shared_ptr<IBBSendSession> session);
- virtual ~IBBSendTransportSession();
+ virtual ~IBBSendTransportSession() SWIFTEN_OVERRIDE;
virtual void start() SWIFTEN_OVERRIDE;
virtual void stop() SWIFTEN_OVERRIDE;
private:
std::shared_ptr<IBBSendSession> session;
boost::signals2::scoped_connection finishedConnection;
boost::signals2::scoped_connection bytesSentConnection;
};
}
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
index 7ddf700..e71126b 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
@@ -22,61 +22,61 @@
namespace Swift {
class CryptoProvider;
class FileTransferTransporterFactory;
class IncrementalBytestreamHashCalculator;
class JID;
class JingleContentPayload;
class JingleFileTransferDescription;
class JingleSession;
class Timer;
class TimerFactory;
/**
* @brief The IncomingJingleFileTransfer class contains the business logic for managing incoming
* Jingle file transfers.
*
* Calling IncomingJingleFileTransfer::accept will start to negotiate possible transfer
* methods and after a working method has been decided among peers the trasnfer is started.
*/
class SWIFTEN_API IncomingJingleFileTransfer : public IncomingFileTransfer, public JingleFileTransfer {
public:
typedef std::shared_ptr<IncomingJingleFileTransfer> ref;
IncomingJingleFileTransfer(
const JID& recipient,
std::shared_ptr<JingleSession>,
std::shared_ptr<JingleContentPayload> content,
FileTransferTransporterFactory*,
TimerFactory*,
CryptoProvider*);
- virtual ~IncomingJingleFileTransfer();
+ virtual ~IncomingJingleFileTransfer() SWIFTEN_OVERRIDE;
virtual void accept(std::shared_ptr<WriteBytestream>, const FileTransferOptions& = FileTransferOptions()) SWIFTEN_OVERRIDE;
virtual void cancel() SWIFTEN_OVERRIDE;
private:
enum State {
Initial,
GeneratingInitialLocalCandidates,
TryingCandidates,
WaitingForPeerProxyActivate,
WaitingForLocalProxyActivate,
WaitingForFallbackOrTerminate,
Transferring,
WaitingForHash,
Finished
};
virtual void handleSessionTerminateReceived(
boost::optional<JinglePayload::Reason> reason) SWIFTEN_OVERRIDE;
virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) SWIFTEN_OVERRIDE;
virtual void handleTransportReplaceReceived(
const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
virtual void handleLocalTransportCandidatesGenerated(
const std::string& s5bSessionID,
const std::vector<JingleS5BTransportPayload::Candidate>&,
const std::string& dstAddr) SWIFTEN_OVERRIDE;
void handleWriteStreamDataReceived(const std::vector<unsigned char>& data);
void stopActiveTransport();
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
index 9fd1d76..0ab4e2b 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
@@ -19,61 +19,61 @@
#include <Swiften/Base/API.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/JingleFileTransferFileInfo.h>
#include <Swiften/FileTransfer/FileTransferOptions.h>
#include <Swiften/FileTransfer/JingleFileTransfer.h>
#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
#include <Swiften/Jingle/JingleContentID.h>
#include <Swiften/Network/Timer.h>
namespace Swift {
class CryptoProvider;
class FileTransferTransporterFactory;
class IDGenerator;
class IncrementalBytestreamHashCalculator;
class ReadBytestream;
class TimerFactory;
class TransportSession;
class SWIFTEN_API OutgoingJingleFileTransfer : public OutgoingFileTransfer, public JingleFileTransfer {
public:
OutgoingJingleFileTransfer(
const JID& to,
std::shared_ptr<JingleSession>,
std::shared_ptr<ReadBytestream>,
FileTransferTransporterFactory*,
TimerFactory*,
IDGenerator*,
const JingleFileTransferFileInfo&,
const FileTransferOptions&,
CryptoProvider*);
- virtual ~OutgoingJingleFileTransfer();
+ virtual ~OutgoingJingleFileTransfer() SWIFTEN_OVERRIDE;
virtual void start() SWIFTEN_OVERRIDE;
virtual void cancel() SWIFTEN_OVERRIDE;
private:
enum State {
Initial,
GeneratingInitialLocalCandidates,
WaitingForAccept,
TryingCandidates,
WaitingForPeerProxyActivate,
WaitingForLocalProxyActivate,
WaitingForCandidateAcknowledge,
FallbackRequested,
Transferring,
WaitForTermination,
Finished
};
virtual void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) SWIFTEN_OVERRIDE;
virtual void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
virtual void handleTransportRejectReceived(const JingleContentID &, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE;
virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE;
void startTransferringIfCandidateAcknowledged();
virtual void handleLocalTransportCandidatesGenerated(const std::string& s5bSessionID, const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string& dstAddr) SWIFTEN_OVERRIDE;
virtual void handleTransportInfoAcknowledged(const std::string& id) SWIFTEN_OVERRIDE;
diff --git a/Swiften/FileTransfer/S5BTransportSession.h b/Swiften/FileTransfer/S5BTransportSession.h
index 3e064fa..87fc5c1 100644
--- a/Swiften/FileTransfer/S5BTransportSession.h
+++ b/Swiften/FileTransfer/S5BTransportSession.h
@@ -1,68 +1,68 @@
/*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <boost/bind.hpp>
#include <boost/signals2.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/FileTransfer/ReadBytestream.h>
#include <Swiften/FileTransfer/TransportSession.h>
#include <Swiften/FileTransfer/WriteBytestream.h>
namespace Swift {
template <typename T>
class SWIFTEN_API S5BTransportSession : public TransportSession {
public:
S5BTransportSession(
std::shared_ptr<T> session,
std::shared_ptr<ReadBytestream> readStream) :
session(session),
readStream(readStream) {
initialize();
}
S5BTransportSession(
std::shared_ptr<T> session,
std::shared_ptr<WriteBytestream> writeStream) :
session(session),
writeStream(writeStream) {
initialize();
}
- virtual ~S5BTransportSession() {
+ virtual ~S5BTransportSession() SWIFTEN_OVERRIDE {
}
virtual void start() SWIFTEN_OVERRIDE {
if (readStream) {
session->startSending(readStream);
}
else {
session->startReceiving(writeStream);
}
}
virtual void stop() SWIFTEN_OVERRIDE {
session->stop();
}
private:
void initialize() {
finishedConnection = session->onFinished.connect(boost::bind(boost::ref(onFinished), _1));
bytesSentConnection = session->onBytesSent.connect(boost::bind(boost::ref(onBytesSent), _1));
}
private:
std::shared_ptr<T> session;
std::shared_ptr<ReadBytestream> readStream;
std::shared_ptr<WriteBytestream> writeStream;
boost::signals2::scoped_connection finishedConnection;
boost::signals2::scoped_connection bytesSentConnection;
};