Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Side by Side Diff: net/base/net_util.h

Issue 23464033: Land Recent QUIC changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix valgrind error Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | net/base/net_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef NET_BASE_NET_UTIL_H_ 5 #ifndef NET_BASE_NET_UTIL_H_
6 #define NET_BASE_NET_UTIL_H_ 6 #define NET_BASE_NET_UTIL_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 NET_EXPORT std::string NetAddressToStringWithPort(const struct sockaddr* sa, 159 NET_EXPORT std::string NetAddressToStringWithPort(const struct sockaddr* sa,
160 socklen_t sock_addr_len); 160 socklen_t sock_addr_len);
161 161
162 // Same as IPAddressToString() but for an IPAddressNumber. 162 // Same as IPAddressToString() but for an IPAddressNumber.
163 NET_EXPORT std::string IPAddressToString(const IPAddressNumber& addr); 163 NET_EXPORT std::string IPAddressToString(const IPAddressNumber& addr);
164 164
165 // Same as IPAddressToStringWithPort() but for an IPAddressNumber. 165 // Same as IPAddressToStringWithPort() but for an IPAddressNumber.
166 NET_EXPORT std::string IPAddressToStringWithPort( 166 NET_EXPORT std::string IPAddressToStringWithPort(
167 const IPAddressNumber& addr, uint16 port); 167 const IPAddressNumber& addr, uint16 port);
168 168
169 // Returns the address as a sequence of bytes in network-byte-order.
170 NET_EXPORT std::string IPAddressToPackedString(const IPAddressNumber& addr);
171
169 // Returns the hostname of the current system. Returns empty string on failure. 172 // Returns the hostname of the current system. Returns empty string on failure.
170 NET_EXPORT std::string GetHostName(); 173 NET_EXPORT std::string GetHostName();
171 174
172 // Extracts the unescaped username/password from |url|, saving the results 175 // Extracts the unescaped username/password from |url|, saving the results
173 // into |*username| and |*password|. 176 // into |*username| and |*password|.
174 NET_EXPORT_PRIVATE void GetIdentityFromURL(const GURL& url, 177 NET_EXPORT_PRIVATE void GetIdentityFromURL(const GURL& url,
175 base::string16* username, 178 base::string16* username,
176 base::string16* password); 179 base::string16* password);
177 180
178 // Returns either the host from |url|, or, if the host is empty, the full spec. 181 // Returns either the host from |url|, or, if the host is empty, the full spec.
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 WIFI_PHY_LAYER_PROTOCOL_UNKNOWN 542 WIFI_PHY_LAYER_PROTOCOL_UNKNOWN
540 }; 543 };
541 544
542 // Characterize the PHY mode of the currently associated access point. 545 // Characterize the PHY mode of the currently associated access point.
543 // Currently only available on OS_WIN. 546 // Currently only available on OS_WIN.
544 NET_EXPORT WifiPHYLayerProtocol GetWifiPHYLayerProtocol(); 547 NET_EXPORT WifiPHYLayerProtocol GetWifiPHYLayerProtocol();
545 548
546 } // namespace net 549 } // namespace net
547 550
548 #endif // NET_BASE_NET_UTIL_H_ 551 #endif // NET_BASE_NET_UTIL_H_
OLDNEW
« no previous file with comments | « no previous file | net/base/net_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698