Commit ae3ac175 authored by sergeyu@chromium.org's avatar sergeyu@chromium.org

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
parent 3f3021bc
...@@ -48,8 +48,10 @@ class P2PSocketDispatcherHost::DnsRequest { ...@@ -48,8 +48,10 @@ class P2PSocketDispatcherHost::DnsRequest {
host_name_ = host_name_ + '.'; host_name_ = host_name_ + '.';
net::HostResolver::RequestInfo info(net::HostPortPair(host_name_, 0)); net::HostResolver::RequestInfo info(net::HostPortPair(host_name_, 0));
resolver_.Resolve(info, &addresses_, &completion_callback_, int result = resolver_.Resolve(info, &addresses_, &completion_callback_,
net::BoundNetLog()); net::BoundNetLog());
if (result != net::ERR_IO_PENDING)
OnDone(result);
} }
int32 routing_id() { return routing_id_; } int32 routing_id() { return routing_id_; }
...@@ -199,10 +201,10 @@ void P2PSocketDispatcherHost::OnGetHostAddress(const IPC::Message& msg, ...@@ -199,10 +201,10 @@ void P2PSocketDispatcherHost::OnGetHostAddress(const IPC::Message& msg,
int32 request_id) { int32 request_id) {
DnsRequest* request = new DnsRequest( DnsRequest* request = new DnsRequest(
msg.routing_id(), request_id, resource_context_->host_resolver()); msg.routing_id(), request_id, resource_context_->host_resolver());
dns_requests_.insert(request);
request->Resolve(host_name, base::Bind( request->Resolve(host_name, base::Bind(
&P2PSocketDispatcherHost::OnAddressResolved, &P2PSocketDispatcherHost::OnAddressResolved,
base::Unretained(this), request)); base::Unretained(this), request));
dns_requests_.insert(request);
} }
void P2PSocketDispatcherHost::OnAddressResolved( void P2PSocketDispatcherHost::OnAddressResolved(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment