Use a more conservative strategy for resolving with systemd-resolved for local DNS server

This commit is contained in:
世界
2025-10-16 23:25:34 +08:00
parent d603503256
commit 9f42fd7722
3 changed files with 39 additions and 15 deletions

View File

@@ -53,13 +53,15 @@ func (t *Transport) Start(stage adapter.StartStage) error {
switch stage { switch stage {
case adapter.StartStateInitialize: case adapter.StartStateInitialize:
if !t.preferGo { if !t.preferGo {
resolvedResolver, err := NewResolvedResolver(t.ctx, t.logger) if isSystemdResolvedManaged() {
if err == nil { resolvedResolver, err := NewResolvedResolver(t.ctx, t.logger)
err = resolvedResolver.Start()
if err == nil { if err == nil {
t.resolved = resolvedResolver err = resolvedResolver.Start()
} else { if err == nil {
t.logger.Warn(E.Cause(err, "initialize resolved resolver")) t.resolved = resolvedResolver
} else {
t.logger.Warn(E.Cause(err, "initialize resolved resolver"))
}
} }
} }
} }

View File

@@ -1,9 +1,11 @@
package local package local
import ( import (
"bufio"
"context" "context"
"errors" "errors"
"os" "os"
"strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
@@ -22,6 +24,25 @@ import (
mDNS "github.com/miekg/dns" mDNS "github.com/miekg/dns"
) )
func isSystemdResolvedManaged() bool {
resolvContent, err := os.Open("/etc/resolv.conf")
if err != nil {
return false
}
defer resolvContent.Close()
scanner := bufio.NewScanner(resolvContent)
for scanner.Scan() {
line := strings.TrimSpace(scanner.Text())
if line == "" || line[0] != '#' {
return false
}
if strings.Contains(line, "systemd-resolved") {
return true
}
}
return false
}
type DBusResolvedResolver struct { type DBusResolvedResolver struct {
ctx context.Context ctx context.Context
logger logger.ContextLogger logger logger.ContextLogger
@@ -188,7 +209,7 @@ func (t *DBusResolvedResolver) checkResolved(ctx context.Context) (*ResolvedObje
int32(defaultInterface.Index), int32(defaultInterface.Index),
) )
if call.Err != nil { if call.Err != nil {
return nil, err return nil, call.Err
} }
var linkPath dbus.ObjectPath var linkPath dbus.ObjectPath
err = call.Store(&linkPath) err = call.Store(&linkPath)
@@ -214,15 +235,12 @@ func (t *DBusResolvedResolver) checkResolved(ctx context.Context) (*ResolvedObje
return nil, E.New("No appropriate name servers or networks for name found") return nil, E.New("No appropriate name servers or networks for name found")
} }
} }
return &ResolvedObject{ return nil, E.New("link has no DNS servers configured")
BusObject: dbusObject,
}, nil
} else {
return &ResolvedObject{
BusObject: dbusObject,
InterfaceIndex: int32(defaultInterface.Index),
}, nil
} }
return &ResolvedObject{
BusObject: dbusObject,
InterfaceIndex: int32(defaultInterface.Index),
}, nil
} }
func (t *DBusResolvedResolver) updateDefaultInterface(defaultInterface *control.Interface, flags int) { func (t *DBusResolvedResolver) updateDefaultInterface(defaultInterface *control.Interface, flags int) {

View File

@@ -9,6 +9,10 @@ import (
"github.com/sagernet/sing/common/logger" "github.com/sagernet/sing/common/logger"
) )
func isSystemdResolvedManaged() bool {
return false
}
func NewResolvedResolver(ctx context.Context, logger logger.ContextLogger) (ResolvedResolver, error) { func NewResolvedResolver(ctx context.Context, logger logger.ContextLogger) (ResolvedResolver, error) {
return nil, os.ErrInvalid return nil, os.ErrInvalid
} }