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

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: Added missing NET_EXPORT to *PortOnAddressList. Created 8 years, 8 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 37f8babe7ede2c849a62acba531888e7d50eec54..07c44ab4c40281d079e5417bf1d5439adda5649a 100644
--- a/chrome/browser/extensions/api/socket/socket.cc
+++ b/chrome/browser/extensions/api/socket/socket.cc
@@ -78,16 +78,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();
}
}

Powered by Google App Engine
This is Rietveld 408576698