Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/QA
diff options
context:
space:
mode:
authorEdwin Mons <edwin.mons@isode.com>2018-10-29 16:28:14 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2018-11-08 11:31:20 (GMT)
commitcf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f (patch)
tree69e11e13ff2e5127d2cbfcc164be761cf104a1b2 /Swiften/QA
parent5ce9e19ef0744f530a797c30a82e9723eb7ea306 (diff)
downloadswift-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/QA')
-rw-r--r--Swiften/QA/ClientTest/ClientTest.cpp15
-rw-r--r--Swiften/QA/NetworkTest/DomainNameResolverTest.cpp10
2 files changed, 18 insertions, 7 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 5cb1765..c5117fa 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.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 */
@@ -8,6 +8,7 @@
8#include <thread> 8#include <thread>
9 9
10#include <boost/bind.hpp> 10#include <boost/bind.hpp>
11#include <boost/numeric/conversion/cast.hpp>
11 12
12#include <Swiften/Client/Client.h> 13#include <Swiften/Client/Client.h>
13#include <Swiften/Client/ClientXMLTracer.h> 14#include <Swiften/Client/ClientXMLTracer.h>
@@ -74,7 +75,17 @@ int main(int, char**) {
74 75
75 if (boshHost && boshPort && boshPath) { 76 if (boshHost && boshPort && boshPath) {
76 std::cout << "Using BOSH with URL: http://" << boshHost << ":" << boshPort << boshPath << std::endl; 77 std::cout << "Using BOSH with URL: http://" << boshHost << ":" << boshPort << boshPath << std::endl;
77 options.boshURL = URL("http", boshHost, atoi(boshPort), boshPath); 78 try {
79 options.boshURL = URL("http", boshHost, boost::numeric_cast<unsigned short>(boost::lexical_cast<int>(boshPort)), boshPath);
80 }
81 catch (const boost::numeric::bad_numeric_cast& e) {
82 std::cerr << "SWIFT_CLIENTTEST_BOSH_PORT doesn't hold a valid port number: " << e.what() << std::endl;
83 return -1;
84 }
85 catch (const boost::bad_lexical_cast& e) {
86 std::cerr << "SWIFT_CLIENTTEST_BOSH_PORT doesn't hold a valid port number: " << e.what() << std::endl;
87 return -1;
88 }
78 } 89 }
79 90
80 client = new Swift::Client(JID(jid), std::string(pass), &networkFactories); 91 client = new Swift::Client(JID(jid), std::string(pass), &networkFactories);
diff --git a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
index 95ebb6d..69e6fe8 100644
--- a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
+++ b/Swiften/QA/NetworkTest/DomainNameResolverTest.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 */
@@ -179,19 +179,19 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
179 179
180 CPPUNIT_ASSERT_EQUAL(4, static_cast<int>(serviceQueryResult.size())); 180 CPPUNIT_ASSERT_EQUAL(4, static_cast<int>(serviceQueryResult.size()));
181 CPPUNIT_ASSERT_EQUAL(std::string("xmpp1.test.swift.im"), serviceQueryResult[0].hostname); 181 CPPUNIT_ASSERT_EQUAL(std::string("xmpp1.test.swift.im"), serviceQueryResult[0].hostname);
182 CPPUNIT_ASSERT_EQUAL(5000, serviceQueryResult[0].port); 182 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5000), serviceQueryResult[0].port);
183 CPPUNIT_ASSERT_EQUAL(0, serviceQueryResult[0].priority); 183 CPPUNIT_ASSERT_EQUAL(0, serviceQueryResult[0].priority);
184 CPPUNIT_ASSERT_EQUAL(1, serviceQueryResult[0].weight); 184 CPPUNIT_ASSERT_EQUAL(1, serviceQueryResult[0].weight);
185 CPPUNIT_ASSERT_EQUAL(std::string("xmpp-invalid.test.swift.im"), serviceQueryResult[1].hostname); 185 CPPUNIT_ASSERT_EQUAL(std::string("xmpp-invalid.test.swift.im"), serviceQueryResult[1].hostname);
186 CPPUNIT_ASSERT_EQUAL(5000, serviceQueryResult[1].port); 186 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5000), serviceQueryResult[1].port);
187 CPPUNIT_ASSERT_EQUAL(1, serviceQueryResult[1].priority); 187 CPPUNIT_ASSERT_EQUAL(1, serviceQueryResult[1].priority);
188 CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[1].weight); 188 CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[1].weight);
189 CPPUNIT_ASSERT_EQUAL(std::string("xmpp3.test.swift.im"), serviceQueryResult[2].hostname); 189 CPPUNIT_ASSERT_EQUAL(std::string("xmpp3.test.swift.im"), serviceQueryResult[2].hostname);
190 CPPUNIT_ASSERT_EQUAL(5000, serviceQueryResult[2].port); 190 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5000), serviceQueryResult[2].port);
191 CPPUNIT_ASSERT_EQUAL(3, serviceQueryResult[2].priority); 191 CPPUNIT_ASSERT_EQUAL(3, serviceQueryResult[2].priority);
192 CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[2].weight); 192 CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[2].weight);
193 CPPUNIT_ASSERT_EQUAL(std::string("xmpp2.test.swift.im"), serviceQueryResult[3].hostname); 193 CPPUNIT_ASSERT_EQUAL(std::string("xmpp2.test.swift.im"), serviceQueryResult[3].hostname);
194 CPPUNIT_ASSERT_EQUAL(5000, serviceQueryResult[3].port); 194 CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5000), serviceQueryResult[3].port);
195 CPPUNIT_ASSERT_EQUAL(5, serviceQueryResult[3].priority); 195 CPPUNIT_ASSERT_EQUAL(5, serviceQueryResult[3].priority);
196 CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[3].weight); 196 CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[3].weight);
197 } 197 }