From 1b6fe290858004eaab52509d947e1775e22a8f2f Mon Sep 17 00:00:00 2001
From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com>
Date: Thu, 15 Oct 2020 19:17:04 +0800
Subject: [PATCH] refactor: Remove Server argument in IModeController.Start
---
Netch/Controllers/HTTPController.cs | 3 +--
Netch/Controllers/IModeController.cs | 3 +--
Netch/Controllers/MainController.cs | 2 +-
Netch/Controllers/NFController.cs | 2 +-
Netch/Controllers/TUNTAPController.cs | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Netch/Controllers/HTTPController.cs b/Netch/Controllers/HTTPController.cs
index 4435f7e1..92839e4a 100644
--- a/Netch/Controllers/HTTPController.cs
+++ b/Netch/Controllers/HTTPController.cs
@@ -23,10 +23,9 @@ namespace Netch.Controllers
///
/// 启动
///
- /// 服务器
/// 模式
/// 是否启动成功
- public bool Start(Server s, Mode mode)
+ public bool Start(Mode mode)
{
RecordPrevious();
diff --git a/Netch/Controllers/IModeController.cs b/Netch/Controllers/IModeController.cs
index a2fa0028..86c325ec 100644
--- a/Netch/Controllers/IModeController.cs
+++ b/Netch/Controllers/IModeController.cs
@@ -7,9 +7,8 @@ namespace Netch.Controllers
///
/// 启动
///
- /// 服务器
/// 模式
/// 是否成功
- public abstract bool Start(Server s, Mode mode);
+ public abstract bool Start(Mode mode);
}
}
\ No newline at end of file
diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs
index a547d524..dc7322b7 100644
--- a/Netch/Controllers/MainController.cs
+++ b/Netch/Controllers/MainController.cs
@@ -157,7 +157,7 @@ namespace Netch.Controllers
}
Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", ModeController.Name));
- if (await Task.Run(() => ModeController.Start(server, mode)))
+ if (await Task.Run(() => ModeController.Start(mode)))
{
switch (mode.Type)
{
diff --git a/Netch/Controllers/NFController.cs b/Netch/Controllers/NFController.cs
index 64a3f95c..3cb43c0d 100644
--- a/Netch/Controllers/NFController.cs
+++ b/Netch/Controllers/NFController.cs
@@ -45,7 +45,7 @@ namespace Netch.Controllers
BinDriver = "bin\\" + fileName;
}
- public bool Start(Server s, Mode mode)
+ public bool Start(Mode mode)
{
Logging.Info("内置驱动版本: " + Utils.Utils.GetFileVersion(BinDriver));
if (Utils.Utils.GetFileVersion(SystemDriver) != Utils.Utils.GetFileVersion(BinDriver))
diff --git a/Netch/Controllers/TUNTAPController.cs b/Netch/Controllers/TUNTAPController.cs
index 2540633e..328ea9be 100644
--- a/Netch/Controllers/TUNTAPController.cs
+++ b/Netch/Controllers/TUNTAPController.cs
@@ -39,7 +39,7 @@ namespace Netch.Controllers
public override string Name { get; protected set; } = "tun2socks";
public override string MainFile { get; protected set; } = "tun2socks.exe";
- public bool Start(Server s, Mode mode)
+ public bool Start(Mode mode)
{
_savedMode = mode;
_savedServer = MainController.ServerController.Server;