Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-10-29 16:28:14 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-11-08 11:31:20 (GMT) |
| commit | cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f (patch) | |
| tree | 69e11e13ff2e5127d2cbfcc164be761cf104a1b2 /Swiften/Network/PlatformNATTraversalWorker.cpp | |
| parent | 5ce9e19ef0744f530a797c30a82e9723eb7ea306 (diff) | |
| download | swift-cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f.zip swift-cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f.tar.bz2 | |
Consistently use unsigned short for network ports
Network ports are now consistently stored as unsigned shorts, apart from
the options and user interface, where -1 is still used to denote the use
of default ports.
Test-Information:
Unit tests pass on macOS 10.13 and Debian 9
On macOS: tested the UI with various proxy and manual ports, behaviour
as expected.
Change-Id: I7a65f40083022887aa30ed7b21eadc56d0c52be1
Diffstat (limited to 'Swiften/Network/PlatformNATTraversalWorker.cpp')
| -rw-r--r-- | Swiften/Network/PlatformNATTraversalWorker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp index f56de0b..af12049 100644 --- a/Swiften/Network/PlatformNATTraversalWorker.cpp +++ b/Swiften/Network/PlatformNATTraversalWorker.cpp | |||
| @@ -84,7 +84,7 @@ class PlatformNATTraversalGetPublicIPRequest : public NATTraversalGetPublicIPReq | |||
| 84 | 84 | ||
| 85 | class PlatformNATTraversalForwardPortRequest : public NATTraversalForwardPortRequest, public PlatformNATTraversalRequest { | 85 | class PlatformNATTraversalForwardPortRequest : public NATTraversalForwardPortRequest, public PlatformNATTraversalRequest { |
| 86 | public: | 86 | public: |
| 87 | PlatformNATTraversalForwardPortRequest(PlatformNATTraversalWorker* worker, unsigned int localIP, unsigned int publicIP) : PlatformNATTraversalRequest(worker), localIP(localIP), publicIP(publicIP) { | 87 | PlatformNATTraversalForwardPortRequest(PlatformNATTraversalWorker* worker, unsigned short localPort, unsigned short publicPort) : PlatformNATTraversalRequest(worker), localPort(localPort), publicPort(publicPort) { |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | virtual ~PlatformNATTraversalForwardPortRequest() { | 90 | virtual ~PlatformNATTraversalForwardPortRequest() { |
| @@ -99,12 +99,12 @@ class PlatformNATTraversalForwardPortRequest : public NATTraversalForwardPortReq | |||
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | virtual void runBlocking() { | 101 | virtual void runBlocking() { |
| 102 | getEventLoop()->postEvent(boost::bind(boost::ref(onResult), getNATTraversalInterface()->addPortForward(boost::numeric_cast<int>(localIP), boost::numeric_cast<int>(publicIP))), shared_from_this()); | 102 | getEventLoop()->postEvent(boost::bind(boost::ref(onResult), getNATTraversalInterface()->addPortForward(localPort, publicPort)), shared_from_this()); |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | private: | 105 | private: |
| 106 | unsigned int localIP; | 106 | unsigned short localPort; |
| 107 | unsigned int publicIP; | 107 | unsigned short publicPort; |
| 108 | }; | 108 | }; |
| 109 | 109 | ||
| 110 | class PlatformNATTraversalRemovePortForwardingRequest : public NATTraversalRemovePortForwardingRequest, public PlatformNATTraversalRequest { | 110 | class PlatformNATTraversalRemovePortForwardingRequest : public NATTraversalRemovePortForwardingRequest, public PlatformNATTraversalRequest { |
| @@ -181,11 +181,11 @@ std::shared_ptr<NATTraversalGetPublicIPRequest> PlatformNATTraversalWorker::crea | |||
| 181 | return std::make_shared<PlatformNATTraversalGetPublicIPRequest>(this); | 181 | return std::make_shared<PlatformNATTraversalGetPublicIPRequest>(this); |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | std::shared_ptr<NATTraversalForwardPortRequest> PlatformNATTraversalWorker::createForwardPortRequest(int localPort, int publicPort) { | 184 | std::shared_ptr<NATTraversalForwardPortRequest> PlatformNATTraversalWorker::createForwardPortRequest(unsigned short localPort, unsigned short publicPort) { |
| 185 | return std::make_shared<PlatformNATTraversalForwardPortRequest>(this, localPort, publicPort); | 185 | return std::make_shared<PlatformNATTraversalForwardPortRequest>(this, localPort, publicPort); |
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | std::shared_ptr<NATTraversalRemovePortForwardingRequest> PlatformNATTraversalWorker::createRemovePortForwardingRequest(int localPort, int publicPort) { | 188 | std::shared_ptr<NATTraversalRemovePortForwardingRequest> PlatformNATTraversalWorker::createRemovePortForwardingRequest(unsigned short localPort, unsigned short publicPort) { |
| 189 | NATPortMapping mapping(localPort, publicPort, NATPortMapping::TCP); // FIXME | 189 | NATPortMapping mapping(localPort, publicPort, NATPortMapping::TCP); // FIXME |
| 190 | return std::make_shared<PlatformNATTraversalRemovePortForwardingRequest>(this, mapping); | 190 | return std::make_shared<PlatformNATTraversalRemovePortForwardingRequest>(this, mapping); |
| 191 | } | 191 | } |