Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "net/base/host_port_pair.h" | 5 #include "net/base/host_port_pair.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
|
mmenke
2016/03/23 19:32:28
Hrm...Guess we still need this for Uint to string.
eroman
2016/03/23 19:50:30
Yeah, we can tackle this eventually.
There are a
| |
| 9 #include "base/strings/string_split.h" | 9 #include "base/strings/string_split.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| 11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
| 12 #include "net/base/ip_endpoint.h" | 12 #include "net/base/ip_endpoint.h" |
| 13 #include "net/base/parse_number.h" | |
| 13 #include "net/base/port_util.h" | 14 #include "net/base/port_util.h" |
| 14 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| 15 | 16 |
| 16 namespace net { | 17 namespace net { |
| 17 | 18 |
| 18 HostPortPair::HostPortPair() : port_(0) {} | 19 HostPortPair::HostPortPair() : port_(0) {} |
| 19 HostPortPair::HostPortPair(const std::string& in_host, uint16_t in_port) | 20 HostPortPair::HostPortPair(const std::string& in_host, uint16_t in_port) |
| 20 : host_(in_host), port_(in_port) { | 21 : host_(in_host), port_(in_port) { |
| 21 } | 22 } |
| 22 | 23 |
| 23 // static | 24 // static |
| 24 HostPortPair HostPortPair::FromURL(const GURL& url) { | 25 HostPortPair HostPortPair::FromURL(const GURL& url) { |
| 25 return HostPortPair(url.HostNoBrackets(), | 26 return HostPortPair(url.HostNoBrackets(), |
| 26 static_cast<uint16_t>(url.EffectiveIntPort())); | 27 static_cast<uint16_t>(url.EffectiveIntPort())); |
| 27 } | 28 } |
| 28 | 29 |
| 29 // static | 30 // static |
| 30 HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) { | 31 HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) { |
| 31 return HostPortPair(ipe.ToStringWithoutPort(), ipe.port()); | 32 return HostPortPair(ipe.ToStringWithoutPort(), ipe.port()); |
| 32 } | 33 } |
| 33 | 34 |
| 34 HostPortPair HostPortPair::FromString(const std::string& str) { | 35 HostPortPair HostPortPair::FromString(const std::string& str) { |
| 35 std::vector<base::StringPiece> key_port = base::SplitStringPiece( | 36 std::vector<base::StringPiece> key_port = base::SplitStringPiece( |
| 36 str, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); | 37 str, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
| 37 if (key_port.size() != 2) | 38 if (key_port.size() != 2) |
| 38 return HostPortPair(); | 39 return HostPortPair(); |
| 39 int port; | 40 int port; |
| 40 if (!base::StringToInt(key_port[1], &port)) | 41 if (!ParseNonNegativeDecimalInt(key_port[1], &port)) |
| 41 return HostPortPair(); | 42 return HostPortPair(); |
| 42 if (!IsPortValid(port)) | 43 if (!IsPortValid(port)) |
| 43 return HostPortPair(); | 44 return HostPortPair(); |
| 44 HostPortPair host_port_pair; | 45 HostPortPair host_port_pair; |
| 45 host_port_pair.set_host(key_port[0].as_string()); | 46 host_port_pair.set_host(key_port[0].as_string()); |
| 46 host_port_pair.set_port(static_cast<uint16_t>(port)); | 47 host_port_pair.set_port(static_cast<uint16_t>(port)); |
| 47 return host_port_pair; | 48 return host_port_pair; |
| 48 } | 49 } |
| 49 | 50 |
| 50 std::string HostPortPair::ToString() const { | 51 std::string HostPortPair::ToString() const { |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 67 // Check to see if the host is an IPv6 address. If so, added brackets. | 68 // Check to see if the host is an IPv6 address. If so, added brackets. |
| 68 if (host_.find(':') != std::string::npos) { | 69 if (host_.find(':') != std::string::npos) { |
| 69 DCHECK_NE(host_[0], '['); | 70 DCHECK_NE(host_[0], '['); |
| 70 return base::StringPrintf("[%s]", host_.c_str()); | 71 return base::StringPrintf("[%s]", host_.c_str()); |
| 71 } | 72 } |
| 72 | 73 |
| 73 return host_; | 74 return host_; |
| 74 } | 75 } |
| 75 | 76 |
| 76 } // namespace net | 77 } // namespace net |
| OLD | NEW |