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.h | |
| 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.h')
| -rw-r--r-- | Swiften/FileTransfer/SOCKS5BytestreamServerManager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.h b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.h index 3c06513..74578cc 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.h | |||
| @@ -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 | */ |
| @@ -78,7 +78,7 @@ namespace Swift { | |||
| 78 | enum { Start, Initializing, Initialized } state; | 78 | enum { Start, Initializing, Initialized } state; |
| 79 | SOCKS5BytestreamServer* server; | 79 | SOCKS5BytestreamServer* server; |
| 80 | std::shared_ptr<ConnectionServer> connectionServer; | 80 | std::shared_ptr<ConnectionServer> connectionServer; |
| 81 | int connectionServerPort = -1; | 81 | unsigned short connectionServerPort = 0; |
| 82 | 82 | ||
| 83 | std::shared_ptr<NATTraversalGetPublicIPRequest> getPublicIPRequest; | 83 | std::shared_ptr<NATTraversalGetPublicIPRequest> getPublicIPRequest; |
| 84 | std::shared_ptr<NATTraversalForwardPortRequest> forwardPortRequest; | 84 | std::shared_ptr<NATTraversalForwardPortRequest> forwardPortRequest; |