Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cfaabe3

Browse files
Connection RefusedConnection Refused
Connection Refused
authored and
Connection Refused
committed
Replace Objects to Models
1 parent c3bd46d commit cfaabe3

26 files changed

+130
-186
lines changed

‎Netch/Controllers/HTTPController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class HTTPController
1616
/// <param name="server">服务器</param>
1717
/// <param name="mode">模式</param>
1818
/// <returns>是否启动成功</returns>
19-
public bool Start(Objects.Server server, Objects.Mode mode)
19+
public bool Start(Models.Server server, Models.Mode mode)
2020
{
2121
try
2222
{

‎Netch/Controllers/MainController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static Process GetProcess()
5757
/// <param name="server">服务器</param>
5858
/// <param name="mode">模式</param>
5959
/// <returns>是否启动成功</returns>
60-
public bool Start(Objects.Server server, Objects.Mode mode)
60+
public bool Start(Models.Server server, Models.Mode mode)
6161
{
6262
var result = false;
6363
switch (server.Type)

‎Netch/Controllers/NFController.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ public class NFController
2929
/// <summary>
3030
/// 当前装填
3131
/// </summary>
32-
public Objects.State State = Objects.State.Waiting;
32+
public Models.State State = Models.State.Waiting;
3333

3434
/// <summary>
3535
/// 启动
3636
/// </summary>
3737
/// <param name="server">服务器</param>
3838
/// <param name="mode">模式</param>
3939
/// <returns>是否成功</returns>
40-
public bool Start(Objects.Server server, Objects.Mode mode)
40+
public bool Start(Models.Server server, Models.Mode mode)
4141
{
4242
if (!File.Exists("bin\\Redirector.exe"))
4343
{
@@ -149,20 +149,20 @@ public bool Start(Objects.Server server, Objects.Mode mode)
149149

150150
Instance.OutputDataReceived += OnOutputDataReceived;
151151
Instance.ErrorDataReceived += OnOutputDataReceived;
152-
State = Objects.State.Starting;
152+
State = Models.State.Starting;
153153
Instance.Start();
154154
Instance.BeginOutputReadLine();
155155
Instance.BeginErrorReadLine();
156156
for (int i = 0; i < 1000; i++)
157157
{
158158
Thread.Sleep(10);
159159

160-
if (State == Objects.State.Started)
160+
if (State == Models.State.Started)
161161
{
162162
return true;
163163
}
164164

165-
if (State == Objects.State.Stopped)
165+
if (State == Models.State.Stopped)
166166
{
167167
Utils.Logging.Info("NF 进程启动失败");
168168

@@ -202,22 +202,22 @@ public void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
202202
{
203203
File.AppendAllText("logging\\redirector.log", String.Format("{0}\r\n", e.Data));
204204

205-
if (State == Objects.State.Starting)
205+
if (State == Models.State.Starting)
206206
{
207207
if (Instance.HasExited)
208208
{
209-
State = Objects.State.Stopped;
209+
State = Models.State.Stopped;
210210
}
211211
else if (e.Data.Contains("Started"))
212212
{
213-
State = Objects.State.Started;
213+
State = Models.State.Started;
214214
}
215215
else if (e.Data.Contains("Failed") || e.Data.Contains("Unable"))
216216
{
217-
State = Objects.State.Stopped;
217+
State = Models.State.Stopped;
218218
}
219219
}
220-
else if (State == Objects.State.Started)
220+
else if (State == Models.State.Started)
221221
{
222222
if (e.Data.StartsWith("[Application][Bandwidth]"))
223223
{

‎Netch/Controllers/PrivoxyController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class PrivoxyController
1717
/// <param name="server">服务器</param>
1818
/// <param name="mode">模式</param>
1919
/// <returns>是否启动成功</returns>
20-
public bool Start(Objects.Server server, Objects.Mode mode)
20+
public bool Start(Models.Server server, Models.Mode mode)
2121
{
2222
foreach (var proc in Process.GetProcessesByName("Privoxy"))
2323
{

‎Netch/Controllers/TUNTAPController.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class TUNTAPController
1717
/// <summary>
1818
/// 当前状态
1919
/// </summary>
20-
public Objects.State State = Objects.State.Waiting;
20+
public Models.State State = Models.State.Waiting;
2121

2222
/// <summary>
2323
/// 服务器 IP 地址
@@ -27,8 +27,8 @@ public class TUNTAPController
2727
/// <summary>
2828
/// 保存传入的规则
2929
/// </summary>
30-
public Objects.Server SavedServer = new Objects.Server();
31-
public Objects.Mode SavedMode = new Objects.Mode();
30+
public Models.Server SavedServer = new Models.Server();
31+
public Models.Mode SavedMode = new Models.Mode();
3232

3333

3434
/// <summary>
@@ -105,7 +105,7 @@ public bool SetupBypass()
105105
// 创建默认路由
106106
if (!NativeMethods.CreateRoute("0.0.0.0", 0, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index, 10))
107107
{
108-
State = Objects.State.Stopped;
108+
State = Models.State.Stopped;
109109

110110
foreach (var address in ServerAddresses)
111111
{
@@ -226,7 +226,7 @@ public bool ClearBypass()
226226
/// </summary>
227227
/// <param name="server">配置</param>
228228
/// <returns>是否成功</returns>
229-
public bool Start(Objects.Server server, Objects.Mode mode)
229+
public bool Start(Models.Server server, Models.Mode mode)
230230
{
231231
foreach (var proc in Process.GetProcessesByName("tun2socks"))
232232
{
@@ -302,7 +302,7 @@ public bool Start(Objects.Server server, Objects.Mode mode)
302302
Instance.ErrorDataReceived += OnOutputDataReceived;
303303
Instance.OutputDataReceived += OnOutputDataReceived;
304304

305-
State = Objects.State.Starting;
305+
State = Models.State.Starting;
306306
Instance.Start();
307307
Instance.BeginErrorReadLine();
308308
Instance.BeginOutputReadLine();
@@ -312,12 +312,12 @@ public bool Start(Objects.Server server, Objects.Mode mode)
312312
{
313313
Thread.Sleep(10);
314314

315-
if (State == Objects.State.Started)
315+
if (State == Models.State.Started)
316316
{
317317
return true;
318318
}
319319

320-
if (State == Objects.State.Stopped)
320+
if (State == Models.State.Stopped)
321321
{
322322
Stop();
323323
return false;
@@ -354,15 +354,15 @@ public void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
354354
{
355355
File.AppendAllText("logging\\tun2socks.log", String.Format("{0}\r\n", e.Data.Trim()));
356356

357-
if (State == Objects.State.Starting)
357+
if (State == Models.State.Starting)
358358
{
359359
if (e.Data.Contains("Running"))
360360
{
361-
State = Objects.State.Started;
361+
State = Models.State.Started;
362362
}
363363
else if (e.Data.Contains("failed") || e.Data.Contains("invalid vconfig file"))
364364
{
365-
State = Objects.State.Stopped;
365+
State = Models.State.Stopped;
366366
}
367367
}
368368
}

‎Netch/Controllers/VMessController.cs‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ public class VMessController
1616
/// <summary>
1717
/// 当前状态
1818
/// </summary>
19-
public Objects.State State = Objects.State.Waiting;
19+
public Models.State State = Models.State.Waiting;
2020

2121
/// <summary>
2222
/// 启动
2323
/// </summary>
2424
/// <param name="server">服务器</param>
2525
/// <param name="mode">模式</param>
2626
/// <returns>是否启动成功</returns>
27-
public bool Start(Objects.Server server, Objects.Mode mode)
27+
public bool Start(Models.Server server, Models.Mode mode)
2828
{
2929
if (!File.Exists("bin\\v2ray.exe") || !File.Exists("bin\\v2ctl.exe"))
3030
{
@@ -36,32 +36,32 @@ public bool Start(Objects.Server server, Objects.Mode mode)
3636
Directory.CreateDirectory("data");
3737
}
3838

39-
File.WriteAllText("data\\last.json", Newtonsoft.Json.JsonConvert.SerializeObject(new Objects.Information.VMess.Config()
39+
File.WriteAllText("data\\last.json", Newtonsoft.Json.JsonConvert.SerializeObject(new Models.Information.VMess.Config()
4040
{
41-
inbounds = new List<Objects.Information.VMess.Inbounds>()
41+
inbounds = new List<Models.Information.VMess.Inbounds>()
4242
{
43-
new Objects.Information.VMess.Inbounds()
43+
new Models.Information.VMess.Inbounds()
4444
{
45-
settings = new Objects.Information.VMess.InboundSettings(),
45+
settings = new Models.Information.VMess.InboundSettings(),
4646
port = Global.Settings.Socks5LocalPort,
4747
listen = Global.Settings.LocalAddress
4848
}
4949
},
50-
outbounds = new List<Objects.Information.VMess.Outbounds>()
50+
outbounds = new List<Models.Information.VMess.Outbounds>()
5151
{
52-
new Objects.Information.VMess.Outbounds()
52+
new Models.Information.VMess.Outbounds()
5353
{
54-
settings = new Objects.Information.VMess.OutboundSettings()
54+
settings = new Models.Information.VMess.OutboundSettings()
5555
{
56-
vnext = new List<Objects.Information.VMess.VNext>()
56+
vnext = new List<Models.Information.VMess.VNext>()
5757
{
58-
new Objects.Information.VMess.VNext()
58+
new Models.Information.VMess.VNext()
5959
{
6060
address = server.Address,
6161
port = server.Port,
62-
users = new List<Objects.Information.VMess.User>
62+
users = new List<Models.Information.VMess.User>
6363
{
64-
new Objects.Information.VMess.User()
64+
new Models.Information.VMess.User()
6565
{
6666
id = server.UserID,
6767
alterId = server.AlterID,
@@ -71,59 +71,59 @@ public bool Start(Objects.Server server, Objects.Mode mode)
7171
}
7272
}
7373
},
74-
streamSettings = new Objects.Information.VMess.StreamSettings()
74+
streamSettings = new Models.Information.VMess.StreamSettings()
7575
{
7676
network = server.TransferProtocol,
7777
security = server.TLSSecure == true ? "tls" : "",
78-
wsSettings = server.TransferProtocol == "ws" ? new Objects.Information.VMess.WebSocketSettings()
78+
wsSettings = server.TransferProtocol == "ws" ? new Models.Information.VMess.WebSocketSettings()
7979
{
8080
path = server.Path == "" ? "/" : server.Path,
81-
headers = new Objects.Information.VMess.WSHeaders()
81+
headers = new Models.Information.VMess.WSHeaders()
8282
{
8383
Host = server.Host == "" ? server.Address : server.Host
8484
}
8585
} : null,
86-
tcpSettings = server.FakeType == "http" ? new Objects.Information.VMess.TCPSettings()
86+
tcpSettings = server.FakeType == "http" ? new Models.Information.VMess.TCPSettings()
8787
{
88-
header = new Objects.Information.VMess.TCPHeaders()
88+
header = new Models.Information.VMess.TCPHeaders()
8989
{
9090
type = server.FakeType,
91-
request = new Objects.Information.VMess.TCPRequest()
91+
request = new Models.Information.VMess.TCPRequest()
9292
{
9393
path = server.Path == "" ? "/" : server.Path,
94-
headers = new Objects.Information.VMess.TCPRequestHeaders()
94+
headers = new Models.Information.VMess.TCPRequestHeaders()
9595
{
9696
Host = server.Host == "" ? server.Address : server.Host
9797
}
9898
}
9999
}
100100
} : null,
101-
kcpSettings = server.TransferProtocol == "kcp" ? new Objects.Information.VMess.KCPSettings()
101+
kcpSettings = server.TransferProtocol == "kcp" ? new Models.Information.VMess.KCPSettings()
102102
{
103-
header = new Objects.Information.VMess.TCPHeaders()
103+
header = new Models.Information.VMess.TCPHeaders()
104104
{
105105
type = server.FakeType
106106
}
107107
} : null,
108-
quicSettings = server.TransferProtocol == "quic" ? new Objects.Information.VMess.QUICSettings()
108+
quicSettings = server.TransferProtocol == "quic" ? new Models.Information.VMess.QUICSettings()
109109
{
110110
security = server.QUICSecurity,
111111
key = server.QUICSecret,
112-
header = new Objects.Information.VMess.TCPHeaders()
112+
header = new Models.Information.VMess.TCPHeaders()
113113
{
114114
type = server.FakeType
115115
}
116116
} : null,
117-
httpSettings = server.TransferProtocol == "h2" ? new Objects.Information.VMess.HTTPSettings()
117+
httpSettings = server.TransferProtocol == "h2" ? new Models.Information.VMess.HTTPSettings()
118118
{
119119
host = server.Host == "" ? server.Address : server.Host,
120120
path = server.Path == "" ? "/" : server.Path
121121
} : null,
122-
tlsSettings = new Objects.Information.VMess.TLSSettings()
122+
tlsSettings = new Models.Information.VMess.TLSSettings()
123123
},
124-
mux = new Objects.Information.VMess.OutboundMux()
124+
mux = new Models.Information.VMess.OutboundMux()
125125
},
126-
new Objects.Information.VMess.Outbounds()
126+
new Models.Information.VMess.Outbounds()
127127
{
128128
tag = "direct",
129129
protocol = "freedom",
@@ -132,11 +132,11 @@ public bool Start(Objects.Server server, Objects.Mode mode)
132132
mux = null
133133
}
134134
},
135-
routing = new Objects.Information.VMess.Routing()
135+
routing = new Models.Information.VMess.Routing()
136136
{
137-
rules = new List<Objects.Information.VMess.RoutingRules>()
137+
rules = new List<Models.Information.VMess.RoutingRules>()
138138
{
139-
mode.BypassChina == true ? new Objects.Information.VMess.RoutingRules()
139+
mode.BypassChina == true ? new Models.Information.VMess.RoutingRules()
140140
{
141141
type = "field",
142142
ip = new List<string>
@@ -150,7 +150,7 @@ public bool Start(Objects.Server server, Objects.Mode mode)
150150
"geosite:cn"
151151
},
152152
outboundTag = "direct"
153-
} : new Objects.Information.VMess.RoutingRules()
153+
} : new Models.Information.VMess.RoutingRules()
154154
{
155155
type = "field",
156156
ip = new List<string>
@@ -179,15 +179,15 @@ public bool Start(Objects.Server server, Objects.Mode mode)
179179
Instance.OutputDataReceived += OnOutputDataReceived;
180180
Instance.ErrorDataReceived += OnOutputDataReceived;
181181

182-
State = Objects.State.Starting;
182+
State = Models.State.Starting;
183183
Instance.Start();
184184
Instance.BeginOutputReadLine();
185185
Instance.BeginErrorReadLine();
186186
for (int i = 0; i < 1000; i++)
187187
{
188188
Thread.Sleep(10);
189189

190-
if (State == Objects.State.Started)
190+
if (State == Models.State.Started)
191191
{
192192
if (File.Exists("data\\last.json"))
193193
{
@@ -196,7 +196,7 @@ public bool Start(Objects.Server server, Objects.Mode mode)
196196
return true;
197197
}
198198

199-
if (State == Objects.State.Stopped)
199+
if (State == Models.State.Stopped)
200200
{
201201
Utils.Logging.Info("V2Ray 进程启动失败");
202202

@@ -234,19 +234,19 @@ public void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
234234
{
235235
File.AppendAllText("logging\\v2ray.log", $"{e.Data}\r\n");
236236

237-
if (State == Objects.State.Starting)
237+
if (State == Models.State.Starting)
238238
{
239239
if (Instance.HasExited)
240240
{
241-
State = Objects.State.Stopped;
241+
State = Models.State.Stopped;
242242
}
243243
else if (e.Data.Contains("started"))
244244
{
245-
State = Objects.State.Started;
245+
State = Models.State.Started;
246246
}
247247
else if (e.Data.Contains("config file not readable") || e.Data.Contains("failed to"))
248248
{
249-
State = Objects.State.Stopped;
249+
State = Models.State.Stopped;
250250
}
251251
}
252252
}

0 commit comments

Comments
 (0)