修复 sing-box TUN 模式下 relay 出站的 mux 问题 (#9018)
Some checks failed
release Linux / build (Release) (push) Has been cancelled
release macOS / build (Release) (push) Has been cancelled
release Windows desktop (Avalonia UI) / build (Release) (push) Has been cancelled
release Windows / build (Release) (push) Has been cancelled
release Linux / deb (push) Has been cancelled
release Linux / rpm (push) Has been cancelled

* Fix sing-box selector generation for dynamic group tags

* 修复 TUN 模式下 DNS 失败及 Windows 提权重启后 TUN 状态丢失

* 按上游意见回滚 TUN 提权时保留启用状态的改动
This commit is contained in:
nirvanalinlei 2026-04-02 20:47:34 +08:00 committed by GitHub
parent b556adaa09
commit b3102b34b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 2 deletions

View file

@ -46,7 +46,7 @@ public static class ProcUtils
return null; return null;
} }
public static void RebootAsAdmin(bool blAdmin = true) public static bool RebootAsAdmin(bool blAdmin = true)
{ {
try try
{ {
@ -58,11 +58,12 @@ public static class ProcUtils
FileName = Utils.GetExePath().AppendQuotes(), FileName = Utils.GetExePath().AppendQuotes(),
Verb = blAdmin ? "runas" : null, Verb = blAdmin ? "runas" : null,
}; };
_ = Process.Start(startInfo); return Process.Start(startInfo) != null;
} }
catch (Exception ex) catch (Exception ex)
{ {
Logging.SaveLog(_tag, ex); Logging.SaveLog(_tag, ex);
return false;
} }
} }
} }

View file

@ -345,6 +345,14 @@ public partial class CoreConfigSingboxService
{ {
try try
{ {
// The synthetic TUN relay outbound talks to the local Xray shadowsocks relay.
// Xray cannot terminate sing-box h2mux, so muxing here turns local relay traffic
// into sp.mux.sing-box.arpa pseudo-destinations and breaks DNS over TUN.
if (IsTunRelayProxyOutbound())
{
return;
}
var muxEnabled = _node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled; var muxEnabled = _node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled;
if (muxEnabled && _config.Mux4SboxItem.Protocol.IsNotEmpty()) if (muxEnabled && _config.Mux4SboxItem.Protocol.IsNotEmpty())
{ {
@ -364,6 +372,21 @@ public partial class CoreConfigSingboxService
} }
} }
private bool IsTunRelayProxyOutbound()
{
if (!context.IsTunEnabled
|| _node.ConfigType != EConfigType.Shadowsocks
|| _node.Address != Global.Loopback
|| _node.Port != context.ProxyRelaySsPort
|| _node.Password != Global.None)
{
return false;
}
var protocolExtra = _node.GetProtocolExtra();
return protocolExtra.SsMethod == Global.None;
}
private void FillOutboundTls(Outbound4Sbox outbound) private void FillOutboundTls(Outbound4Sbox outbound)
{ {
try try

View file

@ -490,6 +490,7 @@ public class StatusBarViewModel : MyReactiveObject
} }
} }
} }
await ConfigHandler.SaveConfig(_config); await ConfigHandler.SaveConfig(_config);
AppEvents.ReloadRequested.Publish(); AppEvents.ReloadRequested.Publish();
} }