Browse Source

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>
tags/3.3.2
Syrone Wong 8 years ago
parent
commit
41eb43b54e
1 changed files with 4 additions and 18 deletions
  1. +4
    -18
      shadowsocks-csharp/Controller/Service/TCPRelay.cs

+ 4
- 18
shadowsocks-csharp/Controller/Service/TCPRelay.cs View File

@@ -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();
}
}


Loading…
Cancel
Save