From 28954600a29b2f2e43d8c855a9e0a3cdb0506af8 Mon Sep 17 00:00:00 2001
From: noisyfox <timemanager.rick@gmail.com>
Date: Fri, 16 Dec 2016 12:19:52 +1100
Subject: [PATCH] Revert "Rename Shadowsocks.Proxy -> Shadowsocks.ForwardProxy"

This reverts commit be3cc3f3a67d63560c8e165d4e1fd55cb8e9734d.
---
 shadowsocks-csharp/Controller/Service/TCPRelay.cs      | 10 +++++-----
 .../{ForwardProxy => Proxy}/DirectConnect.cs           |  4 ++--
 .../{ForwardProxy => Proxy}/HttpProxy.cs               |  4 ++--
 .../{ForwardProxy/IForwardProxy.cs => Proxy/IProxy.cs} |  4 ++--
 .../{ForwardProxy => Proxy}/Socks5Proxy.cs             |  4 ++--
 shadowsocks-csharp/shadowsocks-csharp.csproj           |  8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename shadowsocks-csharp/{ForwardProxy => Proxy}/DirectConnect.cs (97%)
 rename shadowsocks-csharp/{ForwardProxy => Proxy}/HttpProxy.cs (98%)
 rename shadowsocks-csharp/{ForwardProxy/IForwardProxy.cs => Proxy/IProxy.cs} (93%)
 rename shadowsocks-csharp/{ForwardProxy => Proxy}/Socks5Proxy.cs (99%)

diff --git a/shadowsocks-csharp/Controller/Service/TCPRelay.cs b/shadowsocks-csharp/Controller/Service/TCPRelay.cs
index a9fae59c..3c41160a 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 IForwardProxy Remote { get; }
+            public IProxy Remote { get; }
 
-            public AsyncSession(IForwardProxy remote)
+            public AsyncSession(IProxy remote)
             {
                 Remote = remote;
             }
@@ -109,7 +109,7 @@ namespace Shadowsocks.Controller
         {
             public T State { get; set; }
 
-            public AsyncSession(IForwardProxy remote, T state) : base(remote)
+            public AsyncSession(IProxy remote, T state) : base(remote)
             {
                 State = state;
             }
@@ -521,7 +521,7 @@ namespace Shadowsocks.Controller
                 CreateRemote();
 
                 // Setting up proxy
-                IForwardProxy remote;
+                IProxy remote;
                 EndPoint proxyEP;
                 if (_config.proxy.useProxy)
                 {
diff --git a/shadowsocks-csharp/ForwardProxy/DirectConnect.cs b/shadowsocks-csharp/Proxy/DirectConnect.cs
similarity index 97%
rename from shadowsocks-csharp/ForwardProxy/DirectConnect.cs
rename to shadowsocks-csharp/Proxy/DirectConnect.cs
index ed64780e..f940fb04 100644
--- a/shadowsocks-csharp/ForwardProxy/DirectConnect.cs
+++ b/shadowsocks-csharp/Proxy/DirectConnect.cs
@@ -4,9 +4,9 @@ using System.Net.Sockets;
 using System.Threading;
 using Shadowsocks.Util.Sockets;
 
-namespace Shadowsocks.ForwardProxy
+namespace Shadowsocks.Proxy
 {
-    public class DirectConnect : IForwardProxy
+    public class DirectConnect : IProxy
     {
         private class FakeAsyncResult : IAsyncResult
         {
diff --git a/shadowsocks-csharp/ForwardProxy/HttpProxy.cs b/shadowsocks-csharp/Proxy/HttpProxy.cs
similarity index 98%
rename from shadowsocks-csharp/ForwardProxy/HttpProxy.cs
rename to shadowsocks-csharp/Proxy/HttpProxy.cs
index cff91beb..5e1138df 100644
--- a/shadowsocks-csharp/ForwardProxy/HttpProxy.cs
+++ b/shadowsocks-csharp/Proxy/HttpProxy.cs
@@ -7,9 +7,9 @@ using System.Threading;
 using Shadowsocks.Controller;
 using Shadowsocks.Util.Sockets;
 
-namespace Shadowsocks.ForwardProxy
+namespace Shadowsocks.Proxy
 {
-    public class HttpProxy : IForwardProxy
+    public class HttpProxy : IProxy
     {
         private class FakeAsyncResult : IAsyncResult
         {
diff --git a/shadowsocks-csharp/ForwardProxy/IForwardProxy.cs b/shadowsocks-csharp/Proxy/IProxy.cs
similarity index 93%
rename from shadowsocks-csharp/ForwardProxy/IForwardProxy.cs
rename to shadowsocks-csharp/Proxy/IProxy.cs
index 29f0afd2..cc76b543 100644
--- a/shadowsocks-csharp/ForwardProxy/IForwardProxy.cs
+++ b/shadowsocks-csharp/Proxy/IProxy.cs
@@ -2,10 +2,10 @@
 using System.Net;
 using System.Net.Sockets;
 
-namespace Shadowsocks.ForwardProxy
+namespace Shadowsocks.Proxy
 {
 
-    public interface IForwardProxy
+    public interface IProxy
     {
         EndPoint LocalEndPoint { get; }
 
diff --git a/shadowsocks-csharp/ForwardProxy/Socks5Proxy.cs b/shadowsocks-csharp/Proxy/Socks5Proxy.cs
similarity index 99%
rename from shadowsocks-csharp/ForwardProxy/Socks5Proxy.cs
rename to shadowsocks-csharp/Proxy/Socks5Proxy.cs
index 8c9dd409..10ac3422 100644
--- a/shadowsocks-csharp/ForwardProxy/Socks5Proxy.cs
+++ b/shadowsocks-csharp/Proxy/Socks5Proxy.cs
@@ -6,9 +6,9 @@ using System.Threading;
 using Shadowsocks.Controller;
 using Shadowsocks.Util.Sockets;
 
-namespace Shadowsocks.ForwardProxy
+namespace Shadowsocks.Proxy
 {
-    public class Socks5Proxy : IForwardProxy
+    public class Socks5Proxy : IProxy
     {
         private class FakeAsyncResult : IAsyncResult
         {
diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj
index b97f29c4..c0156c67 100644
--- a/shadowsocks-csharp/shadowsocks-csharp.csproj
+++ b/shadowsocks-csharp/shadowsocks-csharp.csproj
@@ -148,9 +148,9 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="ForwardProxy\DirectConnect.cs" />
-    <Compile Include="ForwardProxy\HttpProxy.cs" />
-    <Compile Include="ForwardProxy\IForwardProxy.cs" />
+    <Compile Include="Proxy\DirectConnect.cs" />
+    <Compile Include="Proxy\HttpProxy.cs" />
+    <Compile Include="Proxy\IProxy.cs" />
     <Compile Include="Controller\Service\AvailabilityStatistics.cs" />
     <Compile Include="Controller\Strategy\HighAvailabilityStrategy.cs" />
     <Compile Include="Controller\Strategy\StatisticsStrategy.cs" />
@@ -185,7 +185,7 @@
     <Compile Include="Controller\Strategy\BalancingStrategy.cs" />
     <Compile Include="Controller\Strategy\StrategyManager.cs" />
     <Compile Include="Controller\Strategy\IStrategy.cs" />
-    <Compile Include="ForwardProxy\Socks5Proxy.cs" />
+    <Compile Include="Proxy\Socks5Proxy.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="StringEx.cs" />
     <Compile Include="Controller\System\Hotkeys\Hotkeys.cs" />