| 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" |
| 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/net_util.h" | 13 #include "net/base/net_util.h" |
| 14 #include "url/gurl.h" | 14 #include "url/gurl.h" |
| 15 | 15 |
| 16 namespace net { | 16 namespace net { |
| 17 | 17 |
| 18 HostPortPair::HostPortPair() : port_(0) {} | 18 HostPortPair::HostPortPair() : port_(0) {} |
| 19 HostPortPair::HostPortPair(const std::string& in_host, uint16 in_port) | 19 HostPortPair::HostPortPair(const std::string& in_host, uint16_t in_port) |
| 20 : host_(in_host), port_(in_port) {} | 20 : host_(in_host), port_(in_port) { |
| 21 } |
| 21 | 22 |
| 22 // static | 23 // static |
| 23 HostPortPair HostPortPair::FromURL(const GURL& url) { | 24 HostPortPair HostPortPair::FromURL(const GURL& url) { |
| 24 return HostPortPair(url.HostNoBrackets(), | 25 return HostPortPair(url.HostNoBrackets(), |
| 25 static_cast<uint16>(url.EffectiveIntPort())); | 26 static_cast<uint16_t>(url.EffectiveIntPort())); |
| 26 } | 27 } |
| 27 | 28 |
| 28 // static | 29 // static |
| 29 HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) { | 30 HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) { |
| 30 return HostPortPair(ipe.ToStringWithoutPort(), ipe.port()); | 31 return HostPortPair(ipe.ToStringWithoutPort(), ipe.port()); |
| 31 } | 32 } |
| 32 | 33 |
| 33 HostPortPair HostPortPair::FromString(const std::string& str) { | 34 HostPortPair HostPortPair::FromString(const std::string& str) { |
| 34 std::vector<std::string> key_port; | 35 std::vector<std::string> key_port; |
| 35 base::SplitString(str, ':', &key_port); | 36 base::SplitString(str, ':', &key_port); |
| 36 if (key_port.size() != 2) | 37 if (key_port.size() != 2) |
| 37 return HostPortPair(); | 38 return HostPortPair(); |
| 38 int port; | 39 int port; |
| 39 if (!base::StringToInt(key_port[1], &port)) | 40 if (!base::StringToInt(key_port[1], &port)) |
| 40 return HostPortPair(); | 41 return HostPortPair(); |
| 41 if (!IsPortValid(port)) | 42 if (!IsPortValid(port)) |
| 42 return HostPortPair(); | 43 return HostPortPair(); |
| 43 HostPortPair host_port_pair; | 44 HostPortPair host_port_pair; |
| 44 host_port_pair.set_host(key_port[0]); | 45 host_port_pair.set_host(key_port[0]); |
| 45 host_port_pair.set_port(static_cast<uint16>(port)); | 46 host_port_pair.set_port(static_cast<uint16_t>(port)); |
| 46 return host_port_pair; | 47 return host_port_pair; |
| 47 } | 48 } |
| 48 | 49 |
| 49 std::string HostPortPair::ToString() const { | 50 std::string HostPortPair::ToString() const { |
| 50 std::string ret(HostForURL()); | 51 std::string ret(HostForURL()); |
| 51 ret += ':'; | 52 ret += ':'; |
| 52 ret += base::IntToString(port_); | 53 ret += base::IntToString(port_); |
| 53 return ret; | 54 return ret; |
| 54 } | 55 } |
| 55 | 56 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 66 // Check to see if the host is an IPv6 address. If so, added brackets. | 67 // Check to see if the host is an IPv6 address. If so, added brackets. |
| 67 if (host_.find(':') != std::string::npos) { | 68 if (host_.find(':') != std::string::npos) { |
| 68 DCHECK_NE(host_[0], '['); | 69 DCHECK_NE(host_[0], '['); |
| 69 return base::StringPrintf("[%s]", host_.c_str()); | 70 return base::StringPrintf("[%s]", host_.c_str()); |
| 70 } | 71 } |
| 71 | 72 |
| 72 return host_; | 73 return host_; |
| 73 } | 74 } |
| 74 | 75 |
| 75 } // namespace net | 76 } // namespace net |
| OLD | NEW |