From 802e7eb8a02701e9ce1a0afaa33a9c5a5bd91d2c Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 28 Feb 2018 23:25:42 +0300
Subject: [PATCH] Fix Socks5.

GitOrigin-RevId: 1a11e4c8c24218ab5fdcb52f695957f30c8109e1
---
 td/telegram/cli.cpp     |  9 ++++++---
 tdnet/td/net/Socks5.cpp | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 72123040..7062f145 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2798,11 +2798,14 @@ class CliClient final : public Actor {
     } else if (op == "sproxy") {
       string server;
       string port;
-      std::tie(server, port) = split(args);
+      string user;
+      string password;
+      std::tie(server, args) = split(args);
+      std::tie(port, args) = split(args);
+      std::tie(user, password) = split(args);
 
       send_request(make_tl_object<td_api::setProxy>(
-          make_tl_object<td_api::proxySocks5>(server.empty() ? "162.213.174.36" : server,
-                                              port.empty() ? 13313 : to_integer<int32>(port), "sosouser", "SoSo23")));
+          make_tl_object<td_api::proxySocks5>(server, to_integer<int32>(port), user, password)));
     } else if (op == "gproxy") {
       send_request(make_tl_object<td_api::getProxy>());
     } else if (op == "SetVerbosity") {
diff --git a/tdnet/td/net/Socks5.cpp b/tdnet/td/net/Socks5.cpp
index 86a21027..02e1e067 100644
--- a/tdnet/td/net/Socks5.cpp
+++ b/tdnet/td/net/Socks5.cpp
@@ -13,6 +13,9 @@
 #include "td/utils/Slice.h"
 
 namespace td {
+
+static int VERBOSITY_NAME(socks5) = VERBOSITY_NAME(DEBUG);
+
 Socks5::Socks5(SocketFd socket_fd, IPAddress ip_address, string username, string password,
                std::unique_ptr<Callback> callback, ActorShared<> parent)
     : fd_(std::move(socket_fd))
@@ -22,15 +25,19 @@ Socks5::Socks5(SocketFd socket_fd, IPAddress ip_address, string username, string
     , callback_(std::move(callback))
     , parent_(std::move(parent)) {
 }
+
 void Socks5::on_error(Status status) {
   CHECK(status.is_error());
+  VLOG(socks5) << "Receive " << status;
   if (callback_) {
     callback_->set_result(std::move(status));
     callback_.reset();
   }
   stop();
 }
+
 void Socks5::tear_down() {
+  VLOG(socks5) << "Finish to connect to proxy";
   unsubscribe(fd_.get_fd());
   fd_.get_fd().set_observer(nullptr);
   if (callback_) {
@@ -44,12 +51,17 @@ void Socks5::hangup() {
 }
 
 void Socks5::start_up() {
+  VLOG(socks5) << "Begin to connect to proxy";
   fd_.get_fd().set_observer(this);
   subscribe(fd_.get_fd());
   set_timeout_in(10);
+  if (can_write(fd_)) {
+    loop();
+  }
 }
 
 void Socks5::send_greeting() {
+  VLOG(socks5) << "Send greeting to proxy";
   CHECK(state_ == State::SendGreeting);
   state_ = State::WaitGreetingResponse;
 
@@ -68,6 +80,7 @@ void Socks5::send_greeting() {
 
 Status Socks5::wait_greeting_response() {
   auto &buf = fd_.input_buffer();
+  VLOG(socks5) << "Receive greeting response of size " << buf.size();
   if (buf.size() < 2) {
     return Status::OK();
   }
@@ -89,6 +102,7 @@ Status Socks5::wait_greeting_response() {
 }
 
 Status Socks5::send_username_password() {
+  VLOG(socks5) << "Send username and password";
   if (username_.size() >= 128) {
     return Status::Error("Username is too long");
   }
@@ -110,6 +124,7 @@ Status Socks5::send_username_password() {
 
 Status Socks5::wait_password_response() {
   auto &buf = fd_.input_buffer();
+  VLOG(socks5) << "Receive password response of size " << buf.size();
   if (buf.size() < 2) {
     return Status::OK();
   }
@@ -128,6 +143,7 @@ Status Socks5::wait_password_response() {
 }
 
 void Socks5::send_ip_address() {
+  VLOG(socks5) << "Send IP address";
   CHECK(state_ == State::SendIpAddress);
   callback_->on_connected();
   string request;
@@ -155,6 +171,7 @@ void Socks5::send_ip_address() {
 Status Socks5::wait_ip_address_response() {
   CHECK(state_ == State::WaitIpAddressResponse);
   auto it = fd_.input_buffer().clone();
+  VLOG(socks5) << "Receive IP address response of size " << it.size();
   if (it.size() < 4) {
     return Status::OK();
   }
@@ -224,7 +241,9 @@ void Socks5::loop() {
     on_error(Status::Error("Connection closed"));
   }
 }
+
 void Socks5::timeout_expired() {
   on_error(Status::Error("Timeout expired"));
 }
+
 }  // namespace td