Add two more unit tests for SOCKS5:

  * Check that connecting again after having disconnected works.
  * Check that trying to connect with a very large hostname fails.

Also removes some unused code from socks_client_socket.cc.

BUG=NONE

Review URL: http://codereview.chromium.org/501112

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35008 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc
index 7386caf..33d8e53 100644
--- a/net/socket/socks5_client_socket.cc
+++ b/net/socket/socks5_client_socket.cc
@@ -85,7 +85,7 @@ bool SOCKS5ClientSocket::IsConnectedAndIdle() const {
 // Read is called by the transport layer above to read. This can only be done
 // if the SOCKS handshake is complete.
 int SOCKS5ClientSocket::Read(IOBuffer* buf, int buf_len,
-                            CompletionCallback* callback) {
+                             CompletionCallback* callback) {
   DCHECK(completed_handshake_);
   DCHECK_EQ(STATE_NONE, next_state_);
   DCHECK(!user_callback_);
@@ -182,6 +182,11 @@ const char kSOCKS5GreetWriteData[] = { 0x05, 0x01, 0x00 };  // no authentication
 const char kSOCKS5GreetReadData[] = { 0x05, 0x00 };
 
 int SOCKS5ClientSocket::DoGreetWrite() {
+  // Since we only have 1 byte to send the hostname length in, if the
+  // URL has a hostname longer than 255 characters we can't send it.
+  if (0xFF < host_request_info_.hostname().size())
+    return ERR_INVALID_URL;
+
   if (buffer_.empty()) {
     buffer_ = std::string(kSOCKS5GreetWriteData,
                           arraysize(kSOCKS5GreetWriteData));
@@ -251,10 +256,7 @@ int SOCKS5ClientSocket::BuildHandshakeWriteBuffer(std::string* handshake)
 
   handshake->push_back(kEndPointDomain);  // The type of the address.
 
-  // We only have 1 byte to send the length in, so if the hostname is
-  // longer than this we can't send it!
-  if(256 <= host_request_info_.hostname().size())
-    return ERR_INVALID_URL;
+  DCHECK_GE(static_cast<size_t>(0xFF), host_request_info_.hostname().size());
 
   // First add the size of the hostname, followed by the hostname.
   handshake->push_back(static_cast<unsigned char>(