all: sync with master

This commit is contained in:
Eugene Burkov
2025-03-20 18:30:28 +03:00
parent bd16eee509
commit ef7d71dd67
8 changed files with 56 additions and 42 deletions

View File

@@ -634,8 +634,9 @@ func (d *DNSFilter) enableFiltersLocked(async bool) {
// ApplyAdditionalFiltering enhances the provided filtering settings with
// blocked services and client-specific configurations.
func (d *DNSFilter) ApplyAdditionalFiltering(cliAddr netip.Addr, clientID string, setts *Settings) {
d.ApplyBlockedServices(setts)
setts.ClientIP = cliAddr
d.ApplyBlockedServices(setts)
d.applyClientFiltering(clientID, cliAddr, setts)
if setts.BlockedServices != nil {
// TODO(e.burkov): Get rid of this crutch.