Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-19 05:30:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

more error-proof system dns handling

Browse Source
This commit is contained in:
Nova 2025-05-29 11:33:30 +03:30
parent a302a58673
commit e6bf936c8e
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/server/internal/boxdns/dns_manager_windows.go
View File

@ -18,6 +18,7 @@ const (
nameServerRegistryKey = "NameServer"
localAddr = "127.0.0.1"
dhcpMarkAddr = "127.1.2.3"
setMarkAddr = "127.3.2.1"
)
var dnsIsSet bool
@ -141,7 +142,7 @@ func (d *DnsManager) restoreSystemDNS(ifx control.Interface) {
newDnsServers := make([]netip.Addr, 0)
wasSet := false
for _, server := range dnsServers {
if server.String() == localAddr || server.String() == dhcpMarkAddr {
if server.String() == setMarkAddr || server.String() == dhcpMarkAddr {
isDhcp = server.String() == dhcpMarkAddr
wasSet = true
continue
@ -154,6 +155,10 @@ func (d *DnsManager) restoreSystemDNS(ifx control.Interface) {
return
}
if len(newDnsServers) > 0 && newDnsServers[0].String() == localAddr {
newDnsServers = newDnsServers[1:]
}
if isDhcp {
err = luid.SetDNS(winipcfg.AddressFamily(windows.AF_INET), nil, nil)
} else {
@ -181,26 +186,33 @@ func (d *DnsManager) setSystemDNS(ifx control.Interface) {
return
}
hasLocal := false
wasSet := false
wasDHCP := false
newDnsServers := make([]netip.Addr, 0)
for _, server := range dnsServers {
if server.String() == localAddr || server.String() == dhcpMarkAddr {
hasLocal = true
if server.String() == setMarkAddr || server.String() == dhcpMarkAddr {
wasSet = true
wasDHCP = server.String() == dhcpMarkAddr
continue
}
newDnsServers = append(newDnsServers, server)
}
if wasSet && len(newDnsServers) > 0 && newDnsServers[0].String() == localAddr {
newDnsServers = newDnsServers[1:]
}
serverAddr, _ := netip.ParseAddr("127.0.0.1")
newDnsServers = append([]netip.Addr{serverAddr}, newDnsServers...)
if !hasLocal {
dhcp, err := d.isIfcDNSDhcp(ifx)
if err != nil {
log.Println("[setSystemDNS] failed to determine whether ifc DNS is dhcp:", err)
}
if dhcp {
markAddr, _ := netip.ParseAddr(dhcpMarkAddr)
newDnsServers = append(newDnsServers, markAddr)
}
dhcp, err := d.isIfcDNSDhcp(ifx)
if err != nil {
log.Println("[setSystemDNS] failed to determine whether ifc DNS is dhcp:", err)
}
if dhcp || wasDHCP {
markAddr, _ := netip.ParseAddr(dhcpMarkAddr)
newDnsServers = append(newDnsServers, markAddr)
} else {
markAddr, _ := netip.ParseAddr(setMarkAddr)
newDnsServers = append(newDnsServers, markAddr)
}
if err = luid.SetDNS(winipcfg.AddressFamily(windows.AF_INET), newDnsServers, nil); err != nil {

9
core/server/internal/boxdns/monitor_windows.go
View File

@ -78,11 +78,18 @@ func getNameServersForInterface(luid winipcfg.LUID) ([]string, error) {
if err != nil {
return nil, err
}
isSystemDNSAltered := false
for _, server := range nsAddrs {
if server.IsValid() && server.String() != localAddr && server.String() != dhcpMarkAddr {
if server.String() == setMarkAddr || server.String() == dhcpMarkAddr {
isSystemDNSAltered = true
}
if server.IsValid() && server.String() != setMarkAddr && server.String() != dhcpMarkAddr {
nameservers = append(nameservers, server.String())
}
}
if isSystemDNSAltered && len(nameservers) > 0 && nameservers[0] == "127.0.0.1" {
nameservers = nameservers[1:]
}
if len(nameservers) == 0 {
log.Println("getNameServersForInterface: no nameservers found")