From 41eb43b54e794f12717e127803f4170d8a7e8540 Mon Sep 17 00:00:00 2001
From: Syrone Wong <wong.syrone@gmail.com>
Date: Thu, 29 Sep 2016 14:16:01 +0800
Subject: [PATCH] Drop retry connect

Shadowsocks don't need to reconnect, which is the software's
responsibility to retry.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
---
 .../Controller/Service/TCPRelay.cs            | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/shadowsocks-csharp/Controller/Service/TCPRelay.cs b/shadowsocks-csharp/Controller/Service/TCPRelay.cs
index c9e1ed25..49197251 100644
--- a/shadowsocks-csharp/Controller/Service/TCPRelay.cs
+++ b/shadowsocks-csharp/Controller/Service/TCPRelay.cs
@@ -139,8 +139,6 @@ namespace Shadowsocks.Controller
 
         private AsyncSession _currentRemoteSession;
 
-        private const int   MaxRetry = 4;
-        private int         _retryCount = 0;
         private bool        _proxyConnected;
         private bool        _destConnected;
 
@@ -481,7 +479,7 @@ namespace Shadowsocks.Controller
 
             Logging.Info($"Proxy {proxy.ProxyEndPoint} timed out");
             proxy.Close();
-            RetryConnect();
+            Close();
         }
 
         private void ProxyConnectCallback(IAsyncResult ar)
@@ -534,7 +532,7 @@ namespace Shadowsocks.Controller
             catch (Exception e)
             {
                 Logging.LogUsefulException(e);
-                RetryConnect();
+                Close();
             }
         }
 
@@ -556,19 +554,7 @@ namespace Shadowsocks.Controller
             strategy?.SetFailure(server);
             Logging.Info($"{server.FriendlyName()} timed out");
             session.Remote.Close();
-            RetryConnect();
-        }
-
-        private void RetryConnect()
-        {
-            if (_retryCount < MaxRetry)
-            {
-                Logging.Debug($"Connection failed, retry ({_retryCount})");
-                StartConnect();
-                _retryCount++;
-            }
-            else
-                Close();
+            Close();
         }
 
         private void ConnectCallback(IAsyncResult ar)
@@ -612,7 +598,7 @@ namespace Shadowsocks.Controller
                     strategy?.SetFailure(_server);
                 }
                 Logging.LogUsefulException(e);
-                RetryConnect();
+                Close();
             }
         }