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/DomainNameServiceQuery.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/Network/DomainNameServiceQuery.cpp')
| -rw-r--r-- | Swiften/Network/DomainNameServiceQuery.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/Swiften/Network/DomainNameServiceQuery.cpp b/Swiften/Network/DomainNameServiceQuery.cpp index 548c837..5784dd7 100644 --- a/Swiften/Network/DomainNameServiceQuery.cpp +++ b/Swiften/Network/DomainNameServiceQuery.cpp | |||
| @@ -43,16 +43,21 @@ void DomainNameServiceQuery::sortResults(std::vector<DomainNameServiceQuery::Res | |||
| 43 | /* easy hack to account for '0' weights getting at least some weight */ | 43 | /* easy hack to account for '0' weights getting at least some weight */ |
| 44 | return result.weight + 1; | 44 | return result.weight + 1; |
| 45 | }); | 45 | }); |
| 46 | for (int j = 0; j < boost::numeric_cast<int>(weights.size() - 1); ++j) { | 46 | try { |
| 47 | std::vector<int> cumulativeWeights; | 47 | for (int j = 0; j < boost::numeric_cast<int>(weights.size()) - 1; ++j) { |
| 48 | std::partial_sum( | 48 | std::vector<int> cumulativeWeights; |
| 49 | weights.begin() + j, | 49 | std::partial_sum( |
| 50 | weights.end(), | 50 | weights.begin() + j, |
| 51 | std::back_inserter(cumulativeWeights)); | 51 | weights.end(), |
| 52 | int randomNumber = generator.generateRandomInteger(cumulativeWeights.back()); | 52 | std::back_inserter(cumulativeWeights)); |
| 53 | auto selectedIndex = std::lower_bound(cumulativeWeights.begin(), cumulativeWeights.end(), randomNumber) - cumulativeWeights.begin(); | 53 | int randomNumber = generator.generateRandomInteger(cumulativeWeights.back()); |
| 54 | std::swap(i[j], i[j + selectedIndex]); | 54 | auto selectedIndex = std::lower_bound(cumulativeWeights.begin(), cumulativeWeights.end(), randomNumber) - cumulativeWeights.begin(); |
| 55 | std::swap(weights.begin()[j], weights.begin()[j + selectedIndex]); | 55 | std::swap(i[j], i[j + selectedIndex]); |
| 56 | std::swap(weights.begin()[j], weights.begin()[j + selectedIndex]); | ||
| 57 | } | ||
| 58 | } | ||
| 59 | catch (const boost::numeric::bad_numeric_cast&) { | ||
| 60 | // In the unlikely event of weights.size() being too large, use the list as-is. | ||
| 56 | } | 61 | } |
| 57 | } | 62 | } |
| 58 | i = next; | 63 | i = next; |