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/ChainedConnector.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/Network/ChainedConnector.h')
| -rw-r--r-- | Swiften/Network/ChainedConnector.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Network/ChainedConnector.h b/Swiften/Network/ChainedConnector.h index a00d7e5..9620293 100644 --- a/Swiften/Network/ChainedConnector.h +++ b/Swiften/Network/ChainedConnector.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2011-2016 Isode Limited. | 2 | * Copyright (c) 2011-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 | */ |
| @@ -26,7 +26,7 @@ namespace Swift { | |||
| 26 | 26 | ||
| 27 | class SWIFTEN_API ChainedConnector { | 27 | class SWIFTEN_API ChainedConnector { |
| 28 | public: | 28 | public: |
| 29 | ChainedConnector(const std::string& hostname, int port, const boost::optional<std::string>& serviceLookupPrefix, DomainNameResolver*, const std::vector<ConnectionFactory*>&, TimerFactory*); | 29 | ChainedConnector(const std::string& hostname, unsigned short port, const boost::optional<std::string>& serviceLookupPrefix, DomainNameResolver*, const std::vector<ConnectionFactory*>&, TimerFactory*); |
| 30 | ~ChainedConnector(); | 30 | ~ChainedConnector(); |
| 31 | 31 | ||
| 32 | void setTimeoutMilliseconds(int milliseconds); | 32 | void setTimeoutMilliseconds(int milliseconds); |
| @@ -42,7 +42,7 @@ namespace Swift { | |||
| 42 | 42 | ||
| 43 | private: | 43 | private: |
| 44 | std::string hostname; | 44 | std::string hostname; |
| 45 | int port; | 45 | unsigned short port; |
| 46 | boost::optional<std::string> serviceLookupPrefix; | 46 | boost::optional<std::string> serviceLookupPrefix; |
| 47 | DomainNameResolver* resolver; | 47 | DomainNameResolver* resolver; |
| 48 | std::vector<ConnectionFactory*> connectionFactories; | 48 | std::vector<ConnectionFactory*> connectionFactories; |