| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 ost << HostAsSensitiveURIString() << ":" << port(); | 177 ost << HostAsSensitiveURIString() << ":" << port(); |
| 178 return ost.str(); | 178 return ost.str(); |
| 179 } | 179 } |
| 180 | 180 |
| 181 bool SocketAddress::FromString(const std::string& str) { | 181 bool SocketAddress::FromString(const std::string& str) { |
| 182 if (str.at(0) == '[') { | 182 if (str.at(0) == '[') { |
| 183 std::string::size_type closebracket = str.rfind(']'); | 183 std::string::size_type closebracket = str.rfind(']'); |
| 184 if (closebracket != std::string::npos) { | 184 if (closebracket != std::string::npos) { |
| 185 std::string::size_type colon = str.find(':', closebracket); | 185 std::string::size_type colon = str.find(':', closebracket); |
| 186 if (colon != std::string::npos && colon > closebracket) { | 186 if (colon != std::string::npos && colon > closebracket) { |
| 187 SetPort(strtoul(str.substr(colon + 1).c_str(), NULL, 10)); | 187 SetPort(strtoul(str.substr(colon + 1).c_str(), nullptr, 10)); |
| 188 SetIP(str.substr(1, closebracket - 1)); | 188 SetIP(str.substr(1, closebracket - 1)); |
| 189 } else { | 189 } else { |
| 190 return false; | 190 return false; |
| 191 } | 191 } |
| 192 } | 192 } |
| 193 } else { | 193 } else { |
| 194 std::string::size_type pos = str.find(':'); | 194 std::string::size_type pos = str.find(':'); |
| 195 if (std::string::npos == pos) | 195 if (std::string::npos == pos) |
| 196 return false; | 196 return false; |
| 197 SetPort(strtoul(str.substr(pos + 1).c_str(), NULL, 10)); | 197 SetPort(strtoul(str.substr(pos + 1).c_str(), nullptr, 10)); |
| 198 SetIP(str.substr(0, pos)); | 198 SetIP(str.substr(0, pos)); |
| 199 } | 199 } |
| 200 return true; | 200 return true; |
| 201 } | 201 } |
| 202 | 202 |
| 203 std::ostream& operator<<(std::ostream& os, const SocketAddress& addr) { | 203 std::ostream& operator<<(std::ostream& os, const SocketAddress& addr) { |
| 204 os << addr.HostAsURIString() << ":" << addr.port(); | 204 os << addr.HostAsURIString() << ":" << addr.port(); |
| 205 return os; | 205 return os; |
| 206 } | 206 } |
| 207 | 207 |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 SocketAddress EmptySocketAddressWithFamily(int family) { | 330 SocketAddress EmptySocketAddressWithFamily(int family) { |
| 331 if (family == AF_INET) { | 331 if (family == AF_INET) { |
| 332 return SocketAddress(IPAddress(INADDR_ANY), 0); | 332 return SocketAddress(IPAddress(INADDR_ANY), 0); |
| 333 } else if (family == AF_INET6) { | 333 } else if (family == AF_INET6) { |
| 334 return SocketAddress(IPAddress(in6addr_any), 0); | 334 return SocketAddress(IPAddress(in6addr_any), 0); |
| 335 } | 335 } |
| 336 return SocketAddress(); | 336 return SocketAddress(); |
| 337 } | 337 } |
| 338 | 338 |
| 339 } // namespace rtc | 339 } // namespace rtc |
| OLD | NEW |