summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/FileTransfer')
-rw-r--r--Swiften/FileTransfer/ConnectivityManager.cpp2
-rw-r--r--Swiften/FileTransfer/ConnectivityManager.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/ConnectivityManager.cpp b/Swiften/FileTransfer/ConnectivityManager.cpp
index 1002b45..7d25991 100644
--- a/Swiften/FileTransfer/ConnectivityManager.cpp
+++ b/Swiften/FileTransfer/ConnectivityManager.cpp
@@ -86,19 +86,19 @@ std::vector<HostAddressPort> ConnectivityManager::getAssistedHostAddressPorts()
void ConnectivityManager::natTraversalGetPublicIPResult(boost::optional<HostAddress> address) {
if (address) {
publicAddress = address;
SWIFT_LOG(debug) << "Public IP discovered as " << publicAddress.get().toString() << "." << std::endl;
} else {
SWIFT_LOG(debug) << "No public IP discoverable." << std::endl;
}
}
-void ConnectivityManager::natTraversalForwardPortResult(boost::optional<NATTraversalForwardPortRequest::PortMapping> mapping) {
+void ConnectivityManager::natTraversalForwardPortResult(boost::optional<NATPortMapping> mapping) {
if (mapping) {
SWIFT_LOG(debug) << "Mapping port was successful." << std::endl;
} else {
SWIFT_LOG(debug) << "Mapping port has failed." << std::endl;
}
}
}
diff --git a/Swiften/FileTransfer/ConnectivityManager.h b/Swiften/FileTransfer/ConnectivityManager.h
index 41e0ab6..c094c02 100644
--- a/Swiften/FileTransfer/ConnectivityManager.h
+++ b/Swiften/FileTransfer/ConnectivityManager.h
@@ -8,37 +8,38 @@
#include <vector>
#include <set>
#include <boost/optional.hpp>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/Network/NATTraverser.h>
#include <Swiften/Network/NATTraversalForwardPortRequest.h>
+#include <Swiften/Network/NATPortMapping.h>
namespace Swift {
class NATTraverser;
class ConnectivityManager {
public:
ConnectivityManager(NATTraverser*);
~ConnectivityManager();
public:
void addListeningPort(int port);
void removeListeningPort(int port);
std::vector<HostAddressPort> getHostAddressPorts() const;
std::vector<HostAddressPort> getAssistedHostAddressPorts() const;
private:
void natTraversalGetPublicIPResult(boost::optional<HostAddress> address);
- void natTraversalForwardPortResult(boost::optional<NATTraversalForwardPortRequest::PortMapping> mapping);
+ void natTraversalForwardPortResult(boost::optional<NATPortMapping> mapping);
private:
NATTraverser* natTraversalWorker;
std::set<int> ports;
boost::optional<HostAddress> publicAddress;
};
}