Refactor: name, namespace

zyx486013 · Apr 30, 2021 · fb64951 · fb64951
1 parent 258880e
commit fb64951
Show file tree

Hide file tree

Showing 33 changed files with 133 additions and 111 deletions.
diff --git a/Netch/Controllers/DNSController.cs b/Netch/Controllers/DNSController.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
-using static Netch.Interops.AioDNSInterops;
+using Netch.Interfaces;
+using static Netch.Interops.AioDNS;
 
 namespace Netch.Controllers
 {

diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs
@@ -1,9 +1,10 @@
-using Netch.Models;
-using Netch.Servers.Socks5;
-using Netch.Utils;
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Netch.Interfaces;
+using Netch.Models;
+using Netch.Servers.Socks5;
+using Netch.Utils;
 
 namespace Netch.Controllers
 {

diff --git a/Netch/Controllers/NFController.cs b/Netch/Controllers/NFController.cs
@@ -1,14 +1,15 @@
-using Netch.Interops;
-using Netch.Models;
-using Netch.Servers.Shadowsocks;
-using Netch.Servers.Socks5;
-using Netch.Utils;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.ServiceProcess;
-using static Netch.Interops.RedirectorInterop;
+using Netch.Interfaces;
+using Netch.Interops;
+using Netch.Models;
+using Netch.Servers.Shadowsocks;
+using Netch.Servers.Socks5;
+using Netch.Utils;
+using static Netch.Interops.Redirector;
 
 namespace Netch.Controllers
 {

diff --git a/Netch/Controllers/NTTController.cs b/Netch/Controllers/NTTController.cs
@@ -1,8 +1,9 @@
-using Netch.Utils;
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Netch.Interfaces;
+using Netch.Utils;
 
 namespace Netch.Controllers
 {

diff --git a/Netch/Controllers/PcapController.cs b/Netch/Controllers/PcapController.cs
@@ -1,13 +1,15 @@
-using Netch.Forms;
-using Netch.Models;
-using Netch.Servers.Socks5;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Netch.Forms;
+using Netch.Interfaces;
+using Netch.Models;
+using Netch.Models.Adapter;
+using Netch.Servers.Socks5;
 
 namespace Netch.Controllers
 {

diff --git a/Netch/Controllers/TUNController.cs b/Netch/Controllers/TUNController.cs
@@ -1,14 +1,16 @@
-using Netch.Models;
-using Netch.Servers.Socks5;
-using Netch.Utils;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
-using static Netch.Interops.TUNInterop;
+using Netch.Interfaces;
+using Netch.Interops;
+using Netch.Models;
+using Netch.Models.Adapter;
+using Netch.Servers.Socks5;
+using Netch.Utils;
+using static Netch.Interops.tun2socks;
 
 namespace Netch.Controllers
 {
@@ -98,7 +100,7 @@ public void Start(in Mode mode)
                     break;
             }
 
-            NativeMethods.CreateUnicastIP(AddressFamily.InterNetwork,
+            RouteHelper.CreateUnicastIP(AddressFamily.InterNetwork,
                 Global.Settings.TUNTAP.Address,
                 (byte) Utils.Utils.SubnetToCidr(Global.Settings.TUNTAP.Netmask),
                 _tunAdapter.InterfaceIndex);
@@ -268,13 +270,13 @@ private bool RouteAction(Action action, in string ipNetwork, RouteType routeType
             switch (action)
             {
                 case Action.Create:
-                    result = NativeMethods.CreateRoute(AddressFamily.InterNetwork, ip, (byte) cidr, gateway, index, metric);
+                    result = RouteHelper.CreateRoute(AddressFamily.InterNetwork, ip, (byte) cidr, gateway, index, metric);
                     if (record)
                         ipList.Add(ipNetwork);
 
                     break;
                 case Action.Delete:
-                    result = NativeMethods.DeleteRoute(AddressFamily.InterNetwork, ip, (byte) cidr, gateway, index, metric);
+                    result = RouteHelper.DeleteRoute(AddressFamily.InterNetwork, ip, (byte) cidr, gateway, index, metric);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(action), action, null);

diff --git a/Netch/Models/IAdapter.cs → Netch/Interfaces/IAdapter.cs b/Netch/Models/IAdapter.cs → Netch/Interfaces/IAdapter.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using System.Net.NetworkInformation;
 
-namespace Netch.Models
+namespace Netch.Interfaces
 {
     public interface IAdapter
     {

diff --git a/Netch/Controllers/IController.cs → Netch/Interfaces/IController.cs b/Netch/Controllers/IController.cs → Netch/Interfaces/IController.cs
@@ -1,4 +1,4 @@
-namespace Netch.Controllers
+namespace Netch.Interfaces
 {
     public interface IController
     {

diff --git a/Netch/Controllers/IModeController.cs → Netch/Interfaces/IModeController.cs b/Netch/Controllers/IModeController.cs → Netch/Interfaces/IModeController.cs
@@ -1,6 +1,6 @@
 using Netch.Models;
 
-namespace Netch.Controllers
+namespace Netch.Interfaces
 {
     public interface IModeController : IController
     {

diff --git a/Netch/Controllers/IServerController.cs → Netch/Interfaces/IServerController.cs b/Netch/Controllers/IServerController.cs → Netch/Interfaces/IServerController.cs
@@ -1,6 +1,6 @@
 using Netch.Models;
 
-namespace Netch.Controllers
+namespace Netch.Interfaces
 {
     public interface IServerController : IController
     {

diff --git a/Netch/Models/IServerUtil.cs → Netch/Interfaces/IServerUtil.cs b/Netch/Models/IServerUtil.cs → Netch/Interfaces/IServerUtil.cs
@@ -1,8 +1,8 @@
-using Netch.Controllers;
-using System;
+using System;
 using System.Collections.Generic;
+using Netch.Models;
 
-namespace Netch.Models
+namespace Netch.Interfaces
 {
     public interface IServerUtil
     {

diff --git a/Netch/Interops/AioDNSInterops.cs → Netch/Interops/AioDNS.cs b/Netch/Interops/AioDNSInterops.cs → Netch/Interops/AioDNS.cs
@@ -3,7 +3,7 @@
 
 namespace Netch.Interops
 {
-    public static class AioDNSInterops
+    public static class AioDNS
     {
         private const string aiodns_bin = "aiodns.bin";
 

diff --git a/Netch/Interops/RedirectorInterop.cs → Netch/Interops/Redirector.cs b/Netch/Interops/RedirectorInterop.cs → Netch/Interops/Redirector.cs
@@ -2,7 +2,7 @@
 
 namespace Netch.Interops
 {
-    public static class RedirectorInterop
+    public static class Redirector
     {
         public enum NameList
         {

diff --git a/Netch/Interops/RouteHelper.cs b/Netch/Interops/RouteHelper.cs
@@ -0,0 +1,26 @@
+using System.Net.Sockets;
+using System.Runtime.InteropServices;
+
+namespace Netch.Interops
+{
+    public static class RouteHelper
+    {
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
+        public static extern ulong ConvertLuidToIndex(ulong id);
+
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
+        public static extern bool CreateIPv4(string address, string netmask, ulong index);
+
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
+        public static extern bool CreateUnicastIP(AddressFamily inet, string address, byte cidr, ulong index);
+
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
+        public static extern bool RefreshIPTable(AddressFamily inet, ulong index);
+
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
+        public static extern bool CreateRoute(AddressFamily inet, string address, byte cidr, string gateway, ulong index, int metric);
+
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
+        public static extern bool DeleteRoute(AddressFamily inet, string address, byte cidr, string gateway, ulong index, int metric);
+    }
+}
diff --git a/Netch/Interops/TUNInterop.cs → Netch/Interops/tun2socks.cs b/Netch/Interops/TUNInterop.cs → Netch/Interops/tun2socks.cs
@@ -3,7 +3,7 @@
 
 namespace Netch.Interops
 {
-    public static class TUNInterop
+    public static class tun2socks
     {
         public enum NameList
         {

diff --git a/Netch/Models/OutboundAdapter.cs → Netch/Models/Adapter/OutboundAdapter.cs b/Netch/Models/OutboundAdapter.cs → Netch/Models/Adapter/OutboundAdapter.cs
@@ -2,9 +2,10 @@
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
+using Netch.Interfaces;
 using Vanara.PInvoke;
 
-namespace Netch.Models
+namespace Netch.Models.Adapter
 {
     public class OutboundAdapter : IAdapter
     {

diff --git a/Netch/Models/TunAdapter.cs → Netch/Models/Adapter/TunAdapter.cs b/Netch/Models/TunAdapter.cs → Netch/Models/Adapter/TunAdapter.cs
@@ -1,15 +1,16 @@
-using Netch.Interops;
-using System.Linq;
+using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
+using Netch.Interfaces;
+using Netch.Interops;
 
-namespace Netch.Models
+namespace Netch.Models.Adapter
 {
     public class TunAdapter : IAdapter
     {
         public TunAdapter()
         {
-            InterfaceIndex = NativeMethods.ConvertLuidToIndex(TUNInterop.tun_luid());
+            InterfaceIndex = RouteHelper.ConvertLuidToIndex(tun2socks.tun_luid());
             NetworkInterface = NetworkInterface.GetAllNetworkInterfaces().First(i => i.GetIPProperties().GetIPv4Properties().Index == (int)InterfaceIndex);
             Gateway = IPAddress.Parse(Global.Settings.TUNTAP.Gateway);
 

diff --git a/Netch/Models/Range.cs → Netch/Models/NumberRange.cs b/Netch/Models/Range.cs → Netch/Models/NumberRange.cs
@@ -1,12 +1,12 @@
 namespace Netch.Models
 {
-    public readonly struct Range
+    public readonly struct NumberRange
     {
         public int Start { get; }
 
         public int End { get; }
 
-        public Range(int start, int end)
+        public NumberRange(int start, int end)
         {
             Start = start;
             End = end;

diff --git a/Netch/NativeMethods.cs b/Netch/NativeMethods.cs
@@ -1,29 +1,10 @@
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
 namespace Netch
 {
     public static class NativeMethods
     {
         [DllImport("dnsapi", EntryPoint = "DnsFlushResolverCache")]
         public static extern uint RefreshDNSCache();
-
-        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern ulong ConvertLuidToIndex(ulong id);
-
-        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool CreateIPv4(string address, string netmask, ulong index);
-
-        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool CreateUnicastIP(AddressFamily inet, string address, byte cidr, ulong index);
-
-        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool RefreshIPTable(AddressFamily inet, ulong index);
-
-        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool CreateRoute(AddressFamily inet, string address, byte cidr, string gateway, ulong index, int metric);
-
-        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool DeleteRoute(AddressFamily inet, string address, byte cidr, string gateway, ulong index, int metric);
     }
 }
diff --git a/Netch/Servers/Shadowsocks/SSController.cs b/Netch/Servers/Shadowsocks/SSController.cs
@@ -1,6 +1,7 @@
+using System.Collections.Generic;
 using Netch.Controllers;
+using Netch.Interfaces;
 using Netch.Models;
-using System.Collections.Generic;
 
 namespace Netch.Servers.Shadowsocks
 {

diff --git a/Netch/Servers/Shadowsocks/SSUtil.cs b/Netch/Servers/Shadowsocks/SSUtil.cs
@@ -1,14 +1,14 @@
-using Netch.Controllers;
-using Netch.Models;
-using Netch.Servers.Shadowsocks.Form;
-using Netch.Servers.Shadowsocks.Models.SSD;
-using Netch.Utils;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Web;
+using Netch.Interfaces;
+using Netch.Models;
+using Netch.Servers.Shadowsocks.Form;
+using Netch.Servers.Shadowsocks.Models.SSD;
+using Netch.Utils;
 
 namespace Netch.Servers.Shadowsocks
 {

diff --git a/Netch/Servers/ShadowsocksR/SSRController.cs b/Netch/Servers/ShadowsocksR/SSRController.cs
@@ -1,6 +1,7 @@
+using System.Collections.Generic;
 using Netch.Controllers;
+using Netch.Interfaces;
 using Netch.Models;
-using System.Collections.Generic;
 
 namespace Netch.Servers.ShadowsocksR
 {

diff --git a/Netch/Servers/ShadowsocksR/SSRUtil.cs b/Netch/Servers/ShadowsocksR/SSRUtil.cs
@@ -1,11 +1,11 @@
-using Netch.Controllers;
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using Netch.Interfaces;
 using Netch.Models;
 using Netch.Servers.Shadowsocks;
 using Netch.Servers.ShadowsocksR.Form;
 using Netch.Utils;
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
 
 namespace Netch.Servers.ShadowsocksR
 {

diff --git a/Netch/Servers/Socks5/S5Util.cs b/Netch/Servers/Socks5/S5Util.cs
@@ -1,9 +1,9 @@
-using Netch.Controllers;
-using Netch.Models;
-using Netch.Servers.Socks5.Form;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Netch.Interfaces;
+using Netch.Models;
+using Netch.Servers.Socks5.Form;
 
 namespace Netch.Servers.Socks5
 {

diff --git a/Netch/Servers/Trojan/TrojanController.cs b/Netch/Servers/Trojan/TrojanController.cs
@@ -1,9 +1,10 @@
-using Netch.Controllers;
-using Netch.Models;
-using Netch.Servers.Trojan.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
+using Netch.Controllers;
+using Netch.Interfaces;
+using Netch.Models;
+using Netch.Servers.Trojan.Models;
 
 namespace Netch.Servers.Trojan
 {