Fix DNS issue in TUN mode (#824)

NarukawaHime · web-flow · commit 406135b04bdc · 2022-06-09T21:42:27.000+08:00
diff --git a/Netch/Controllers/TUNController.cs b/Netch/Controllers/TUNController.cs
@@ -93,7 +93,7 @@ public async Task StartAsync(Socks5Server server, Mode mode)
 
             if (_tunConfig.UseCustomDNS)
             {
-                Dial(NameList.TYPE_DNSADDR, _tunConfig.DNS);
+                Dial(NameList.TYPE_DNSADDR, DnsUtils.AppendPort(_tunConfig.DNS));
             }
             else
             {
@@ -175,8 +175,13 @@ private void SetupRouteTable()
 
             if (_tunConfig.UseCustomDNS)
             {
-                // NOTICE: DNS metric is network interface metric
-                RouteUtils.CreateRoute(_tun.FillTemplate(_tunConfig.DNS, 32));
+                if (_tunConfig.ProxyDNS)
+                {
+                    // NOTICE: DNS metric is network interface metric
+                    RouteUtils.CreateRoute(_tun.FillTemplate(_tunConfig.DNS, 32));
+                }
+
+                tunNetworkInterface.SetDns(_tunConfig.DNS);
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public async Task StartAsync(Socks5Server server, Mode mode)`
`93`	`93`
`94`	`94`	`if (_tunConfig.UseCustomDNS)`
`95`	`95`	`{`
`96`		`- Dial(NameList.TYPE_DNSADDR, _tunConfig.DNS);`
	`96`	`+ Dial(NameList.TYPE_DNSADDR, DnsUtils.AppendPort(_tunConfig.DNS));`
`97`	`97`	`}`
`98`	`98`	`else`
`99`	`99`	`{`
`@@ -175,8 +175,13 @@ private void SetupRouteTable()`
`175`	`175`
`176`	`176`	`if (_tunConfig.UseCustomDNS)`
`177`	`177`	`{`
`178`		`- // NOTICE: DNS metric is network interface metric`
`179`		`- RouteUtils.CreateRoute(_tun.FillTemplate(_tunConfig.DNS, 32));`
	`178`	`+ if (_tunConfig.ProxyDNS)`
	`179`	`+ {`
	`180`	`+ // NOTICE: DNS metric is network interface metric`
	`181`	`+ RouteUtils.CreateRoute(_tun.FillTemplate(_tunConfig.DNS, 32));`
	`182`	`+ }`
	`183`	`+`
	`184`	`+ tunNetworkInterface.SetDns(_tunConfig.DNS);`
`180`	`185`	`}`
`181`	`186`	`else`
`182`	`187`	`{`