Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 13:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enables dhcp interface configuration

Browse source
This commit is contained in:
DHR60 2025-04-11 18:30:45 +08:00
parent f82ba4bc08
commit ec29e87dd2
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
v2rayN/ServiceLib/Models/SingboxConfig.cs
View file

@ -1,3 +1,5 @@
using System.Text.Json.Serialization;
namespace ServiceLib.Models; namespace ServiceLib.Models;
public class SingboxConfig public class SingboxConfig
@ -226,7 +228,7 @@ public class Server4Sbox
public string? type { get; set; } public string? type { get; set; }
public string? server { get; set; } public string? server { get; set; }
public string? server_resolver { get; set; } public string? server_resolver { get; set; }
//public string? interface { get; set; } [JsonPropertyName("interface")] public string? Interface { get; set; }
} }
public class Experimental4Sbox public class Experimental4Sbox

13
v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
View file

@ -1314,7 +1314,7 @@ public class CoreConfigSingboxService
var tag = "local_local"; var tag = "local_local";
var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress; var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress;
string? localDnsType = null; string? localDnsType = null;
//string? dhcpDnsInterface = null; string? dhcpDnsInterface = null;
if (localDnsAddress == "local") if (localDnsAddress == "local")
{ {
localDnsType = "local"; localDnsType = "local";
@ -1323,8 +1323,12 @@ public class CoreConfigSingboxService
else if (localDnsAddress.StartsWith("dhcp") && localDnsAddress.Length > 7) else if (localDnsAddress.StartsWith("dhcp") && localDnsAddress.Length > 7)
{ {
localDnsType = "dhcp"; localDnsType = "dhcp";
// // dhcp:// // dhcp://
// dhcpDnsInterface = localDnsAddress.Substring(7); dhcpDnsInterface = localDnsAddress.Substring(7);
if (dhcpDnsInterface == "auto")
{
dhcpDnsInterface = null;
}
localDnsAddress = null; localDnsAddress = null;
} }
else if (localDnsAddress.StartsWith("tcp") && localDnsAddress.Length > 6) else if (localDnsAddress.StartsWith("tcp") && localDnsAddress.Length > 6)
@ -1360,7 +1364,8 @@ public class CoreConfigSingboxService
{ {
tag = tag, tag = tag,
type = localDnsType, type = localDnsType,
server = localDnsAddress server = localDnsAddress,
Interface = dhcpDnsInterface
}); });
dns4Sbox.rules.Insert(0, new() dns4Sbox.rules.Insert(0, new()
{ {