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/StaticDomainNameResolver.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/StaticDomainNameResolver.h')
| -rw-r--r-- | Swiften/Network/StaticDomainNameResolver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/StaticDomainNameResolver.h b/Swiften/Network/StaticDomainNameResolver.h index 76394d0..2064046 100644 --- a/Swiften/Network/StaticDomainNameResolver.h +++ b/Swiften/Network/StaticDomainNameResolver.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 Isode Limited. | 2 | * Copyright (c) 2010-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 | */ |
| @@ -31,7 +31,7 @@ namespace Swift { | |||
| 31 | void addAddress(const std::string& domain, const HostAddress& address); | 31 | void addAddress(const std::string& domain, const HostAddress& address); |
| 32 | void addService(const std::string& service, const DomainNameServiceQuery::Result& result); | 32 | void addService(const std::string& service, const DomainNameServiceQuery::Result& result); |
| 33 | void addXMPPClientService(const std::string& domain, const HostAddressPort&); | 33 | void addXMPPClientService(const std::string& domain, const HostAddressPort&); |
| 34 | void addXMPPClientService(const std::string& domain, const std::string& host, int port); | 34 | void addXMPPClientService(const std::string& domain, const std::string& host, unsigned short port); |
| 35 | 35 | ||
| 36 | const AddressesMap& getAddresses() const { | 36 | const AddressesMap& getAddresses() const { |
| 37 | return addresses; | 37 | return addresses; |