Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-09-28 20:01:57 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-09-29 18:07:17 (GMT) |
| commit | dfccb5703c4d85ab1a54429016b103101bdc54ae (patch) | |
| tree | 05ac257e6dc7609a5b02e94e59b52f44b74f123d /Swiften/FileTransfer/ConnectivityManager.h | |
| parent | 6cea7fdfea93e54543c6757909a8fae7348754fc (diff) | |
| download | swift-contrib-dfccb5703c4d85ab1a54429016b103101bdc54ae.zip swift-contrib-dfccb5703c4d85ab1a54429016b103101bdc54ae.tar.bz2 | |
File Transfer refactoring.
NAT traversal classes refactoring.
Added beginnings of a NetworkTool.
Diffstat (limited to 'Swiften/FileTransfer/ConnectivityManager.h')
| -rw-r--r-- | Swiften/FileTransfer/ConnectivityManager.h | 3 |
1 files changed, 2 insertions, 1 deletions
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; }; } |