Merge branch 'develop' into feature/new-installer

2025-01-14 15:30:57 +02:00
parent fed64e6fbd f021ec2444
commit 5039e9efca
40 changed files with 929 additions and 163 deletions
--- a/service/resolver/resolvers.go
+++ b/service/resolver/resolvers.go
@@ -510,7 +510,7 @@ func setScopedResolvers(resolvers []*Resolver) {
 	for _, resolver := range resolvers {
 		if resolver.Info.IPScope.IsLAN() {
 			localResolvers = append(localResolvers, resolver)
-		} else if _, err := netenv.GetLocalNetwork(resolver.Info.IP); err != nil {
+		} else if net, _ := netenv.GetLocalNetwork(resolver.Info.IP); net != nil {
 			localResolvers = append(localResolvers, resolver)
 		}