Compare commits

..

3 commits

Author SHA1 Message Date
DHR60
152e3dc4aa Fix 2026-02-26 16:11:15 +08:00
DHR60
d6ee3a4f38 Fix DNS routing 2026-02-26 15:41:51 +08:00
DHR60
12a46990b5 Fix routing 2026-02-26 15:41:51 +08:00
15 changed files with 47 additions and 47 deletions

View file

@ -50,7 +50,7 @@ jobs:
dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-arm64 -p:SelfContained=true -p:PublishTrimmed=true -o "$OutputPathArm64"
- name: Upload build artifacts
uses: actions/upload-artifact@v7.0.0
uses: actions/upload-artifact@v6.0.0
with:
name: v2rayN-linux
path: |
@ -169,7 +169,7 @@ jobs:
fetch-depth: '0'
- name: Restore build artifacts
uses: actions/download-artifact@v8
uses: actions/download-artifact@v7
with:
name: v2rayN-linux
path: ${{ github.workspace }}/v2rayN/Release
@ -190,7 +190,7 @@ jobs:
ls -R "$GITHUB_WORKSPACE/dist/rpm" || true
- name: Upload RPM artifacts
uses: actions/upload-artifact@v7.0.0
uses: actions/upload-artifact@v6.0.0
with:
name: v2rayN-rpm
path: dist/rpm/**/*.rpm

View file

@ -45,7 +45,7 @@ jobs:
dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-arm64 -p:SelfContained=true -p:PublishTrimmed=true -o $OutputPathArm64
- name: Upload build artifacts
uses: actions/upload-artifact@v7.0.0
uses: actions/upload-artifact@v6.0.0
with:
name: v2rayN-macos
path: |

View file

@ -45,7 +45,7 @@ jobs:
dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 -p:SelfContained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64
- name: Upload build artifacts
uses: actions/upload-artifact@v7.0.0
uses: actions/upload-artifact@v6.0.0
with:
name: v2rayN-windows-desktop
path: |

View file

@ -42,7 +42,7 @@ jobs:
dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 -p:SelfContained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64
- name: Upload build artifacts
uses: actions/upload-artifact@v7.0.0
uses: actions/upload-artifact@v6.0.0
with:
name: v2rayN-windows
path: |

View file

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<Version>7.19.0</Version>
<Version>7.18.0</Version>
</PropertyGroup>
<PropertyGroup>

View file

@ -11,7 +11,7 @@
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
<PackageVersion Include="CliWrap" Version="3.10.0" />
<PackageVersion Include="Downloader" Version="4.1.1" />
<PackageVersion Include="Downloader" Version="4.0.3" />
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
<PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
<PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />

View file

@ -629,7 +629,12 @@ public class Utils
{
try
{
var (lstIpEndPoints, lstTcpConns) = GetActiveNetworkInfo();
List<IPEndPoint> lstIpEndPoints = new();
List<TcpConnectionInformation> lstTcpConns = new();
lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
if (lstIpEndPoints?.FindIndex(it => it.Port == port) >= 0)
{
@ -671,27 +676,6 @@ public class Utils
return 59090;
}
public static (List<IPEndPoint> endpoints, List<TcpConnectionInformation> connections) GetActiveNetworkInfo()
{
var endpoints = new List<IPEndPoint>();
var connections = new List<TcpConnectionInformation>();
try
{
var ipGlobalProperties = IPGlobalProperties.GetIPGlobalProperties();
endpoints.AddRange(ipGlobalProperties.GetActiveTcpListeners());
endpoints.AddRange(ipGlobalProperties.GetActiveUdpListeners());
connections.AddRange(ipGlobalProperties.GetActiveTcpConnections());
}
catch (Exception ex)
{
Logging.SaveLog(_tag, ex);
}
return (endpoints, connections);
}
#endregion Speed Test
#region Miscellaneous

View file

@ -24,13 +24,13 @@ public class DownloaderHelper
var downloadOpt = new DownloadConfiguration()
{
BlockTimeout = timeout * 1000,
Timeout = timeout * 1000,
MaxTryAgainOnFailure = 2,
RequestConfiguration =
{
Headers = headers,
UserAgent = userAgent,
ConnectTimeout = timeout * 1000,
Timeout = timeout * 1000,
Proxy = webProxy
}
};
@ -62,11 +62,11 @@ public class DownloaderHelper
var downloadOpt = new DownloadConfiguration()
{
BlockTimeout = timeout * 1000,
Timeout = timeout * 1000,
MaxTryAgainOnFailure = 2,
RequestConfiguration =
{
ConnectTimeout= timeout * 1000,
Timeout= timeout * 1000,
Proxy = webProxy
}
};
@ -139,11 +139,11 @@ public class DownloaderHelper
var downloadOpt = new DownloadConfiguration()
{
BlockTimeout = timeout * 1000,
Timeout = timeout * 1000,
MaxTryAgainOnFailure = 2,
RequestConfiguration =
{
ConnectTimeout= timeout * 1000,
Timeout= timeout * 1000,
Proxy = webProxy
}
};

View file

@ -72,8 +72,7 @@ public class CoreManager
{
context = context with
{
TunProtectSsPort = preContext.TunProtectSsPort,
ProxyRelaySsPort = preContext.ProxyRelaySsPort,
TunProtectSsPort = preContext.TunProtectSsPort, ProxyRelaySsPort = preContext.ProxyRelaySsPort,
};
}
var result = await CoreConfigHandler.GenerateClientConfig(context, fileName);

View file

@ -257,7 +257,6 @@ public class Server4Sbox : BaseServer4Sbox
// Deprecated in sing-box 1.12.0 , kept for backward compatibility
public string? address { get; set; }
public string? address_resolver { get; set; }
public string? address_strategy { get; set; }
public string? strategy { get; set; }

View file

@ -137,8 +137,18 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
ret.Msg = ResUI.FailedGenDefaultConfiguration;
return ret;
}
var (lstIpEndPoints, lstTcpConns) = Utils.GetActiveNetworkInfo();
List<IPEndPoint> lstIpEndPoints = new();
List<TcpConnectionInformation> lstTcpConns = new();
try
{
lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
}
catch (Exception ex)
{
Logging.SaveLog(_tag, ex);
}
GenLog();
GenMinimizedDns();

View file

@ -46,7 +46,6 @@ public partial class CoreConfigSingboxService
case EConfigType.PolicyGroup:
proxyOutboundList = BuildOutboundsList(baseTagName);
break;
case EConfigType.ProxyChain:
proxyOutboundList = BuildChainOutboundsList(baseTagName);
break;

View file

@ -100,8 +100,18 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
ret.Msg = ResUI.FailedGenDefaultConfiguration;
return ret;
}
var (lstIpEndPoints, lstTcpConns) = Utils.GetActiveNetworkInfo();
List<IPEndPoint> lstIpEndPoints = new();
List<TcpConnectionInformation> lstTcpConns = new();
try
{
lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
}
catch (Exception ex)
{
Logging.SaveLog(_tag, ex);
}
GenLog();
_coreConfig.inbounds.Clear();

View file

@ -68,7 +68,6 @@ public partial class CoreConfigV2rayService
case EConfigType.PolicyGroup:
proxyOutboundList.AddRange(BuildOutboundsList(baseTagName));
break;
case EConfigType.ProxyChain:
proxyOutboundList.AddRange(BuildChainOutboundsList(baseTagName));
break;