summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.cpp4
-rw-r--r--Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.h17
-rw-r--r--Swiften/FileTransfer/IncomingJingleFileTransfer.cpp2
-rw-r--r--Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp2
-rw-r--r--Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h2
5 files changed, 14 insertions, 13 deletions
diff --git a/Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.cpp b/Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.cpp
index 32b4df8..4a6b61f 100644
--- a/Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.cpp
+++ b/Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.cpp
@@ -4,7 +4,7 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
-#include "DefaultRemoteJingleTransportCandidateSelector.h"
+#include <Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.h>
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/bind.hpp>
@@ -97,7 +97,7 @@ void DefaultRemoteJingleTransportCandidateSelector::setMinimumPriority(int prior
SWIFT_LOG(debug) << "priority: " << priority << std::endl;
}
-void DefaultRemoteJingleTransportCandidateSelector::setRequesterTargtet(const JID& requester, const JID& target) {
+void DefaultRemoteJingleTransportCandidateSelector::setRequesterTarget(const JID& requester, const JID& target) {
this->requester = requester;
this->target = target;
}
diff --git a/Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.h b/Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.h
index 255acd9..073c51f 100644
--- a/Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.h
+++ b/Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelector.h
@@ -11,6 +11,7 @@
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/Override.h>
#include <Swiften/JID/JID.h>
#include <Swiften/Network/Connection.h>
#include <Swiften/FileTransfer/SOCKS5BytestreamClientSession.h>
@@ -28,15 +29,15 @@ public:
DefaultRemoteJingleTransportCandidateSelector(ConnectionFactory*, TimerFactory*);
virtual ~DefaultRemoteJingleTransportCandidateSelector();
- virtual void addRemoteTransportCandidates(JingleTransportPayload::ref);
- virtual void selectCandidate();
- virtual void setMinimumPriority(int);
- void setRequesterTargtet(const JID& requester, const JID& target);
- virtual SOCKS5BytestreamClientSession::ref getS5BSession();
+ virtual void addRemoteTransportCandidates(JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
+ virtual void selectCandidate() SWIFTEN_OVERRIDE;
+ virtual void setMinimumPriority(int) SWIFTEN_OVERRIDE;
+ virtual void setRequesterTarget(const JID& requester, const JID& target) SWIFTEN_OVERRIDE;
+ virtual SOCKS5BytestreamClientSession::ref getS5BSession() SWIFTEN_OVERRIDE;
- virtual bool isActualCandidate(JingleTransportPayload::ref);
- virtual int getPriority(JingleTransportPayload::ref);
- virtual JingleTransport::ref selectTransport(JingleTransportPayload::ref);
+ virtual bool isActualCandidate(JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
+ virtual int getPriority(JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
+ virtual JingleTransport::ref selectTransport(JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
private:
void tryNextCandidate(bool error);
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
index dbf6ace..c462381 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
@@ -110,7 +110,7 @@ void IncomingJingleFileTransfer::accept(WriteBytestream::ref stream) {
s5bRegistry->addWriteBytestream(s5bDestination, stream);
fillCandidateMap(theirCandidates, s5bTransport);
candidateSelector->addRemoteTransportCandidates(s5bTransport);
- candidateSelector->setRequesterTargtet(session->getInitiator(), ourJID);
+ candidateSelector->setRequesterTarget(session->getInitiator(), ourJID);
s5bTransport->setSessionID(s5bSessionID);
candidateGenerator->generateLocalTransportCandidates(s5bTransport);
}
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp b/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
index e22260e..4da70ef 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
@@ -119,7 +119,7 @@ void OutgoingJingleFileTransfer::handleSessionAcceptReceived(const JingleContent
}
else if ((s5bPayload = boost::dynamic_pointer_cast<JingleS5BTransportPayload>(transportPayload))) {
fillCandidateMap(theirCandidates, s5bPayload);
- remoteCandidateSelector->setRequesterTargtet(toJID, session->getInitiator());
+ remoteCandidateSelector->setRequesterTarget(toJID, session->getInitiator());
remoteCandidateSelector->addRemoteTransportCandidates(s5bPayload);
remoteCandidateSelector->selectCandidate();
}
diff --git a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
index 487747c..3d5612a 100644
--- a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
+++ b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
@@ -22,7 +22,7 @@ namespace Swift {
virtual void addRemoteTransportCandidates(JingleTransportPayload::ref) = 0;
virtual void selectCandidate() = 0;
virtual void setMinimumPriority(int) = 0;
- virtual void setRequesterTargtet(const JID&, const JID&) {}
+ virtual void setRequesterTarget(const JID&, const JID&) {}
virtual SOCKS5BytestreamClientSession::ref getS5BSession() { return SOCKS5BytestreamClientSession::ref(); }
virtual bool isActualCandidate(JingleTransportPayload::ref) = 0;