Max Karolinskiy
270d9bd322
Chromium change: commit be09e054ddeb4d9c402ae6a071143a286a615c9e Author: Mario Sanchez Prada <mario@igalia.com> Date: Thu Apr 4 16:11:22 2019 +0000 Remove net/base/completion_callback.h, which is no longer used After the cleanup work done to migrate away from net::CompletionCallback() and use net::Completion{Once|Repeating}Callback instead, this file is not needed anymore, so let's remove it to prevent accidental new usages of those generic callbacks, and force using the new ones. Bug: 807724
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
|
|
index 58f3d1285ccb685ac9cec62e9cf1b4e1e6b7f024..ccd68a660051632d229d1eb96ec1686ddfe13a4d 100644
|
|
--- a/net/socket/socks5_client_socket.h
|
|
+++ b/net/socket/socks5_client_socket.h
|
|
@@ -77,11 +77,14 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
|
|
int GetLocalAddress(IPEndPoint* address) const override;
|
|
|
|
private:
|
|
+ friend class SOCKS5ClientSocketAuth;
|
|
enum State {
|
|
STATE_GREET_WRITE,
|
|
STATE_GREET_WRITE_COMPLETE,
|
|
STATE_GREET_READ,
|
|
STATE_GREET_READ_COMPLETE,
|
|
+ STATE_AUTH,
|
|
+ STATE_AUTH_COMPLETE,
|
|
STATE_HANDSHAKE_WRITE,
|
|
STATE_HANDSHAKE_WRITE_COMPLETE,
|
|
STATE_HANDSHAKE_READ,
|
|
@@ -116,6 +119,13 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
|
|
int DoGreetReadComplete(int result);
|
|
int DoGreetWrite();
|
|
int DoGreetWriteComplete(int result);
|
|
+ int DoAuth(int result);
|
|
+
|
|
+ // Authentication hooks.
|
|
+ virtual uint8_t auth_method();
|
|
+ virtual int Authenticate(int result,
|
|
+ NetLogWithSource& net_log,
|
|
+ CompletionRepeatingCallback& callback);
|
|
|
|
// Writes the SOCKS handshake buffer into |handshake|
|
|
// and return OK on success.
|