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/ProxiedConnection.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/ProxiedConnection.h')
| -rw-r--r-- | Swiften/Network/ProxiedConnection.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Network/ProxiedConnection.h b/Swiften/Network/ProxiedConnection.h index 440fb86..f79845a 100644 --- a/Swiften/Network/ProxiedConnection.h +++ b/Swiften/Network/ProxiedConnection.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2012-2017 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 | */ |
| @@ -20,7 +20,7 @@ namespace Swift { | |||
| 20 | 20 | ||
| 21 | class SWIFTEN_API ProxiedConnection : public Connection, public std::enable_shared_from_this<ProxiedConnection> { | 21 | class SWIFTEN_API ProxiedConnection : public Connection, public std::enable_shared_from_this<ProxiedConnection> { |
| 22 | public: | 22 | public: |
| 23 | ProxiedConnection(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort); | 23 | ProxiedConnection(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, unsigned short proxyPort); |
| 24 | virtual ~ProxiedConnection(); | 24 | virtual ~ProxiedConnection(); |
| 25 | 25 | ||
| 26 | virtual void listen(); | 26 | virtual void listen(); |
| @@ -55,7 +55,7 @@ namespace Swift { | |||
| 55 | ConnectionFactory* connectionFactory_; | 55 | ConnectionFactory* connectionFactory_; |
| 56 | TimerFactory* timerFactory_; | 56 | TimerFactory* timerFactory_; |
| 57 | std::string proxyHost_; | 57 | std::string proxyHost_; |
| 58 | int proxyPort_; | 58 | unsigned short proxyPort_; |
| 59 | HostAddressPort server_; | 59 | HostAddressPort server_; |
| 60 | Connector::ref connector_; | 60 | Connector::ref connector_; |
| 61 | std::shared_ptr<Connection> connection_; | 61 | std::shared_ptr<Connection> connection_; |