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/LinkLocal/DNSSD/Bonjour/BonjourQuerier.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/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp')
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp index 0906ffc..551421e 100644 --- a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp | |||
| @@ -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 | */ |
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <unistd.h> | 11 | #include <unistd.h> |
| 12 | 12 | ||
| 13 | #include <Swiften/Base/Algorithm.h> | 13 | #include <Swiften/Base/Algorithm.h> |
| 14 | #include <Swiften/Base/Log.h> | ||
| 14 | #include <Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h> | 15 | #include <Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h> |
| 15 | #include <Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h> | 16 | #include <Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h> |
| 16 | #include <Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveHostnameQuery.h> | 17 | #include <Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveHostnameQuery.h> |
| @@ -36,7 +37,7 @@ std::shared_ptr<DNSSDBrowseQuery> BonjourQuerier::createBrowseQuery() { | |||
| 36 | return std::make_shared<BonjourBrowseQuery>(shared_from_this(), eventLoop); | 37 | return std::make_shared<BonjourBrowseQuery>(shared_from_this(), eventLoop); |
| 37 | } | 38 | } |
| 38 | 39 | ||
| 39 | std::shared_ptr<DNSSDRegisterQuery> BonjourQuerier::createRegisterQuery(const std::string& name, int port, const ByteArray& info) { | 40 | std::shared_ptr<DNSSDRegisterQuery> BonjourQuerier::createRegisterQuery(const std::string& name, unsigned short port, const ByteArray& info) { |
| 40 | return std::make_shared<BonjourRegisterQuery>(name, port, info, shared_from_this(), eventLoop); | 41 | return std::make_shared<BonjourRegisterQuery>(name, port, info, shared_from_this(), eventLoop); |
| 41 | } | 42 | } |
| 42 | 43 | ||