github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

add sing-box tun bypassMode

pull/3773/head
2dust 2023-04-26 09:36:30 +08:00
parent 4d92caabf8
commit e461fce2cb
2 changed files with 62 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
View File

@ -1,5 +1,4 @@
using System.ComponentModel; using v2rayN.Base;
using v2rayN.Base;
using v2rayN.Mode; using v2rayN.Mode;
using v2rayN.Resx; using v2rayN.Resx;
@ -382,7 +381,7 @@ namespace v2rayN.Handler
{ {
outbound = "direct", outbound = "direct",
process_name = lstDirectExe process_name = lstDirectExe
}); });
} }
if (_config.routingBasicItem.enableRoutingAdvanced) if (_config.routingBasicItem.enableRoutingAdvanced)
@ -412,6 +411,38 @@ namespace v2rayN.Handler
} }
} }
} }
if (_config.tunModeItem.enableTun)
{
if (_config.tunModeItem.bypassMode)
{
//direct ips
if (_config.tunModeItem.directIP != null && _config.tunModeItem.directIP.Count > 0)
{
singboxConfig.route.rules.Add(new() { outbound = "direct", ip_cidr = _config.tunModeItem.directIP });
}
//direct process
if (_config.tunModeItem.directProcess != null && _config.tunModeItem.directProcess.Count > 0)
{
singboxConfig.route.rules.Add(new() { outbound = "direct", process_name = _config.tunModeItem.directProcess });
}
}
else
{
//proxy ips
if (_config.tunModeItem.proxyIP != null && _config.tunModeItem.proxyIP.Count > 0)
{
singboxConfig.route.rules.Add(new() { outbound = "proxy", ip_cidr = _config.tunModeItem.proxyIP });
}
//proxy process
if (_config.tunModeItem.proxyProcess != null && _config.tunModeItem.proxyProcess.Count > 0)
{
singboxConfig.route.rules.Add(new() { outbound = "proxy", process_name = _config.tunModeItem.proxyProcess });
}
singboxConfig.route.rules.Add(new() { outbound = "direct", inbound = new() { "tun-in" } });
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {

52
v2rayN/v2rayN/Handler/TunHandler.cs
View File

@ -135,30 +135,7 @@ namespace v2rayN.Base
configStr = configStr.Replace("$dns_object$", dnsObject); configStr = configStr.Replace("$dns_object$", dnsObject);
//exe //exe
List<string> lstDnsExe = new(); routingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
List<string> lstDirectExe = new();
var coreInfos = LazyConfig.Instance.GetCoreInfos();
foreach (var it in coreInfos)
{
if (it.coreType == ECoreType.v2rayN)
{
continue;
}
foreach (var it2 in it.coreExes)
{
if (!lstDnsExe.Contains(it2) && it.coreType != ECoreType.sing_box)
{
//lstDnsExe.Add(it2);
lstDnsExe.Add($"{it2}.exe");
}
if (!lstDirectExe.Contains(it2))
{
//lstDirectExe.Add(it2);
lstDirectExe.Add($"{it2}.exe");
}
}
}
string strDns = string.Join("\",\"", lstDnsExe.ToArray()); string strDns = string.Join("\",\"", lstDnsExe.ToArray());
configStr = configStr.Replace("$dnsProcessName$", $"\"{strDns}\""); configStr = configStr.Replace("$dnsProcessName$", $"\"{strDns}\"");
@ -209,6 +186,33 @@ namespace v2rayN.Base
return true; return true;
} }
private void routingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
{
lstDnsExe = new();
lstDirectExe = new();
var coreInfos = LazyConfig.Instance.GetCoreInfos();
foreach (var it in coreInfos)
{
if (it.coreType == ECoreType.v2rayN)
{
continue;
}
foreach (var it2 in it.coreExes)
{
if (!lstDnsExe.Contains(it2) && it.coreType != ECoreType.sing_box)
{
lstDnsExe.Add($"{it2}.exe");
}
if (!lstDirectExe.Contains(it2))
{
lstDirectExe.Add($"{it2}.exe");
}
}
}
}
private void CoreStop() private void CoreStop()
{ {
try try