docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
ClientProtoDoH ClientProto = "doh" ClientProtoDoQ ClientProto = "doq" ClientProtoDoT ClientProto = "dot"
<mask> type ClientProto string <mask> <mask> // Client protocol names. <mask> const ( <mask> ClientProtoDOH ClientProto = "doh" <mask> ClientProtoDOQ ClientProto = "doq" <mask> ClientProtoDOT ClientProto = "dot" <mask> ClientProtoDNSCrypt ClientProto = "dnscrypt" <mask> ClientProtoPlain ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
internal/querylog/qlog.go
ClientProtoDoH, ClientProtoDoQ, ClientProtoDoT,
<mask> // the name as a ClientProto. <mask> func NewClientProto(s string) (cp ClientProto, err error) { <mask> switch cp = ClientProto(s); cp { <mask> case <mask> ClientProtoDOH, <mask> ClientProtoDOQ, <mask> ClientProtoDOT, <mask> ClientProtoDNSCrypt, <mask> ClientProtoPlain: <mask> <mask> re...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
internal/querylog/qlog.go
'description': 'AdGuard Home HTTPS/DoH/DoQ/DoT settings'
<mask> 'description': 'Enforce family-friendly results in search engines' <mask> - 'name': 'stats' <mask> 'description': 'AdGuard Home statistics' <mask> - 'name': 'tls' <mask> 'description': 'AdGuard Home HTTPS/DOH/DOT settings' <mask> <mask> 'paths': <mask> '/status': <mask> 'get': <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
openapi/openapi.yaml
The client ID, if provided in DoH, DoQ, or DoT.
<mask> 'example': '192.168.0.1' <mask> 'type': 'string' <mask> 'client_id': <mask> 'description': > <mask> The client ID, if provided in DOH, DOQ, or DOT. <mask> 'example': 'cli123' <mask> 'type': 'string' <mask> 'client_info': <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
openapi/openapi.yaml
'description': 'enabled is the encryption (DoT/DoH/HTTPS) status'
<mask> 'properties': <mask> 'enabled': <mask> 'type': 'boolean' <mask> 'example': true <mask> 'description': 'enabled is the encryption (DOT/DOH/HTTPS) status' <mask> 'server_name': <mask> 'type': 'string' <mask> 'example': 'example.org' <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
openapi/openapi.yaml
'description': 'DNS-over-TLS port. If 0, DoT will be disabled.'
<mask> 'port_dns_over_tls': <mask> 'type': 'integer' <mask> 'format': 'uint16' <mask> 'example': 853 <mask> 'description': 'DNS-over-TLS port. If 0, DOT will be disabled.' <mask> 'port_dns_over_quic': <mask> 'type': 'integer' <mask> 'fo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
openapi/openapi.yaml
'description': 'DNS-over-QUIC port. If 0, DoQ will be disabled.'
<mask> 'port_dns_over_quic': <mask> 'type': 'integer' <mask> 'format': 'uint16' <mask> 'example': 784 <mask> 'description': 'DNS-over-QUIC port. If 0, DOQ will be disabled.' <mask> 'certificate_chain': <mask> 'type': 'string' <mask> 'de...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
openapi/openapi.yaml
<mask> # <mask> # Do not add "PTR" since we use "Ptr" as a suffix. <mask> "inherit" <mask> , "DHCP" <mask> , "DOH" <mask> , "DOQ" <mask> , "DOT" <mask> , "EDNS" <mask> , "MX" <mask> , "QUIC" <mask> , "RA" <mask> , "SDNS" </s> Pull request: all: imp docs, names Merge in DNS/adguard-home from imp-text...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
staticcheck.conf
, "WHOIS"
<mask> , "SLAAC" <mask> , "SVCB" <mask> , "TLD" <mask> ] <mask> dot_import_whitelist = [] <mask> http_status_code_whitelist = [] </s> Pull request: all: imp docs, names Merge in DNS/adguard-home from imp-text to master Squashed commit of the following: commit fa7d64014fb2ac379e1c137eaccc7aefca86419d Author: A...
[ "keep", "keep", "add", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd
staticcheck.conf
const { name, whois_info } = info;
<mask> let whoisContainer = ''; <mask> let nameContainer = value; <mask> <mask> if (info) { <mask> const { name, whois } = info; <mask> <mask> if (name) { <mask> nameContainer = ( <mask> <span className="logs__text logs__text--wrap" title={`${name} (${v...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/daf17f16f2a71aa24534aad3c0138d6807fb322b
client/src/helpers/formatClientCell.js
if (whois_info) {
<mask> </span> <mask> ); <mask> } <mask> <mask> if (whois) { <mask> whoisContainer = ( <mask> <div className="logs__text logs__text--wrap logs__text--whois"> <mask> {getFormattedWhois(whois, t)} <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/daf17f16f2a71aa24534aad3c0138d6807fb322b
client/src/helpers/formatClientCell.js
{getFormattedWhois(whois_info, t)}
<mask> <mask> if (whois) { <mask> whoisContainer = ( <mask> <div className="logs__text logs__text--wrap logs__text--whois"> <mask> {getFormattedWhois(whois, t)} <mask> </div> <mask> ); <mask> } <mask> } <mask> <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/daf17f16f2a71aa24534aad3c0138d6807fb322b
client/src/helpers/formatClientCell.js
Hash string `json:"hash"`
<mask> ClientTTL int `json:"clientTtl"` <mask> Reason string `json:"reason"` <mask> } <mask> err := json.Unmarshal(body, &m) <mask> if err != nil { <mask> // error, don't save cache <mask> log.Printf("Couldn't parse json '%s': %s", body, err) <mask> return Result{}, err </s> dnsfilte...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcbe3dd4051f421553eb7782af67378f3d9ce85b
dnsfilter/dnsfilter.go
if !hashes[m[i].Hash] { continue }
<mask> <mask> result := Result{} <mask> <mask> for i := range m { <mask> if m[i].Blocked { <mask> result.IsFiltered = true <mask> result.Reason = FilteredParental <mask> result.Rule = fmt.Sprintf("parental %s", m[i].Reason) <mask> break <mask> } </s> dnsfilter -- compare full hash...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcbe3dd4051f421553eb7782af67378f3d9ce85b
dnsfilter/dnsfilter.go
d.checkMatchEmpty(t, "api.jquery.com")
<mask> if stats.Parental.Requests != l { <mask> t.Errorf("Parental lookup negative cache is not working") <mask> } <mask> } <mask> <mask> func TestSafeSearch(t *testing.T) { <mask> d := NewForTest() <mask> defer d.Destroy() <mask> _, ok := d.SafeSearchDomain("www.google.com") </s> dnsfilter -- compare...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcbe3dd4051f421553eb7782af67378f3d9ce85b
dnsfilter/dnsfilter_test.go
func normalizeIP(ip net.IP) net.IP { ip4 := ip.To4() if ip4 != nil { return ip4 } return ip }
<mask> Expiry int64 `json:"exp"` <mask> } <mask> <mask> // Safe version of dhcp4.IPInRange() <mask> func ipInRange(start, stop, ip net.IP) bool { <mask> if len(start) != len(stop) || <mask> len(start) != len(ip) { </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/db.go
obj[i].IP = normalizeIP(obj[i].IP)
<mask> <mask> numLeases := len(obj) <mask> for i := range obj { <mask> <mask> if obj[i].Expiry != leaseExpireStatic && <mask> !ipInRange(s.leaseStart, s.leaseStop, obj[i].IP) { <mask> <mask> log.Tracef("Skipping a lease with IP %v: not within current IP range", obj[i].IP) <mask> continue </s> ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/db.go
leases := convertLeases(s.Leases(LeasesDynamic), true) staticLeases := convertLeases(s.Leases(LeasesStatic), false)
<mask> return leases <mask> } <mask> <mask> func (s *Server) handleDHCPStatus(w http.ResponseWriter, r *http.Request) { <mask> leases := convertLeases(s.Leases(), true) <mask> staticLeases := convertLeases(s.StaticLeases(), false) <mask> status := map[string]interface{}{ <mask> "config": s.conf, ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcp_http.go
type onLeaseChangedT func(flags int) // flags for onLeaseChanged() const ( LeaseChangedAdded = iota LeaseChangedAddedStatic LeaseChangedRemovedStatic LeaseChangedBlacklisted )
<mask> } <mask> <mask> // Server - the current state of the DHCP server <mask> type Server struct { <mask> conn *filterConn // listening UDP socket <mask> <mask> ipnet *net.IPNet // if interface name changes, this needs to be reset </s> Merge: * clients: update runtime clients of type DHCP by event from DHC...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
// Called when the leases DB is modified onLeaseChanged onLeaseChangedT
<mask> IPpool map[[4]byte]net.HardwareAddr <mask> <mask> conf ServerConfig <mask> } <mask> <mask> // Print information about the available network interfaces <mask> func printInterfaces() { <mask> ifaces, _ := net.Interfaces() <mask> var buf strings.Builder </s> Merge: * clients: update runtime clients ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
if s.conf.Enabled { err := s.setConfig(config) if err != nil { log.Error("DHCP: %s", err) return nil } }
<mask> s := Server{} <mask> s.conf = config <mask> s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename) <mask> if s.conf.HTTPRegister != nil { <mask> s.registerHandlers() <mask> } <mask> <mask> // we can't delay database loading until DHCP server is started, </s> Merge: * clients: update runt...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
// SetOnLeaseChanged - set callback func (s *Server) SetOnLeaseChanged(onLeaseChanged onLeaseChangedT) { s.onLeaseChanged = onLeaseChanged } func (s *Server) notify(flags int) { if s.onLeaseChanged == nil { return } s.onLeaseChanged(flags) }
<mask> } <mask> <mask> // WriteDiskConfig - write configuration <mask> func (s *Server) WriteDiskConfig(c *ServerConfig) { <mask> *c = s.conf <mask> } <mask> </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close #1378 Squashed commit of the following: commit e45e2d0e276...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
<mask> log.Tracef("Assigning IP address %s to %s (lease for %s expired at %s)", <mask> s.leases[i].IP, hwaddr, s.leases[i].HWAddr, s.leases[i].Expiry) <mask> lease.IP = s.leases[i].IP <mask> s.leases[i] = lease <mask> s.dbStore() <mask> <mask> s.reserveIP(lease.IP, hwaddr) <mask> return lease, n...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
<mask> <mask> log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) <mask> lease.IP = ip <mask> s.leases = append(s.leases, lease) <mask> s.dbStore() <mask> return lease, nil <mask> } <mask> <mask> // Find a lease for the client <mask> func (s *Server) findLease(p dhcp4.Packet) *Lease { </s...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
s.notify(LeaseChangedBlacklisted)
<mask> lease.Hostname = "" <mask> lease.Expiry = time.Now().Add(s.leaseTime) <mask> s.dbStore() <mask> s.leasesLock.Unlock() <mask> } <mask> <mask> // Return TRUE if DHCP packet is correct <mask> func isValidPacket(p dhcp4.Packet) bool { <mask> hw := p.CHAddr() </s> Merge: * clients: update runtime clie...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
s.leasesLock.Lock() s.dbStore() s.leasesLock.Unlock() s.notify(LeaseChangedAdded) // Note: maybe we shouldn't call this function if only expiration time is updated
<mask> if lease.Expiry.Unix() != leaseExpireStatic { <mask> lease.Expiry = time.Now().Add(s.leaseTime) <mask> } <mask> log.Tracef("Replying with ACK. IP: %s HW: %s Expire: %s", <mask> lease.IP, lease.HWAddr, lease.Expiry) <mask> opt := s.leaseOptions.SelectOrderOrAll(options[dhcp4.OptionParameterReques...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
<mask> } <mask> l.Expiry = time.Unix(leaseExpireStatic, 0) <mask> <mask> s.leasesLock.Lock() <mask> defer s.leasesLock.Unlock() <mask> <mask> if s.findReservedHWaddr(l.IP) != nil { <mask> err := s.rmDynamicLeaseWithIP(l.IP) <mask> if err != nil { <mask> return err </s> Merge: * clients: update ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
s.leasesLock.Unlock()
<mask> if s.findReservedHWaddr(l.IP) != nil { <mask> err := s.rmDynamicLeaseWithIP(l.IP) <mask> if err != nil { <mask> return err <mask> } <mask> } <mask> s.leases = append(s.leases, &l) </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close #1378 Squashed commit...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
s.leasesLock.Unlock() s.notify(LeaseChangedAddedStatic)
<mask> } <mask> s.leases = append(s.leases, &l) <mask> s.reserveIP(l.IP, l.HWAddr) <mask> s.dbStore() <mask> return nil <mask> } <mask> <mask> // Remove a dynamic lease by IP address <mask> func (s *Server) rmDynamicLeaseWithIP(ip net.IP) error { </s> Merge: * clients: update runtime clients of type DHC...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
<mask> return fmt.Errorf("Invalid MAC") <mask> } <mask> <mask> s.leasesLock.Lock() <mask> defer s.leasesLock.Unlock() <mask> <mask> if s.findReservedHWaddr(l.IP) == nil { <mask> return fmt.Errorf("Lease not found") <mask> } <mask> </s> Merge: * clients: update runtime clients of type DHCP by even...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
s.leasesLock.Unlock()
<mask> <mask> if s.findReservedHWaddr(l.IP) == nil { <mask> return fmt.Errorf("Lease not found") <mask> } <mask> <mask> err := s.rmLease(l) </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close #1378 Squashed commit of the following: commit e45e2d0e2768fe0677eee43538...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
s.leasesLock.Unlock()
<mask> } <mask> <mask> err := s.rmLease(l) <mask> if err != nil { <mask> return err <mask> } <mask> s.dbStore() <mask> s.leasesLock.Unlock() </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close #1378 Squashed commit of the following: commit e45e2d0e2768fe0677eee...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
s.leasesLock.Unlock() s.notify(LeaseChangedRemovedStatic)
<mask> s.leasesLock.Unlock() <mask> return err <mask> } <mask> s.dbStore() <mask> return nil <mask> } <mask> <mask> // flags for Leases() function </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close #1378 Squashed commit of the following: commit e45e2d0e2768fe06...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
// flags for Leases() function const ( LeasesDynamic = 1 LeasesStatic = 2 LeasesAll = LeasesDynamic | LeasesStatic )
<mask> return nil <mask> } <mask> <mask> // Leases returns the list of current DHCP leases (thread-safe) <mask> func (s *Server) Leases(flags int) []Lease { <mask> var result []Lease <mask> now := time.Now().Unix() <mask> s.leasesLock.RLock() <mask> for _, lease := range s.leases { </s> Merge: * clients...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
func (s *Server) Leases(flags int) []Lease {
<mask> return nil <mask> } <mask> <mask> // Leases returns the list of current DHCP leases (thread-safe) <mask> func (s *Server) Leases() []Lease { <mask> var result []Lease <mask> now := time.Now().Unix() <mask> s.leasesLock.RLock() <mask> for _, lease := range s.leases { <mask> if lease.Expiry.Unix(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) || ((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
<mask> var result []Lease <mask> now := time.Now().Unix() <mask> s.leasesLock.RLock() <mask> for _, lease := range s.leases { <mask> if lease.Expiry.Unix() > now { <mask> result = append(result, *lease) <mask> } <mask> } <mask> s.leasesLock.RUnlock() <mask> </s> Merge: * clients: update runtime...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
<mask> <mask> return result <mask> } <mask> <mask> // StaticLeases returns the list of statically-configured DHCP leases (thread-safe) <mask> func (s *Server) StaticLeases() []Lease { <mask> s.leasesLock.Lock() <mask> defer s.leasesLock.Unlock() <mask> <mask> var result []Lease <mask> for _, lease :=...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd.go
ll := s.Leases(LeasesStatic)
<mask> l.HWAddr = []byte{2, 2, 3, 4, 5, 6} <mask> err = s.AddStaticLease(l) <mask> check(t, err == nil, "AddStaticLease") <mask> <mask> ll := s.StaticLeases() <mask> check(t, len(ll) != 0 && bytes.Equal(ll[0].IP, []byte{1, 1, 1, 1}), "StaticLeases") <mask> <mask> err = s.RemoveStaticLease(l) <mask> ch...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dhcpd/dhcpd_test.go
processQueryLogsAndStats,
<mask> processFilteringBeforeRequest, <mask> processUpstream, <mask> processFilteringAfterResponse, <mask> } <mask> for _, process := range mods { <mask> r := process(ctx) <mask> switch r { <mask> case resultFinish: <mask> return nil </s> Merge: * clients: update runtime clients of type DHCP ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dnsforward/dnsforward.go
<mask> <mask> if d.Res != nil { <mask> d.Res.Compress = true // some devices require DNS message compression <mask> } <mask> <mask> _ = processQueryLogsAndStats(ctx) <mask> return nil <mask> } <mask> <mask> // Get IP address from net.Addr <mask> func getIP(addr net.Addr) net.IP { </s> Merge: * clie...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
dnsforward/dnsforward.go
clients.addFromDHCP() clients.dhcpServer.SetOnLeaseChanged(clients.onDHCPLeaseChanged)
<mask> <mask> if !clients.testing { <mask> go clients.periodicUpdate() <mask> <mask> clients.registerWebHandlers() <mask> } <mask> } <mask> <mask> type clientObject struct { <mask> Name string `yaml:"name"` </s> Merge: * clients: update runtime clients of type DHCP by event from DH...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
<mask> func (clients *clientsContainer) periodicUpdate() { <mask> for { <mask> clients.addFromHostsFile() <mask> clients.addFromSystemARP() <mask> clients.addFromDHCP() <mask> time.Sleep(clientsUpdatePeriod) <mask> } <mask> } <mask> <mask> // Exists checks if client with this IP already exists </s...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
func (clients *clientsContainer) onDHCPLeaseChanged(flags int) { switch flags { case dhcpd.LeaseChangedAdded, dhcpd.LeaseChangedAddedStatic, dhcpd.LeaseChangedRemovedStatic: clients.addFromDHCP() } }
<mask> time.Sleep(clientsUpdatePeriod) <mask> } <mask> } <mask> <mask> // Exists checks if client with this IP already exists <mask> func (clients *clientsContainer) Exists(ip string, source clientSource) bool { <mask> clients.lock.Lock() <mask> defer clients.lock.Unlock() <mask> </s> Merge: * clients:...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list))
<mask> for _, id := range c.IDs { <mask> clients.idIndex[id] = &c <mask> } <mask> <mask> log.Tracef("'%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list)) <mask> return true, nil <mask> } <mask> <mask> // Del removes a client <mask> func (clients *clientsContainer) Del(name string) bool { </s> Merge: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
b, e := clients.addHost(ip, host, source) clients.lock.Unlock() return b, e }
<mask> // Use priority of the source (etc/hosts > ARP > rDNS) <mask> // so we overwrite existing entries with an equal or higher priority <mask> func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (bool, error) { <mask> clients.lock.Lock() <mask> defer clients.lock.Unlock() <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
func (clients *clientsContainer) addHost(ip, host string, source clientSource) (bool, error) {
<mask> clients.lock.Unlock() <mask> return b, e <mask> } <mask> <mask> // check auto-clients index <mask> ch, ok := clients.ipHost[ip] <mask> if ok && ch.Source > source { <mask> return false, nil <mask> } else if ok { <mask> ch.Source = source </s> Merge: * clients: update runtime clients of type...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
<mask> Source: source, <mask> } <mask> clients.ipHost[ip] = ch <mask> } <mask> log.Tracef("'%s' -> '%s' [%d]", ip, host, len(clients.ipHost)) <mask> return true, nil <mask> } <mask> <mask> // Parse system 'hosts' file and fill clients array <mask> func (clients *clientsContainer) addFromHostsFile()...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
// Remove all entries that match the specified source func (clients *clientsContainer) rmHosts(source clientSource) int { n := 0 for k, v := range clients.ipHost { if v.Source == source { delete(clients.ipHost, k) n++ } } log.Debug("Clients: removed %d client aliases", n) return n }
<mask> } <mask> <mask> // Parse system 'hosts' file and fill clients array <mask> func (clients *clientsContainer) addFromHostsFile() { <mask> hostsFn := "/etc/hosts" <mask> if runtime.GOOS == "windows" { <mask> hostsFn = os.ExpandEnv("$SystemRoot\\system32\\drivers\\etc\\hosts") </s> Merge: * clients: upd...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
clients.lock.Lock() defer clients.lock.Unlock() _ = clients.rmHosts(ClientSourceHostsFile)
<mask> return <mask> } <mask> <mask> lines := strings.Split(string(d), "\n") <mask> n := 0 <mask> for _, ln := range lines { <mask> ln = strings.TrimSpace(ln) <mask> if len(ln) == 0 || ln[0] == '#' { </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close #1378 Sq...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
ok, e := clients.addHost(fields[0], fields[1], ClientSourceHostsFile)
<mask> if len(fields) < 2 { <mask> continue <mask> } <mask> <mask> ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile) <mask> if e != nil { <mask> log.Tracef("%s", e) <mask> } <mask> if ok { <mask> n++ </s> Merge: * clients: update runtime clients of type DHCP by event...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
log.Debug("Clients: added %d client aliases from %s", n, hostsFn)
<mask> n++ <mask> } <mask> } <mask> <mask> log.Debug("Added %d client aliases from %s", n, hostsFn) <mask> } <mask> <mask> // Add IP -> Host pairs from the system's `arp -a` command output <mask> // The command's output is: <mask> // HOST (IP) at MAC on IFACE </s> Merge: * clients: update runtime cl...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
clients.lock.Lock() defer clients.lock.Unlock() _ = clients.rmHosts(ClientSourceARP)
<mask> } <mask> <mask> n := 0 <mask> lines := strings.Split(string(data), "\n") <mask> for _, ln := range lines { <mask> <mask> open := strings.Index(ln, " (") </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close #1378 Squashed commit of the following: commit e45e...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
ok, e := clients.addHost(ip, host, ClientSourceARP)
<mask> if utils.IsValidHostname(host) != nil || net.ParseIP(ip) == nil { <mask> continue <mask> } <mask> <mask> ok, e := clients.AddHost(ip, host, ClientSourceARP) <mask> if e != nil { <mask> log.Tracef("%s", e) <mask> } <mask> if ok { <mask> n++ </s> Merge: * clients: update runtime cl...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
log.Debug("Clients: added %d client aliases from 'arp -a' command output", n)
<mask> n++ <mask> } <mask> } <mask> <mask> log.Debug("Added %d client aliases from 'arp -a' command output", n) <mask> } <mask> <mask> // add clients from DHCP that have non-empty Hostname property <mask> func (clients *clientsContainer) addFromDHCP() { <mask> if clients.dhcpServer == nil { </s> Me...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
// Add clients from DHCP that have non-empty Hostname property
<mask> <mask> log.Debug("Added %d client aliases from 'arp -a' command output", n) <mask> } <mask> <mask> // add clients from DHCP that have non-empty Hostname property <mask> func (clients *clientsContainer) addFromDHCP() { <mask> if clients.dhcpServer == nil { <mask> return <mask> } <mask> leases :=...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
clients.lock.Lock() defer clients.lock.Unlock() _ = clients.rmHosts(ClientSourceDHCP) leases := clients.dhcpServer.Leases(dhcpd.LeasesAll)
<mask> func (clients *clientsContainer) addFromDHCP() { <mask> if clients.dhcpServer == nil { <mask> return <mask> } <mask> leases := clients.dhcpServer.Leases() <mask> n := 0 <mask> for _, l := range leases { <mask> if len(l.Hostname) == 0 { <mask> continue <mask> } </s> Merge: * clients: upda...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
<mask> for _, l := range leases { <mask> if len(l.Hostname) == 0 { <mask> continue <mask> } <mask> ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP) <mask> if ok { <mask> n++ <mask> } <mask> } <mask> log.Debug("Added %d client aliases from DHCP", n) </s> Merge: * client...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
log.Debug("Clients: added %d client aliases from DHCP", n)
<mask> if ok { <mask> n++ <mask> } <mask> } <mask> log.Debug("Added %d client aliases from DHCP", n) <mask> } </s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module Close #1378 Squashed commit of the following: commit e45e2d0e2768fe0677eee43538d381b3eaba39ca Merge: bea8f7...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395
home/clients.go
"es6-error": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" },
<mask> } <mask> }, <mask> "es6-iterator": { <mask> "version": "2.0.3", <mask> "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", <mask> "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", <mask> "dev": true, </s> Added initial layout for DHCP serv...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/package-lock.json
"resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
<mask> "dev": true <mask> }, <mask> "html-webpack-plugin": { <mask> "version": "3.2.0", <mask> "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", <mask> "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", <mask> "dev": true, <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/package-lock.json
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
<mask> } <mask> }, <mask> "readable-stream": { <mask> "version": "1.0.34", <mask> "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", <mask> "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", <mask> "dev": true, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/package-lock.json
"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
<mask> }, <mask> "is-promise": { <mask> "version": "2.1.0", <mask> "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", <mask> "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", <mask> "dev": true <mask> }, <mask> "is-regex": { <mask> "version...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/package-lock.json
"redux-form": { "version": "7.4.2", "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.4.2.tgz", "integrity": "sha512-QxC36s4Lelx5Cr8dbpxqvl23dwYOydeAX8c6YPmgkz/Dhj053C16S2qoyZN6LO6HJ2oUF00rKsAyE94GwOUhFA==", "requires": { "es6-error": "^4.1.1", "hoist-non-reac...
<mask> } <mask> }, <mask> "redux-thunk": { <mask> "version": "2.3.0", <mask> "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz", <mask> "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" <mask> ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/package-lock.json
"resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
<mask> "dev": true <mask> }, <mask> "through": { <mask> "version": "2.3.8", <mask> "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", <mask> "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", <mask> "dev": true <mask> }, <mask> "through2": { <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/package-lock.json
"redux-form": "^7.4.2",
<mask> "react-transition-group": "^2.4.0", <mask> "redux": "^4.0.0", <mask> "redux-actions": "^2.4.0", <mask> "redux-thunk": "^2.3.0", <mask> "svg-url-loader": "^2.3.2", <mask> "whatwg-fetch": "2.0.3" <mask> }, <mask> "devDependencies": { </s> Added initial layout for DHCP server co...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/package.json
<mask> "found_in_known_domain_db": "Found in the known domains database.", <mask> "category_label": "Category", <mask> "rule_label": "Rule", <mask> "filter_label": "Filter", <mask> "unknown_filter": "Unknown filter {{filterId}}" <mask> } </s> Added initial layout for DHCP server config </s> re...
[ "keep", "keep", "keep", "keep", "replace", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/__locales/en.json
position: relative;
<mask> .form__group { <mask> margin-bottom: 15px; <mask> } <mask> <mask> .form__group:last-child { </s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions'; </s> add import { init...
[ "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/components/Settings/Settings.css
.form__group--dhcp:last-child { margin-bottom: 15px; }
<mask> } <mask> <mask> .btn-standart { <mask> padding-left: 20px; <mask> padding-right: 20px; <mask> } </s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions'; </s> add import {...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/components/Settings/Settings.css
import Dhcp from './Dhcp';
<mask> import PropTypes from 'prop-types'; <mask> import { withNamespaces, Trans } from 'react-i18next'; <mask> import Upstream from './Upstream'; <mask> import Checkbox from '../ui/Checkbox'; <mask> import Loading from '../ui/Loading'; <mask> import PageTitle from '../ui/PageTitle'; <mask> import Card from '../...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/components/Settings/index.js
this.props.getDhcpStatus();
<mask> }; <mask> <mask> componentDidMount() { <mask> this.props.initSettings(this.settings); <mask> } <mask> <mask> handleUpstreamChange = (value) => { <mask> this.props.handleUpstreamChange({ upstreamDns: value }); </s> Added initial layout for DHCP server config </s> remove ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/components/Settings/index.js
<Dhcp dhcp={this.props.dhcp} toggleDhcp={this.props.toggleDhcp} getDhcpStatus={this.props.getDhcpStatus} findActiveDhcp={this.props.findActiveDh...
<mask> handleUpstreamTest={this.handleUpstreamTest} <mask> /> <mask> </div> <mask> </div> <mask> </div> <mask> } <mask> </Fragment> <mask> ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/components/Settings/index.js
import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast, toggleDhcp, getDhcpStatus, setDhcpConfig, findActiveDhcp, } from '../actions';
<mask> import { connect } from 'react-redux'; <mask> import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions'; <mask> import Settings from '../components/Settings'; <mask> <mask> const mapStateToProps = (state) => { <mask> const { settings, dash...
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/containers/Settings.js
const { settings, dashboard, dhcp } = state; const props = { settings, dashboard, dhcp };
<mask> import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions'; <mask> import Settings from '../components/Settings'; <mask> <mask> const mapStateToProps = (state) => { <mask> const { settings, dashboard } = state; <mask> const props = { se...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/containers/Settings.js
toggleDhcp, getDhcpStatus, setDhcpConfig, findActiveDhcp,
<mask> handleUpstreamChange, <mask> setUpstream, <mask> testUpstream, <mask> addErrorToast, <mask> }; <mask> <mask> export default connect( <mask> mapStateToProps, <mask> mapDispatchToProps, </s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSett...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/containers/Settings.js
export const R_IPV4 = /^(?:(?:^|\.)(?:2(?:5[0-5]|[0-4]\d)|1?\d?\d)){4}$/g;
<mask> export const R_URL_REQUIRES_PROTOCOL = /^https?:\/\/\w[\w_\-.]*\.[a-z]{2,8}[^\s]*$/; <mask> <mask> export const STATS_NAMES = { <mask> avg_processing_time: 'average_processing_time', <mask> blocked_filtering: 'Blocked by filters', <mask> dns_queries: 'DNS queries', </s> Added initial layout f...
[ "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/helpers/constants.js
import { reducer as formReducer } from 'redux-form';
<mask> import { combineReducers } from 'redux'; <mask> import { handleActions } from 'redux-actions'; <mask> import { loadingBarReducer } from 'react-redux-loading-bar'; <mask> import nanoid from 'nanoid'; <mask> import versionCompare from '../helpers/versionCompare'; <mask> <mask> import * as actions from '../...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/reducers/index.js
processingDhcpStatus: false,
<mask> processing: true, <mask> processingTestUpstream: false, <mask> processingSetUpstream: false, <mask> }); <mask> <mask> const dashboard = handleActions({ <mask> [actions.dnsStatusRequest]: state => ({ ...state, processing: true }), </s> Added initial layout for DHCP server config </s> remo...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/reducers/index.js
dhcp,
<mask> queryLogs, <mask> filtering, <mask> toasts, <mask> loadingBar: loadingBarReducer, <mask> form: formReducer, <mask> }); </s> Added initial layout for DHCP server config </s> remove "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", </s> ...
[ "keep", "keep", "add", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6
client/src/reducers/index.js
"github.com/AdguardTeam/AdGuardHome/dhcpd/nclient4"
<mask> "runtime" <mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/insomniacslk/dhcp/dhcpv4" <mask> "github.com/insomniacslk/dhcp/dhcpv6" <mask> "github.com/insomniacslk/dhcp/dhcpv6/nclient6" <mask> "github.com/insomniacslk/dhcp/iana" <mask> ) </s> * copy dhcpv4/nclien...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
dhcpd/check_other_dhcp.go
<mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/insomniacslk/dhcp/dhcpv4" <mask> "github.com/insomniacslk/dhcp/dhcpv4/nclient4" <mask> "github.com/insomniacslk/dhcp/dhcpv6" <mask> "github.com/insomniacslk/dhcp/dhcpv6/nclient6" <mask> "github.com/insomniacslk/dhcp/iana"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
dhcpd/check_other_dhcp.go
github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/AdguardTeam/dnsproxy v0.30.1 <mask> github.com/AdguardTeam/golibs v0.4.2 <mask> github.com/AdguardTeam/urlfilter v0.11.2 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/fsnotify/fsnotify v1.4.7 <mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/hugelgupf/socketpai...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.mod
github.com/google/go-cmp v0.4.0 // indirect github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
<mask> github.com/AdguardTeam/urlfilter v0.11.2 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/fsnotify/fsnotify v1.4.7 <mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect <mask> github.com/insomniacslk/dhcp v0.0.0-2...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.mod
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect <mask> github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7 <mask> github.com/joomcode/errorx v1.0.1 <mask> github.com/kardianos/service v1.1.0 <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.mod
github.com/sirupsen/logrus v1.6.0 // indirect
<mask> github.com/miekg/dns v1.1.29 <mask> github.com/pkg/errors v0.9.1 <mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c <mask> github.com/stretchr/testify v1.5.1 <mask> github.com/u-root/u-root v6.0.0+incompatible <mask> go.etcd.io/bbolt v1.3.4 <mask> golang.org/x/crypto v0.0.0-2020062...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.mod
github.com/u-root/u-root v6.0.0+incompatible
<mask> github.com/miekg/dns v1.1.29 <mask> github.com/pkg/errors v0.9.1 <mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c <mask> github.com/stretchr/testify v1.5.1 <mask> github.com/u-root/u-root v6.0.0+incompatible // indirect <mask> go.etcd.io/bbolt v1.3.4 <mask> golang.org/x/crypto v0...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.mod
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 golang.org/x/net v0.0.0-20200625001655-4c5254603344 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c <mask> github.com/stretchr/testify v1.5.1 <mask> github.com/u-root/u-root v6.0.0+incompatible // indirect <mask> go.etcd.io/bbolt v1.3.4 <mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 <mask> golang.org/x/net v0.0.0-2020032414...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.mod
gopkg.in/yaml.v2 v2.3.0
<mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 <mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e <mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 <mask> gopkg.in/yaml.v2 v2.2.8 <mask> ) </s> * copy dhcpv4/nclient4 package with ...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.mod
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
<mask> github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= <mask> github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= <mask> github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= <mask> github.com/go-ole/go-ole v1.2.4/g...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw= <mask> github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= <mask> github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= <mask> github.com/google/go-cmp v0.3...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k= github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= <mask> github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= <mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuP...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
<mask> github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= <mask> github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
<mask> github.com/shirou/gopsutil v2.20.3+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= <mask> github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= <mask> github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= <mask> github.com/spa...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 h1:fpnn/HnJONpIu6hkXi1u/7rR0NzilgWr4T0JmWkEitk= <mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8/go.mod h1:LzIPMQfyMNhhGPhUkY...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= <mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= <mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpK...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkc...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA= <mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= <mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9M...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= <mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= <mask> gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= <mask> gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmq...
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17
go.sum
<mask> "form_error_ip6_format": "Invalid IPv6 format", <mask> "form_error_ip_format": "Invalid IP format", <mask> "form_error_mac_format": "Invalid MAC format", <mask> "form_error_client_id_format": "Invalid client ID format", <mask> "form_error_server_name": "Invalid server name", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da
client/src/__locales/en.json
<mask> "blocking_ipv4": "Blocking IPv4", <mask> "blocking_ipv6": "Blocking IPv6", <mask> "dns_over_https": "DNS-over-HTTPS", <mask> "dns_over_tls": "DNS-over-TLS", <mask> "dns_over_quic": "DNS-over-QUIC", <mask> "client_id": "Client ID", <mask> "client_id_placeholder": "Enter client I...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da
client/src/__locales/en.json