From caa96ad33471434ed63357a9225e60007da7fccd Mon Sep 17 00:00:00 2001
From: Raif Atef <beliskner.github.3psil0N@neverbox.com>
Date: Thu, 17 Aug 2017 11:08:25 +0200
Subject: [PATCH] Fix port range check and move Sip003Plugin.

---
 .../{Proxy => Controller/Service}/Sip003Plugin.cs             | 4 ++--
 shadowsocks-csharp/Controller/ShadowsocksController.cs        | 1 +
 shadowsocks-csharp/shadowsocks-csharp.csproj                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename shadowsocks-csharp/{Proxy => Controller/Service}/Sip003Plugin.cs (97%)

diff --git a/shadowsocks-csharp/Proxy/Sip003Plugin.cs b/shadowsocks-csharp/Controller/Service/Sip003Plugin.cs
similarity index 97%
rename from shadowsocks-csharp/Proxy/Sip003Plugin.cs
rename to shadowsocks-csharp/Controller/Service/Sip003Plugin.cs
index fc745716..afd395c9 100644
--- a/shadowsocks-csharp/Proxy/Sip003Plugin.cs
+++ b/shadowsocks-csharp/Controller/Service/Sip003Plugin.cs
@@ -6,7 +6,7 @@ using System.Net.Sockets;
 using System.Reflection;
 using Shadowsocks.Model;
 
-namespace Shadowsocks.Proxy
+namespace Shadowsocks.Controller.Service
 {
     // https://github.com/shadowsocks/shadowsocks-org/wiki/Plugin
     public sealed class Sip003Plugin : IDisposable
@@ -41,7 +41,7 @@ namespace Shadowsocks.Proxy
             {
                 throw new ArgumentException("Value cannot be null or whitespace.", nameof(serverAddress));
             }
-            if ((uint)serverPort != serverPort)
+            if ((ushort)serverPort != serverPort)
             {
                 throw new ArgumentOutOfRangeException("serverPort");
             }
diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs
index c0d7eaf7..9b27a700 100644
--- a/shadowsocks-csharp/Controller/ShadowsocksController.cs
+++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs
@@ -15,6 +15,7 @@ using Shadowsocks.Model;
 using Shadowsocks.Properties;
 using Shadowsocks.Util;
 using System.Linq;
+using Shadowsocks.Controller.Service;
 using Shadowsocks.Proxy;
 
 namespace Shadowsocks.Controller
diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj
index cde503b2..bf03af1f 100644
--- a/shadowsocks-csharp/shadowsocks-csharp.csproj
+++ b/shadowsocks-csharp/shadowsocks-csharp.csproj
@@ -145,7 +145,7 @@
     <Compile Include="Controller\Strategy\BalancingStrategy.cs" />
     <Compile Include="Controller\Strategy\StrategyManager.cs" />
     <Compile Include="Controller\Strategy\IStrategy.cs" />
-    <Compile Include="Proxy\Sip003Plugin.cs" />
+    <Compile Include="Controller\Service\Sip003Plugin.cs" />
     <Compile Include="Proxy\Socks5Proxy.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="StringEx.cs" />