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/QA/ClientTest | |
| 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/QA/ClientTest')
| -rw-r--r-- | Swiften/QA/ClientTest/ClientTest.cpp | 15 |
1 files changed, 13 insertions, 2 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); |