diff --git a/shadowsocks-csharp/Controller/Service/TCPRelay.cs b/shadowsocks-csharp/Controller/Service/TCPRelay.cs
index 9640caa4..c34ade81 100644
--- a/shadowsocks-csharp/Controller/Service/TCPRelay.cs
+++ b/shadowsocks-csharp/Controller/Service/TCPRelay.cs
@@ -7,8 +7,8 @@ using System.Timers;
using Shadowsocks.Controller.Strategy;
using Shadowsocks.Encryption;
+using Shadowsocks.ForwardProxy;
using Shadowsocks.Model;
-using Shadowsocks.Proxy;
using Shadowsocks.Util.Sockets;
namespace Shadowsocks.Controller
@@ -97,9 +97,9 @@ namespace Shadowsocks.Controller
{
class AsyncSession
{
- public IProxy Remote { get; }
+ public IForwardProxy Remote { get; }
- public AsyncSession(IProxy remote)
+ public AsyncSession(IForwardProxy remote)
{
Remote = remote;
}
@@ -109,7 +109,7 @@ namespace Shadowsocks.Controller
{
public T State { get; set; }
- public AsyncSession(IProxy remote, T state) : base(remote)
+ public AsyncSession(IForwardProxy remote, T state) : base(remote)
{
State = state;
}
@@ -516,7 +516,7 @@ namespace Shadowsocks.Controller
CreateRemote();
// Setting up proxy
- IProxy remote;
+ IForwardProxy remote;
EndPoint proxyEP;
if (_config.proxy.useProxy)
{
diff --git a/shadowsocks-csharp/Proxy/DirectConnect.cs b/shadowsocks-csharp/ForwardProxy/DirectConnect.cs
similarity index 97%
rename from shadowsocks-csharp/Proxy/DirectConnect.cs
rename to shadowsocks-csharp/ForwardProxy/DirectConnect.cs
index f940fb04..ed64780e 100644
--- a/shadowsocks-csharp/Proxy/DirectConnect.cs
+++ b/shadowsocks-csharp/ForwardProxy/DirectConnect.cs
@@ -4,9 +4,9 @@ using System.Net.Sockets;
using System.Threading;
using Shadowsocks.Util.Sockets;
-namespace Shadowsocks.Proxy
+namespace Shadowsocks.ForwardProxy
{
- public class DirectConnect : IProxy
+ public class DirectConnect : IForwardProxy
{
private class FakeAsyncResult : IAsyncResult
{
diff --git a/shadowsocks-csharp/Proxy/HttpProxy.cs b/shadowsocks-csharp/ForwardProxy/HttpProxy.cs
similarity index 98%
rename from shadowsocks-csharp/Proxy/HttpProxy.cs
rename to shadowsocks-csharp/ForwardProxy/HttpProxy.cs
index d314eb93..bdabdb9c 100644
--- a/shadowsocks-csharp/Proxy/HttpProxy.cs
+++ b/shadowsocks-csharp/ForwardProxy/HttpProxy.cs
@@ -7,9 +7,9 @@ using System.Threading;
using Shadowsocks.Controller;
using Shadowsocks.Util.Sockets;
-namespace Shadowsocks.Proxy
+namespace Shadowsocks.ForwardProxy
{
- public class HttpProxy : IProxy
+ public class HttpProxy : IForwardProxy
{
private class FakeAsyncResult : IAsyncResult
{
diff --git a/shadowsocks-csharp/Proxy/IProxy.cs b/shadowsocks-csharp/ForwardProxy/IForwardProxy.cs
similarity index 93%
rename from shadowsocks-csharp/Proxy/IProxy.cs
rename to shadowsocks-csharp/ForwardProxy/IForwardProxy.cs
index cc76b543..29f0afd2 100644
--- a/shadowsocks-csharp/Proxy/IProxy.cs
+++ b/shadowsocks-csharp/ForwardProxy/IForwardProxy.cs
@@ -2,10 +2,10 @@
using System.Net;
using System.Net.Sockets;
-namespace Shadowsocks.Proxy
+namespace Shadowsocks.ForwardProxy
{
- public interface IProxy
+ public interface IForwardProxy
{
EndPoint LocalEndPoint { get; }
diff --git a/shadowsocks-csharp/Proxy/Socks5Proxy.cs b/shadowsocks-csharp/ForwardProxy/Socks5Proxy.cs
similarity index 99%
rename from shadowsocks-csharp/Proxy/Socks5Proxy.cs
rename to shadowsocks-csharp/ForwardProxy/Socks5Proxy.cs
index 10ac3422..8c9dd409 100644
--- a/shadowsocks-csharp/Proxy/Socks5Proxy.cs
+++ b/shadowsocks-csharp/ForwardProxy/Socks5Proxy.cs
@@ -6,9 +6,9 @@ using System.Threading;
using Shadowsocks.Controller;
using Shadowsocks.Util.Sockets;
-namespace Shadowsocks.Proxy
+namespace Shadowsocks.ForwardProxy
{
- public class Socks5Proxy : IProxy
+ public class Socks5Proxy : IForwardProxy
{
private class FakeAsyncResult : IAsyncResult
{
diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj
index 8379fe5f..ca225692 100644
--- a/shadowsocks-csharp/shadowsocks-csharp.csproj
+++ b/shadowsocks-csharp/shadowsocks-csharp.csproj
@@ -148,9 +148,9 @@
True
Settings.settings
-
-
-
+
+
+
@@ -185,7 +185,7 @@
-
+