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

Unified Diff: chrome/browser/extensions/api/socket/socket.cc

Issue 10309002: Reimplements net::AddressList without struct addrinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: get_canonical_name -> canonical_name. iterator to indexing Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/socket/socket.cc
diff --git a/chrome/browser/extensions/api/socket/socket.cc b/chrome/browser/extensions/api/socket/socket.cc
index be20438db232bd3d11dafd6386cfdf61e832b05f..2323014d70905dbd720f34340c28056199ebcb0c 100644
--- a/chrome/browser/extensions/api/socket/socket.cc
+++ b/chrome/browser/extensions/api/socket/socket.cc
@@ -79,16 +79,11 @@ void Socket::IPEndPointToStringAndPort(const net::IPEndPoint& address,
int* port) {
DCHECK(ip_address_str);
DCHECK(port);
- struct sockaddr_storage addr;
- size_t addr_len = sizeof(addr);
- if (address.ToSockAddr(reinterpret_cast<struct sockaddr*>(&addr),
- &addr_len)) {
- *ip_address_str = net::NetAddressToString(
- reinterpret_cast<struct sockaddr*>(&addr), addr_len);
- *port = address.port();
- } else {
- *ip_address_str = "";
+ *ip_address_str = address.ToStringWithoutPort();
+ if (ip_address_str->empty()) {
*port = 0;
+ } else {
+ *port = address.port();
}
}
« no previous file with comments | « chrome/browser/extensions/api/dns/dns_api.cc ('k') | chrome/browser/extensions/extension_web_socket_proxy_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698