Pull request 2289: upd-urlfilter
Updates #6818. Squashed commit of the following: commit d03b518457ef14d1c565a46c1dbfce1a47bf301d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Oct 4 18:58:10 2024 +0300 all: upd chlog commit 80ee9146998d622c173a9559b8d6af139b750d23 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Oct 4 18:50:24 2024 +0300 all: upd urlfilter
This commit is contained in:
@@ -3,11 +3,12 @@ package dhcpsvc
|
||||
import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"maps"
|
||||
"os"
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"github.com/AdguardTeam/golibs/errors"
|
||||
"github.com/AdguardTeam/golibs/mapsutil"
|
||||
"github.com/AdguardTeam/golibs/netutil"
|
||||
)
|
||||
|
||||
@@ -78,14 +79,13 @@ func (conf *Config) Validate() (err error) {
|
||||
return errors.Join(errs...)
|
||||
}
|
||||
|
||||
mapsutil.SortedRange(conf.Interfaces, func(iface string, ic *InterfaceConfig) (ok bool) {
|
||||
for _, iface := range slices.Sorted(maps.Keys(conf.Interfaces)) {
|
||||
ic := conf.Interfaces[iface]
|
||||
err = ic.validate()
|
||||
if err != nil {
|
||||
errs = append(errs, fmt.Errorf("interface %q: %w", iface, err))
|
||||
}
|
||||
|
||||
return true
|
||||
})
|
||||
}
|
||||
|
||||
return errors.Join(errs...)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user