GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-05-07 22:44:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: lookup server hostname before start

Browse Source
This commit is contained in:
ChsBuffer
2020-10-05 16:19:50 +08:00
parent 2dc4bb771e
commit 78def0ae1d
6 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netch/Controllers/MainController.cs
View File

@@ -40,6 +40,12 @@ namespace Netch.Controllers
return false;
}
if (DNS.Lookup(server.Hostname) == null)
{
MessageBoxX.Show("Lookup Server hostname failed");
return false;
}
_ = Task.Run(Firewall.AddNetchFwRules);
try

2
Netch/Controllers/TUNTAPController.cs
View File

@@ -86,7 +86,7 @@ namespace Netch.Controllers
var argument = new StringBuilder();
if (s.IsSocks5())
argument.Append($"-proxyServer {s.Hostname}:{s.Port} ");
argument.Append($"-proxyServer {_serverAddresses}:{s.Port} ");
else
argument.Append($"-proxyServer 127.0.0.1:{Global.Settings.Socks5LocalPort} ");

4
Netch/Servers/Shadowsocks/SSController.cs
View File

@@ -27,7 +27,7 @@ namespace Netch.Servers.Shadowsocks
{
State = State.Starting;
var client = Encoding.UTF8.GetBytes($"{LocalAddress}:{Socks5LocalPort}");
var remote = Encoding.UTF8.GetBytes($"{server.Hostname}:{server.Port}");
var remote = Encoding.UTF8.GetBytes($"{DNS.Lookup(server.Hostname)}:{server.Port}");
var passwd = Encoding.UTF8.GetBytes($"{server.Password}");
var method = Encoding.UTF8.GetBytes($"{server.EncryptMethod}");
if (!ShadowsocksDLL.Info(client, remote, passwd, method))
@@ -55,7 +55,7 @@ namespace Netch.Servers.Shadowsocks
var argument = new StringBuilder();
argument.Append(
$"-s {server.Hostname} " +
$"-s {DNS.Lookup(server.Hostname)} " +
$"-p {server.Port} " +
$"-b {LocalAddress ?? Global.Settings.LocalAddress} " +
$"-l {Socks5LocalPort ?? Global.Settings.Socks5LocalPort} " +

3
Netch/Servers/ShadowsocksR/SSRController.cs
View File

@@ -1,6 +1,7 @@
using System.Text;
using Netch.Controllers;
using Netch.Models;
using Netch.Utils;
namespace Netch.Servers.ShadowsocksR
{
@@ -20,7 +21,7 @@ namespace Netch.Servers.ShadowsocksR
#region Argument
var argument = new StringBuilder();
argument.Append($"-s {server.Hostname} -p {server.Port} -k \"{server.Password}\" -m {server.EncryptMethod} -t 120");
argument.Append($"-s {DNS.Lookup(server.Hostname)} -p {server.Port} -k \"{server.Password}\" -m {server.EncryptMethod} -t 120");
if (!string.IsNullOrEmpty(server.Protocol))
{
argument.Append($" -O {server.Protocol}");

3
Netch/Servers/Trojan/TrojanController.cs
View File

@@ -3,6 +3,7 @@ using System.IO;
using Netch.Controllers;
using Netch.Models;
using Netch.Servers.Trojan.Models;
using Netch.Utils;
using Newtonsoft.Json;
namespace Netch.Servers.Trojan
@@ -28,7 +29,7 @@ namespace Netch.Servers.Trojan
{
local_addr = LocalAddress ?? Global.Settings.LocalAddress,
local_port = Socks5LocalPort ?? Global.Settings.Socks5LocalPort,
remote_addr = server.Hostname,
remote_addr = DNS.Lookup(server.Hostname).ToString(),
remote_port = server.Port,
password = new List<string>
{

3
Netch/Servers/VMess/VMessController.cs
View File

@@ -3,6 +3,7 @@ using System.IO;
using Netch.Controllers;
using Netch.Models;
using Netch.Servers.VMess.Models;
using Netch.Utils;
using Newtonsoft.Json;
namespace Netch.Servers.VMess
@@ -46,7 +47,7 @@ namespace Netch.Servers.VMess
{
new VMessConfig.VNext
{
address = server.Hostname,
address = DNS.Lookup(server.Hostname).ToString(),
port = server.Port,
users = new List<VMessConfig.User>
{