When talking to a SOCKS v5 proxy, default to sending addresses as raw domains...

net/socket/socks5_client_socket.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/socks5_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/trace_event.h"
 #include "net/base/io_buffer.h"
@@ skipping 19 matching lines @@
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           io_callback_(this, &SOCKS5ClientSocket::OnIOComplete)),
       transport_(transport_socket),
       next_state_(STATE_NONE),
       address_type_(kEndPointUnresolved),
       user_callback_(NULL),
       completed_handshake_(false),
       bytes_sent_(0),
       bytes_received_(0),
       read_header_size(kReadHeaderSize),
-      host_resolver_(host_resolver),
       host_request_info_(req_info) {
+  if (host_resolver)
+    host_resolver_.reset(new SingleRequestHostResolver(host_resolver));
 }
 
 SOCKS5ClientSocket::~SOCKS5ClientSocket() {
   Disconnect();
 }
 
 int SOCKS5ClientSocket::Connect(CompletionCallback* callback,
                                 LoadLog* load_log) {
   DCHECK(transport_.get());
   DCHECK(transport_->IsConnected());
   DCHECK_EQ(STATE_NONE, next_state_);
   DCHECK(!user_callback_);
 
   // If already connected, then just return OK.
   if (completed_handshake_)
     return OK;
 
-  next_state_ = STATE_RESOLVE_HOST;
   load_log_ = load_log;
+  LoadLog::BeginEvent(load_log, LoadLog::TYPE_SOCKS5_CONNECT);
 
-  LoadLog::BeginEvent(load_log, LoadLog::TYPE_SOCKS5_CONNECT);
+  // If a host resolver was given, try to resolve the address locally.
+  // Otherwise let the proxy server handle the resolving.
+  if (host_resolver_.get()) {
+    next_state_ = STATE_RESOLVE_HOST;
+  } else {
+    next_state_ = STATE_GREET_WRITE;
+    address_type_ = kEndPointFailedDomain;
+  }
 
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING) {
     user_callback_ = callback;
   } else {
     LoadLog::EndEvent(load_log, LoadLog::TYPE_SOCKS5_CONNECT);
     load_log_ = NULL;
   }
   return rv;
 }
@@ skipping 111 matching lines @@
         break;
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE);
   return rv;
 }
 
 int SOCKS5ClientSocket::DoResolveHost() {
   DCHECK_EQ(kEndPointUnresolved, address_type_);
 
   next_state_ = STATE_RESOLVE_HOST_COMPLETE;
-  return host_resolver_.Resolve(
+  return host_resolver_->Resolve(
       host_request_info_, &addresses_, &io_callback_, load_log_);
 }
 
 int SOCKS5ClientSocket::DoResolveHostComplete(int result) {
   DCHECK_EQ(kEndPointUnresolved, address_type_);
 
   bool ok = (result == OK);
   next_state_ = STATE_GREET_WRITE;
   if (ok) {
     DCHECK(addresses_.head());
@@ skipping 231 matching lines @@
 }
 
 #if defined(OS_LINUX)
 int SOCKS5ClientSocket::GetPeerName(struct sockaddr* name,
                                     socklen_t* namelen) {
   return transport_->GetPeerName(name, namelen);
 }
 #endif
 
 }  // namespace net