| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/socket/socks_client_socket.h" | 5 #include "net/socket/socks_client_socket.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
| 10 #include <ws2tcpip.h> | 10 #include <ws2tcpip.h> |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 break; | 189 break; |
| 190 } | 190 } |
| 191 } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); | 191 } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); |
| 192 return rv; | 192 return rv; |
| 193 } | 193 } |
| 194 | 194 |
| 195 int SOCKSClientSocket::DoResolveHost() { | 195 int SOCKSClientSocket::DoResolveHost() { |
| 196 DCHECK_EQ(kSOCKS4Unresolved, socks_version_); | 196 DCHECK_EQ(kSOCKS4Unresolved, socks_version_); |
| 197 | 197 |
| 198 next_state_ = STATE_RESOLVE_HOST_COMPLETE; | 198 next_state_ = STATE_RESOLVE_HOST_COMPLETE; |
| 199 return host_resolver_.Resolve(host_request_info_, &addresses_, &io_callback_); | 199 return host_resolver_.Resolve( |
| 200 NULL, host_request_info_, &addresses_, &io_callback_); |
| 200 } | 201 } |
| 201 | 202 |
| 202 int SOCKSClientSocket::DoResolveHostComplete(int result) { | 203 int SOCKSClientSocket::DoResolveHostComplete(int result) { |
| 203 DCHECK_EQ(kSOCKS4Unresolved, socks_version_); | 204 DCHECK_EQ(kSOCKS4Unresolved, socks_version_); |
| 204 | 205 |
| 205 bool ok = (result == OK); | 206 bool ok = (result == OK); |
| 206 next_state_ = STATE_HANDSHAKE_WRITE; | 207 next_state_ = STATE_HANDSHAKE_WRITE; |
| 207 if (ok) { | 208 if (ok) { |
| 208 DCHECK(addresses_.head()); | 209 DCHECK(addresses_.head()); |
| 209 | 210 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 | 377 |
| 377 #if defined(OS_LINUX) | 378 #if defined(OS_LINUX) |
| 378 int SOCKSClientSocket::GetPeerName(struct sockaddr* name, | 379 int SOCKSClientSocket::GetPeerName(struct sockaddr* name, |
| 379 socklen_t* namelen) { | 380 socklen_t* namelen) { |
| 380 return transport_->GetPeerName(name, namelen); | 381 return transport_->GetPeerName(name, namelen); |
| 381 } | 382 } |
| 382 #endif | 383 #endif |
| 383 | 384 |
| 384 } // namespace net | 385 } // namespace net |
| 385 | 386 |
| OLD | NEW |