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

Unified Diff: content/browser/renderer_host/p2p/socket_dispatcher_host.cc

Issue 10309002: Reimplements net::AddressList without struct addrinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make inheritance private in AddressList. Fix: MockTCPClientSocket, redefined symbols on MSVS2010. 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: content/browser/renderer_host/p2p/socket_dispatcher_host.cc
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
index ef9a094a4110d40431a88022c619e05c53192101..eaf7beb1293b08b65a45e619d51dc47eaf5e6793 100644
--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
@@ -72,22 +72,15 @@ class P2PSocketDispatcherHost::DnsRequest {
return;
}
- if (addresses_.head() == NULL) {
+ // TODO(szym): Redundant check. http://crbug.com/126211
+ if (addresses_.empty()) {
LOG(ERROR) << "Received 0 addresses when trying to resolve address for "
<< host_name_;
done_callback_.Run(net::IPAddressNumber());
return;
}
- net::IPEndPoint end_point;
- if (!end_point.FromSockAddr(addresses_.head()->ai_addr,
- addresses_.head()->ai_addrlen)) {
- LOG(ERROR) << "Received invalid address for " << host_name_;
- done_callback_.Run(net::IPAddressNumber());
- return;
- }
-
- done_callback_.Run(end_point.address());
+ done_callback_.Run(addresses_.front().address());
}
int32 routing_id_;

Powered by Google App Engine
This is Rietveld 408576698