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/NATPMPInterface.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/NATPMPInterface.cpp')
| -rw-r--r-- | Swiften/Network/NATPMPInterface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Network/NATPMPInterface.cpp b/Swiften/Network/NATPMPInterface.cpp index 5e0b3b3..8ab26d4 100644 --- a/Swiften/Network/NATPMPInterface.cpp +++ b/Swiften/Network/NATPMPInterface.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2014-2016 Isode Limited. | 8 | * Copyright (c) 2014-2018 Isode Limited. |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| @@ -74,13 +74,13 @@ boost::optional<HostAddress> NATPMPInterface::getPublicIP() { | |||
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | boost::optional<NATPortMapping> NATPMPInterface::addPortForward(int localPort, int publicPort) { | 77 | boost::optional<NATPortMapping> NATPMPInterface::addPortForward(unsigned short localPort, unsigned short publicPort) { |
| 78 | NATPortMapping mapping(localPort, publicPort, NATPortMapping::TCP); | 78 | NATPortMapping mapping(localPort, publicPort, NATPortMapping::TCP); |
| 79 | if (sendnewportmappingrequest( | 79 | if (sendnewportmappingrequest( |
| 80 | &p->natpmp, | 80 | &p->natpmp, |
| 81 | mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, | 81 | mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, |
| 82 | boost::numeric_cast<uint16_t>(mapping.getLocalPort()), | 82 | mapping.getLocalPort(), |
| 83 | boost::numeric_cast<uint16_t>(mapping.getPublicPort()), | 83 | mapping.getPublicPort(), |
| 84 | boost::numeric_cast<uint32_t>(mapping.getLeaseInSeconds())) < 0) { | 84 | boost::numeric_cast<uint32_t>(mapping.getLeaseInSeconds())) < 0) { |
| 85 | SWIFT_LOG(debug) << "Failed to send NAT-PMP port forwarding request!" << std::endl; | 85 | SWIFT_LOG(debug) << "Failed to send NAT-PMP port forwarding request!" << std::endl; |
| 86 | return boost::optional<NATPortMapping>(); | 86 | return boost::optional<NATPortMapping>(); |