OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/protocol/network_settings.h" | 5 #include "remoting/protocol/network_settings.h" |
6 | 6 |
7 #include <limits.h> | 7 #include <limits.h> |
8 #include <stdlib.h> | 8 #include <stdlib.h> |
9 | 9 |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
12 | 12 |
13 namespace remoting { | 13 namespace remoting { |
14 namespace protocol { | 14 namespace protocol { |
15 | 15 |
16 // static | 16 // static |
17 bool NetworkSettings::ParsePortRange(const std::string& port_range, | 17 bool NetworkSettings::ParsePortRange(const std::string& port_range, |
18 int* out_min_port, | 18 uint16* out_min_port, |
19 int* out_max_port) { | 19 uint16* out_max_port) { |
20 size_t separator_index = port_range.find('-'); | 20 size_t separator_index = port_range.find('-'); |
21 if (separator_index == std::string::npos) | 21 if (separator_index == std::string::npos) |
22 return false; | 22 return false; |
23 | 23 |
24 std::string min_port_string, max_port_string; | 24 std::string min_port_string, max_port_string; |
25 base::TrimWhitespaceASCII(port_range.substr(0, separator_index), | 25 base::TrimWhitespaceASCII(port_range.substr(0, separator_index), |
26 base::TRIM_ALL, | 26 base::TRIM_ALL, |
27 &min_port_string); | 27 &min_port_string); |
28 base::TrimWhitespaceASCII(port_range.substr(separator_index + 1), | 28 base::TrimWhitespaceASCII(port_range.substr(separator_index + 1), |
29 base::TRIM_ALL, | 29 base::TRIM_ALL, |
30 &max_port_string); | 30 &max_port_string); |
31 | 31 |
32 unsigned min_port, max_port; | 32 unsigned min_port, max_port; |
33 if (!base::StringToUint(min_port_string, &min_port) || | 33 if (!base::StringToUint(min_port_string, &min_port) || |
34 !base::StringToUint(max_port_string, &max_port)) { | 34 !base::StringToUint(max_port_string, &max_port)) { |
35 return false; | 35 return false; |
36 } | 36 } |
37 | 37 |
38 if (min_port == 0 || min_port > max_port || max_port > USHRT_MAX) | 38 if (min_port == 0 || min_port > max_port || max_port > USHRT_MAX) |
39 return false; | 39 return false; |
40 | 40 |
41 *out_min_port = static_cast<int>(min_port); | 41 *out_min_port = static_cast<uint16>(min_port); |
42 *out_max_port = static_cast<int>(max_port); | 42 *out_max_port = static_cast<uint16>(max_port); |
43 return true; | 43 return true; |
44 } | 44 } |
45 | 45 |
46 } // namespace protocol | 46 } // namespace protocol |
47 } // namespace remoting | 47 } // namespace remoting |
OLD | NEW |