From d5f24df128a8a3000f128b13507c0e8ef06b5f45 Mon Sep 17 00:00:00 2001 From: Syrone Wong Date: Thu, 29 Sep 2016 09:07:47 +0800 Subject: [PATCH] Don't suppress exceptions It is better to log them. Signed-off-by: Syrone Wong --- shadowsocks-csharp/Controller/Service/TCPRelay.cs | 10 +++++----- shadowsocks-csharp/Proxy/DirectConnect.cs | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/shadowsocks-csharp/Controller/Service/TCPRelay.cs b/shadowsocks-csharp/Controller/Service/TCPRelay.cs index 12cf0a06..3ad3f4a3 100644 --- a/shadowsocks-csharp/Controller/Service/TCPRelay.cs +++ b/shadowsocks-csharp/Controller/Service/TCPRelay.cs @@ -218,8 +218,8 @@ namespace Shadowsocks.Controller } try { - _connection?.Shutdown(SocketShutdown.Both); - _connection?.Close(); + _connection.Shutdown(SocketShutdown.Both); + _connection.Close(); } catch (Exception e) { @@ -227,9 +227,9 @@ namespace Shadowsocks.Controller } try { - var remote = _currentRemoteSession?.Remote; - remote?.Shutdown(SocketShutdown.Both); - remote?.Close(); + var remote = _currentRemoteSession.Remote; + remote.Shutdown(SocketShutdown.Both); + remote.Close(); } catch (Exception e) { diff --git a/shadowsocks-csharp/Proxy/DirectConnect.cs b/shadowsocks-csharp/Proxy/DirectConnect.cs index 22f5d610..f940fb04 100644 --- a/shadowsocks-csharp/Proxy/DirectConnect.cs +++ b/shadowsocks-csharp/Proxy/DirectConnect.cs @@ -67,7 +67,7 @@ namespace Shadowsocks.Proxy public void BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback callback, object state) { - _remote?.BeginSend(buffer, offset, size, socketFlags, callback, state); + _remote.BeginSend(buffer, offset, size, socketFlags, callback, state); } public int EndSend(IAsyncResult asyncResult) @@ -78,7 +78,7 @@ namespace Shadowsocks.Proxy public void BeginReceive(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback callback, object state) { - _remote?.BeginReceive(buffer, offset, size, socketFlags, callback, state); + _remote.BeginReceive(buffer, offset, size, socketFlags, callback, state); } public int EndReceive(IAsyncResult asyncResult) @@ -88,12 +88,12 @@ namespace Shadowsocks.Proxy public void Shutdown(SocketShutdown how) { - _remote?.Shutdown(how); + _remote.Shutdown(how); } public void Close() { - _remote?.Dispose(); + _remote.Dispose(); } } }