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/UnitTest | |
| 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/UnitTest')
| -rw-r--r-- | Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp b/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp index 85ae537..ab1ee0c 100644 --- a/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp +++ b/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.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 | */ |
| @@ -53,7 +53,7 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture { | |||
| 53 | CPPUNIT_ASSERT(!connectError); | 53 | CPPUNIT_ASSERT(!connectError); |
| 54 | CPPUNIT_ASSERT(connection->connectedTo); | 54 | CPPUNIT_ASSERT(connection->connectedTo); |
| 55 | CPPUNIT_ASSERT_EQUAL(std::string(connection->connectedTo->getAddress().toString()), std::string("192.168.1.1")); | 55 | CPPUNIT_ASSERT_EQUAL(std::string(connection->connectedTo->getAddress().toString()), std::string("192.168.1.1")); |
| 56 | CPPUNIT_ASSERT_EQUAL(connection->connectedTo->getPort(), 1234); | 56 | CPPUNIT_ASSERT_EQUAL(connection->connectedTo->getPort(), static_cast<unsigned short>(1234)); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | void testConnect_UnableToResolve() { | 59 | void testConnect_UnableToResolve() { |
| @@ -114,7 +114,7 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture { | |||
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | private: | 116 | private: |
| 117 | std::shared_ptr<LinkLocalConnector> createConnector(const std::string& hostname, int port) { | 117 | std::shared_ptr<LinkLocalConnector> createConnector(const std::string& hostname, unsigned short port) { |
| 118 | LinkLocalService service( | 118 | LinkLocalService service( |
| 119 | DNSSDServiceID("myname", "local."), | 119 | DNSSDServiceID("myname", "local."), |
| 120 | DNSSDResolveServiceQuery::Result( | 120 | DNSSDResolveServiceQuery::Result( |