diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 22:47:06 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 22:47:06 +0000 |
| commit | ae3ac17598586553c9963df44566427410afadae (patch) | |
| tree | 5a6428feba537ed42e0aa7c1fbdf67d616d49d08 /content | |
| parent | 3f3021bca8faca49c57a25fd3721f3a18e824258 (diff) | |
| download | chromium_src-ae3ac17598586553c9963df44566427410afadae.zip chromium_src-ae3ac17598586553c9963df44566427410afadae.tar.gz chromium_src-ae3ac17598586553c9963df44566427410afadae.tar.bz2 | |
Return DNS addresses when address can be resolved synchronously.
BUG=92231
TEST=Second remoting connection from the same browser works.
Review URL: http://codereview.chromium.org/7633036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/p2p/socket_dispatcher_host.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc index 728556e..b1a5769 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc @@ -48,8 +48,10 @@ class P2PSocketDispatcherHost::DnsRequest { host_name_ = host_name_ + '.'; net::HostResolver::RequestInfo info(net::HostPortPair(host_name_, 0)); - resolver_.Resolve(info, &addresses_, &completion_callback_, - net::BoundNetLog()); + int result = resolver_.Resolve(info, &addresses_, &completion_callback_, + net::BoundNetLog()); + if (result != net::ERR_IO_PENDING) + OnDone(result); } int32 routing_id() { return routing_id_; } @@ -199,10 +201,10 @@ void P2PSocketDispatcherHost::OnGetHostAddress(const IPC::Message& msg, int32 request_id) { DnsRequest* request = new DnsRequest( msg.routing_id(), request_id, resource_context_->host_resolver()); + dns_requests_.insert(request); request->Resolve(host_name, base::Bind( &P2PSocketDispatcherHost::OnAddressResolved, base::Unretained(this), request)); - dns_requests_.insert(request); } void P2PSocketDispatcherHost::OnAddressResolved( |