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/FileTransfer/SOCKS5BytestreamServerManager.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/FileTransfer/SOCKS5BytestreamServerManager.cpp')
| -rw-r--r-- | Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp index f749735..a6b75da 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp +++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2012-2016 Isode Limited. | 2 | * Copyright (c) 2012-2018 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -114,7 +114,7 @@ void SOCKS5BytestreamServerManager::initialize() { | |||
| 114 | 114 | ||
| 115 | // Find a port to listen on | 115 | // Find a port to listen on |
| 116 | assert(!connectionServer); | 116 | assert(!connectionServer); |
| 117 | int port; | 117 | unsigned short port; |
| 118 | for (port = LISTEN_PORTS_BEGIN; port < LISTEN_PORTS_END; ++port) { | 118 | for (port = LISTEN_PORTS_BEGIN; port < LISTEN_PORTS_END; ++port) { |
| 119 | SWIFT_LOG(debug) << "Trying to start server on port " << port << std::endl; | 119 | SWIFT_LOG(debug) << "Trying to start server on port " << port << std::endl; |
| 120 | connectionServer = connectionServerFactory->createConnectionServer(HostAddress::fromString("::").get(), port); | 120 | connectionServer = connectionServerFactory->createConnectionServer(HostAddress::fromString("::").get(), port); |
| @@ -164,7 +164,7 @@ void SOCKS5BytestreamServerManager::setupPortForwarding() { | |||
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | // Forward ports | 166 | // Forward ports |
| 167 | int port = server->getAddressPort().getPort(); | 167 | auto port = server->getAddressPort().getPort(); |
| 168 | assert(!forwardPortRequest); | 168 | assert(!forwardPortRequest); |
| 169 | portMapping = boost::optional<NATPortMapping>(); | 169 | portMapping = boost::optional<NATPortMapping>(); |
| 170 | if ((forwardPortRequest = natTraverser->createForwardPortRequest(port, port))) { | 170 | if ((forwardPortRequest = natTraverser->createForwardPortRequest(port, port))) { |