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
golang.org/x/net v0.4.0 golang.org/x/sys v0.3.0
<mask> github.com/ti-mo/netfilter v0.4.0 <mask> go.etcd.io/bbolt v1.3.6 <mask> golang.org/x/crypto v0.1.0 <mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136 <mask> golang.org/x/net v0.1.0 <mask> golang.org/x/sys v0.2.0 <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 <mask> gopkg.in/yaml.v3 v3.0.1...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
go.mod
golang.org/x/text v0.5.0 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect <mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect <mask> golang.org/x/mod v0.6.0 // indirect <mask> golang.org/x/sync v0.1.0 // indirect <mask> golang.org/x/text v0.4.0 // indirect <mask> golang.org/x/tools v0.2.0 // indirect ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
go.mod
github.com/AdguardTeam/dnsproxy v0.46.5 h1:TiJZhwaIDDaKkqEfJ9AD9aroFjcHN8oEbKB8WfTjSIs= github.com/AdguardTeam/dnsproxy v0.46.5/go.mod h1:yKBVgFlE6CqTQtye++3e7SATaMPc4Ixij+KkHsM6HhM=
<mask> github.com/AdguardTeam/dnsproxy v0.46.4 h1:/+wnTG0q2TkGQyA1PeSsjv4/f5ZprGduKPSoOcG+rOU= <mask> github.com/AdguardTeam/dnsproxy v0.46.4/go.mod h1:yYDMAH6ay2PxLcLtfVM3FUiyv/U9B/zYO+cIIssuJNU= <mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/Ad...
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
go.sum
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= <mask> golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= <mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
go.sum
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
go.sum
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= <mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= <mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= <mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71r...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
go.sum
// TODO(e.burkov, a.garipov): Return critical errors, not just log them. // This will require filtering all the non-critical errors in // [upstream.Upstream] implementations.
<mask> <mask> // stopLocked stops the DNS server without locking. For internal use only. <mask> func (s *Server) stopLocked() (err error) { <mask> if s.dnsProxy != nil { <mask> err = s.dnsProxy.Stop() <mask> if err != nil { <mask> log.Error("dnsforward: closing primary resolvers: %s", err) <mask> } ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
internal/dnsforward/dnsforward.go
log.Error("dnsforward: closing primary resolvers: %s", err)
<mask> func (s *Server) stopLocked() (err error) { <mask> if s.dnsProxy != nil { <mask> err = s.dnsProxy.Stop() <mask> if err != nil { <mask> return fmt.Errorf("closing primary resolvers: %w", err) <mask> } <mask> } <mask> <mask> var errs []error <mask> </s> Pull request: 5251-close-ups Merge ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
internal/dnsforward/dnsforward.go
<mask> return fmt.Errorf("closing primary resolvers: %w", err) <mask> } <mask> } <mask> <mask> var errs []error <mask> <mask> if upsConf := s.internalProxy.UpstreamConfig; upsConf != nil { <mask> const action = "closing internal resolvers" <mask> <mask> err = upsConf.Close() <mask> if err !=...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
internal/dnsforward/dnsforward.go
<mask> <mask> var errs []error <mask> <mask> if upsConf := s.internalProxy.UpstreamConfig; upsConf != nil { <mask> const action = "closing internal resolvers" <mask> <mask> err = upsConf.Close() <mask> if err != nil { <mask> if errors.Is(err, net.ErrClosed) { <mask> log.Debug("dnsforward: %s...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
internal/dnsforward/dnsforward.go
log.Error("dnsforward: closing internal resolvers: %s", err)
<mask> const action = "closing internal resolvers" <mask> <mask> err = upsConf.Close() <mask> if err != nil { <mask> if errors.Is(err, net.ErrClosed) { <mask> log.Debug("dnsforward: %s: %s", action, err) <mask> } else { <mask> errs = append(errs, fmt.Errorf("%s: %w", action, err)) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
internal/dnsforward/dnsforward.go
<mask> } <mask> } <mask> <mask> if upsConf := s.localResolvers.UpstreamConfig; upsConf != nil { <mask> const action = "closing local resolvers" <mask> <mask> err = upsConf.Close() <mask> if err != nil { <mask> if errors.Is(err, net.ErrClosed) { <mask> log.Debug("dnsforward: %s: %s", action,...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
internal/dnsforward/dnsforward.go
log.Error("dnsforward: closing local resolvers: %s", err)
<mask> const action = "closing local resolvers" <mask> <mask> err = upsConf.Close() <mask> if err != nil { <mask> if errors.Is(err, net.ErrClosed) { <mask> log.Debug("dnsforward: %s: %s", action, err) <mask> } else { <mask> errs = append(errs, fmt.Errorf("%s: %w", action, err)) <mask> }...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
internal/dnsforward/dnsforward.go
s.isRunning = false
<mask> } <mask> } <mask> } <mask> <mask> if len(errs) > 0 { <mask> return errors.List("stopping dns server", errs...) <mask> } else { <mask> s.isRunning = false <mask> } <mask> <mask> return nil <mask> } <mask> <mask> // IsRunning returns true if the DNS server is running. </s> Pull requ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba
internal/dnsforward/dnsforward.go
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
<mask> "net" <mask> "net/http" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/AdguardTeam/goli...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/dnsforward/access.go
err = merged.Validate(aghalg.StringIsBefore)
<mask> return fmt.Errorf("validating blocked hosts: %w", err) <mask> } <mask> <mask> merged := allowed.Merge(disallowed) <mask> err = merged.Validate(aghalgo.StringIsBefore) <mask> if err != nil { <mask> return fmt.Errorf("items in allowed and disallowed clients intersect: %w", err) <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/dnsforward/access.go
func validateStrUniq(clients []string) (uc aghalg.UniqChecker, err error) { uc = make(aghalg.UniqChecker, len(clients))
<mask> return nil <mask> } <mask> <mask> // validateStrUniq returns an informative error if clients are not unique. <mask> func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) { <mask> uv = make(aghalgo.UniquenessValidator, len(clients)) <mask> for _, c := range clients { <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/dnsforward/access.go
uc.Add(c)
<mask> // validateStrUniq returns an informative error if clients are not unique. <mask> func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) { <mask> uv = make(aghalgo.UniquenessValidator, len(clients)) <mask> for _, c := range clients { <mask> uv.Add(c) <mask> } <mask> <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/dnsforward/access.go
return uc, uc.Validate(aghalg.StringIsBefore)
<mask> for _, c := range clients { <mask> uv.Add(c) <mask> } <mask> <mask> return uv, uv.Validate(aghalgo.StringIsBefore) <mask> } <mask> <mask> func (s *Server) handleAccessSet(w http.ResponseWriter, r *http.Request) { <mask> list := &accessListJSON{} <mask> err := json.NewDecoder(r.Body).Decode(&li...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/dnsforward/access.go
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
<mask> "os" <mask> "path/filepath" <mask> "sync" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/config.go
uc := aghalg.UniqChecker{}
<mask> if err != nil { <mask> return err <mask> } <mask> <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> config.BindPort, <mask> config.BetaBindPort, <mask> config.DNS.Port, </s> Pull request: 4095 fix duplicating port Merge in DNS/adguard-home from 4095-port-300...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/config.go
uc,
<mask> } <mask> <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> config.BindPort, <mask> config.BetaBindPort, <mask> config.DNS.Port, <mask> ) <mask> </s> Pull request: 4095 fix duplicating port Merge in DNS/adguard-home from 4095-port-3000 to master Updates #4095...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/config.go
uc,
<mask> ) <mask> <mask> if config.TLS.Enabled { <mask> addPorts( <mask> uv, <mask> config.TLS.PortHTTPS, <mask> config.TLS.PortDNSOverTLS, <mask> config.TLS.PortDNSOverQUIC, <mask> config.TLS.PortDNSCrypt, <mask> ) </s> Pull request: 4095 fix duplicating port Merge in DNS/adguard-home f...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/config.go
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
<mask> config.TLS.PortDNSOverQUIC, <mask> config.TLS.PortDNSCrypt, <mask> ) <mask> } <mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil { <mask> return fmt.Errorf("validating ports: %w", err) <mask> } <mask> <mask> if !checkFiltersUpdateIntervalHours(config.DNS.FiltersUpdateIntervalHou...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/config.go
func addPorts(uc aghalg.UniqChecker, ports ...int) {
<mask> return nil <mask> } <mask> <mask> // addPorts is a helper for ports validation. It skips zero ports. <mask> func addPorts(uv aghalgo.UniquenessValidator, ports ...int) { <mask> for _, p := range ports { <mask> if p != 0 { <mask> uv.Add(p) <mask> } <mask> } </s> Pull request: 4095 fix dupli...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/config.go
uc.Add(p)
<mask> // addPorts is a helper for ports validation. It skips zero ports. <mask> func addPorts(uv aghalgo.UniquenessValidator, ports ...int) { <mask> for _, p := range ports { <mask> if p != 0 { <mask> uv.Add(p) <mask> } <mask> } <mask> } <mask> <mask> // readConfigFile reads configuration file con...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/config.go
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
<mask> "runtime" <mask> "strings" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/version" <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
type checkConfReqEnt struct {
<mask> return <mask> } <mask> } <mask> <mask> type checkConfigReqEnt struct { <mask> IP net.IP `json:"ip"` <mask> Port int `json:"port"` <mask> Autofix bool `json:"autofix"` <mask> } <mask> </s> Pull request: 4095 fix duplicating port Merge in DNS/adguard-home from 4095-port-3000 to mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
type checkConfReq struct { Web checkConfReqEnt `json:"web"` DNS checkConfReqEnt `json:"dns"` SetStaticIP bool `json:"set_static_ip"`
<mask> Port int `json:"port"` <mask> Autofix bool `json:"autofix"` <mask> } <mask> <mask> type checkConfigReq struct { <mask> Web checkConfigReqEnt `json:"web"` <mask> DNS checkConfigReqEnt `json:"dns"` <mask> SetStaticIP bool `json:"set_static_ip"` <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
type checkConfRespEnt struct {
<mask> DNS checkConfigReqEnt `json:"dns"` <mask> SetStaticIP bool `json:"set_static_ip"` <mask> } <mask> <mask> type checkConfigRespEnt struct { <mask> Status string `json:"status"` <mask> CanAutofix bool `json:"can_autofix"` <mask> } <mask> <mask> type staticIPJSON struct { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
type checkConfResp struct { StaticIP staticIPJSON `json:"static_ip"` Web checkConfRespEnt `json:"web"` DNS checkConfRespEnt `json:"dns"`
<mask> IP string `json:"ip"` <mask> Error string `json:"error"` <mask> } <mask> <mask> type checkConfigResp struct { <mask> StaticIP staticIPJSON `json:"static_ip"` <mask> Web checkConfigRespEnt `json:"web"` <mask> DNS checkConfigRespEnt `json:"dns"` <mask> } <mask> <mask> // Chec...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
// validateWeb returns error is the web part if the initial configuration can't // be set. func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) { defer func() { err = errors.Annotate(err, "validating ports: %w") }()
<mask> Web checkConfigRespEnt `json:"web"` <mask> DNS checkConfigRespEnt `json:"dns"` <mask> } <mask> <mask> // Check if ports are available, respond with results <mask> func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) { <mask> reqData := checkConfigReq{} <mask> re...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
port := req.Web.Port addPorts(uc, config.BetaBindPort, port) if err = uc.Validate(aghalg.IntIsBefore); err != nil { // Avoid duplicating the error into the status of DNS. uc[port] = 1
<mask> func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) { <mask> reqData := checkConfigReq{} <mask> respData := checkConfigResp{} <mask> <mask> err := json.NewDecoder(r.Body).Decode(&reqData) <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusBadRequest, "Failed t...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
return err
<mask> err := json.NewDecoder(r.Body).Decode(&reqData) <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err) <mask> <mask> return <mask> } <mask> <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, </s> Pu...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
switch port { case 0, config.BindPort: return nil default: // Go on and check the port binding only if it's not zero or won't be // unbound after install. } return aghnet.CheckPort("tcp", req.Web.IP, port) } // validateDNS returns error if the DNS part of the initial configuration can't // be set. autofix...
<mask> <mask> return <mask> } <mask> <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> config.BindPort, <mask> config.BetaBindPort, <mask> reqData.Web.Port, <mask> ) <mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil { <mask> err = fmt.Errorf("valida...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
return false, err } } err = aghnet.CheckPort("udp", req.DNS.IP, port) if !aghnet.IsAddrInUse(err) { return false, err } // Try to fix automatically. canAutofix = checkDNSStubListener() if canAutofix && req.DNS.Autofix { if derr := disableDNSStubListener(); derr != nil { log.Error("disabling DNSStub...
<mask> respData.Web.Status = err.Error() <mask> } else if reqData.Web.Port != 0 { <mask> err = aghnet.CheckPort("tcp", reqData.Web.IP, reqData.Web.Port) <mask> if err != nil { <mask> respData.Web.Status = err.Error() <mask> } <mask> } <mask> <mask> addPorts(uv, reqData.DNS.Port) <mask> if err ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
err = aghnet.CheckPort("udp", req.DNS.IP, port) canAutofix = false
<mask> if derr := disableDNSStubListener(); derr != nil { <mask> log.Error("disabling DNSStubListener: %s", err) <mask> } <mask> } <mask> <mask> return canAutofix, err <mask> } <mask> <mask> // handleInstallCheckConfig handles the /check_config endpoint. </s> Pull request: 4095 fix duplicating port...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
return canAutofix, err }
<mask> respData.Web.Status = err.Error() <mask> } <mask> } <mask> <mask> addPorts(uv, reqData.DNS.Port) <mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil { <mask> err = fmt.Errorf("validating ports: %w", err) <mask> respData.DNS.Status = err.Error() <mask> } else if reqData.DNS.Port !=...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
// handleInstallCheckConfig handles the /check_config endpoint. func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) { req := &checkConfReq{}
<mask> respData.DNS.Status = err.Error() <mask> } else if reqData.DNS.Port != 0 { <mask> err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port) <mask> <mask> if aghnet.IsAddrInUse(err) { <mask> canAutofix := checkDNSStubListener() <mask> if canAutofix && reqData.DNS.Autofix { <mask> <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
err := json.NewDecoder(r.Body).Decode(req) if err != nil { aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err)
<mask> if aghnet.IsAddrInUse(err) { <mask> canAutofix := checkDNSStubListener() <mask> if canAutofix && reqData.DNS.Autofix { <mask> <mask> err = disableDNSStubListener() <mask> if err != nil { <mask> log.Error("Couldn't disable DNSStubListener: %s", err) <mask> } <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
return }
<mask> if err != nil { <mask> log.Error("Couldn't disable DNSStubListener: %s", err) <mask> } <mask> <mask> err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port) <mask> canAutofix = false <mask> } <mask> <mask> respData.DNS.CanAutofix = canAutofix <mask> } <mask> <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
resp := &checkConfResp{} uc := aghalg.UniqChecker{}
<mask> err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port) <mask> canAutofix = false <mask> } <mask> <mask> respData.DNS.CanAutofix = canAutofix <mask> } <mask> <mask> if err == nil { <mask> err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port) <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
if err = req.validateWeb(uc); err != nil { resp.Web.Status = err.Error() }
<mask> <mask> respData.DNS.CanAutofix = canAutofix <mask> } <mask> <mask> if err == nil { <mask> err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port) <mask> } <mask> <mask> if err != nil { <mask> respData.DNS.Status = err.Error() <mask> } else if !reqData.DNS.IP.IsUnspecified...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil { resp.DNS.Status = err.Error() } else if !req.DNS.IP.IsUnspecified() { resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP)
<mask> if err == nil { <mask> err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port) <mask> } <mask> <mask> if err != nil { <mask> respData.DNS.Status = err.Error() <mask> } else if !reqData.DNS.IP.IsUnspecified() { <mask> respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.Set...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
err = json.NewEncoder(w).Encode(resp)
<mask> } <mask> } <mask> <mask> w.Header().Set("Content-Type", "application/json") <mask> err = json.NewEncoder(w).Encode(respData) <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err) <mask> <mask> return <mask> } </s> Pull request...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
aghhttp.Error(r, w, http.StatusInternalServerError, "encoding the response: %s", err)
<mask> <mask> w.Header().Set("Content-Type", "application/json") <mask> err = json.NewEncoder(w).Encode(respData) <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err) <mask> <mask> return <mask> } <mask> } <mask> </s> Pull request: 40...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
nonBetaReqData := checkConfReq{ Web: checkConfReqEnt{
<mask> <mask> return <mask> } <mask> <mask> nonBetaReqData := checkConfigReq{ <mask> Web: checkConfigReqEnt{ <mask> IP: reqData.Web.IP[0], <mask> Port: reqData.Web.Port, <mask> Autofix: reqData.Web.Autofix, <mask> }, <mask> DNS: checkConfigReqEnt{ </s> Pull request: 4095 fix dup...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
DNS: checkConfReqEnt{
<mask> IP: reqData.Web.IP[0], <mask> Port: reqData.Web.Port, <mask> Autofix: reqData.Web.Autofix, <mask> }, <mask> DNS: checkConfigReqEnt{ <mask> IP: reqData.DNS.IP[0], <mask> Port: reqData.DNS.Port, <mask> Autofix: reqData.DNS.Autofix, <mask> }, <mask> SetStaticIP: r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/controlinstall.go
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
<mask> "sync" <mask> "syscall" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" <mask> "git...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/home.go
uc := aghalg.UniqChecker{}
<mask> <mask> Context.clients.Init(config.Clients, Context.dhcpServer, Context.etcHosts) <mask> <mask> if args.bindPort != 0 { <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> args.bindPort, <mask> config.BetaBindPort, <mask> config.DNS.Port, </s> Pull request...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/home.go
uc,
<mask> <mask> if args.bindPort != 0 { <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> args.bindPort, <mask> config.BetaBindPort, <mask> config.DNS.Port, <mask> ) <mask> if config.TLS.Enabled { </s> Pull request: 4095 fix duplicating port Merge in DNS/adgua...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/home.go
uc,
<mask> config.DNS.Port, <mask> ) <mask> if config.TLS.Enabled { <mask> addPorts( <mask> uv, <mask> config.TLS.PortHTTPS, <mask> config.TLS.PortDNSOverTLS, <mask> config.TLS.PortDNSOverQUIC, <mask> config.TLS.PortDNSCrypt, <mask> ) </s> Pull request: 4095 fix duplicating port ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/home.go
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
<mask> config.TLS.PortDNSOverQUIC, <mask> config.TLS.PortDNSCrypt, <mask> ) <mask> } <mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil { <mask> return fmt.Errorf("validating ports: %w", err) <mask> } <mask> <mask> config.BindPort = args.bindPort <mask> } </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/home.go
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
<mask> "strings" <mask> "sync" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/tls.go
uc := aghalg.UniqChecker{}
<mask> setts.PrivateKey = t.conf.PrivateKey <mask> } <mask> <mask> if setts.Enabled { <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> config.BindPort, <mask> config.BetaBindPort, <mask> config.DNS.Port, </s> Pull request: 4095 fix duplicating port Merge in ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/tls.go
uc,
<mask> <mask> if setts.Enabled { <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> config.BindPort, <mask> config.BetaBindPort, <mask> config.DNS.Port, <mask> setts.PortHTTPS, <mask> setts.PortDNSOverTLS, </s> Pull request: 4095 fix duplicating port Merge ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/tls.go
err = uc.Validate(aghalg.IntIsBefore)
<mask> setts.PortDNSOverQUIC, <mask> setts.PortDNSCrypt, <mask> ) <mask> <mask> err = uv.Validate(aghalgo.IntIsBefore) <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusBadRequest, "validating ports: %s", err) <mask> <mask> return <mask> } </s> Pull request: 4095 fix duplicat...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/tls.go
uc := aghalg.UniqChecker{}
<mask> data.PrivateKey = t.conf.PrivateKey <mask> } <mask> <mask> if data.Enabled { <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> config.BindPort, <mask> config.BetaBindPort, <mask> config.DNS.Port, </s> Pull request: 4095 fix duplicating port Merge in DN...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/tls.go
uc,
<mask> <mask> if data.Enabled { <mask> uv := aghalgo.UniquenessValidator{} <mask> addPorts( <mask> uv, <mask> config.BindPort, <mask> config.BetaBindPort, <mask> config.DNS.Port, <mask> data.PortHTTPS, <mask> data.PortDNSOverTLS, </s> Pull request: 4095 fix duplicating port Merge in ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/tls.go
err = uc.Validate(aghalg.IntIsBefore)
<mask> data.PortDNSOverQUIC, <mask> data.PortDNSCrypt, <mask> ) <mask> <mask> err = uv.Validate(aghalgo.IntIsBefore) <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusBadRequest, "%s", err) <mask> <mask> return <mask> } </s> Pull request: 4095 fix duplicating port Merge in D...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8
internal/home/tls.go
// Return TRUE if DHCP packet is correct func isValidPacket(p dhcp4.Packet) bool { hw := p.CHAddr() zeroes := make([]byte, len(hw)) if bytes.Equal(hw, zeroes) { log.Tracef("Packet has empty CHAddr") return false } return true }
<mask> } <mask> <mask> func (s *Server) handleDiscover(p dhcp4.Packet, options dhcp4.Options) dhcp4.Packet { <mask> // find a lease, but don't update lease time <mask> var lease *Lease <mask> var err error <mask> <mask> reqIP := net.IP(options[dhcp4.OptionRequestedIPAddress]) </s> * dhcp: don't process D...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d832d7ce95478b595bbf966ffef644b6efaeee7d
dhcpd/dhcpd.go
if !isValidPacket(p) { return nil }
<mask> log.Tracef("Message from client: Discover. ReqIP: %s HW: %s Hostname: %s", <mask> reqIP, p.CHAddr(), hostname) <mask> <mask> lease = s.findLease(p) <mask> for lease == nil { <mask> lease, err = s.reserveLease(p) <mask> if err != nil { <mask> log.Error("Couldn't find free lease: %s", err) ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d832d7ce95478b595bbf966ffef644b6efaeee7d
dhcpd/dhcpd.go
if !isValidPacket(p) { return nil }
<mask> reqIP := net.IP(options[dhcp4.OptionRequestedIPAddress]) <mask> log.Tracef("Message from client: Request. IP: %s ReqIP: %s HW: %s", <mask> p.CIAddr(), reqIP, p.CHAddr()) <mask> <mask> server := options[dhcp4.OptionServerIdentifier] <mask> if server != nil && !net.IP(server).Equal(s.ipnet.IP) { <...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d832d7ce95478b595bbf966ffef644b6efaeee7d
dhcpd/dhcpd.go
"theme_auto_desc": "Auto (based on the color scheme of your device)", "theme_dark_desc": "Dark theme", "theme_light_desc": "Light theme",
<mask> "clear_cache": "Clear cache", <mask> "make_static": "Make static", <mask> "disable_for_seconds": "For {{count}} second", <mask> "disable_for_seconds_plural": "For {{count}} seconds", <mask> "disable_for_minutes": "For {{count}} minute", <mask> "disable_for_minutes_plural": "For {{co...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/__locales/en.json
.form__group--inner .form__group--checkbox { margin-bottom: 12px; } .form__group--inner .form__group--checkbox:last-child { margin-bottom: 0; }
<mask> .form__group--checkbox { <mask> margin-bottom: 25px; <mask> } <mask> <mask> .form__inline { <mask> display: flex; <mask> justify-content: flex-start; <mask> } <mask> <mask> .btn-standard { </s> Pull request: add UI theme controls Updates #5620 Squashed commit of the following: commit ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/Settings/Settings.css
.toast__dismiss:hover, .toast__dismiss:focus { outline: none; }
<mask> border: 0; <mask> cursor: pointer; <mask> } <mask> <mask> .toast-enter { <mask> opacity: 0.01; <mask> } <mask> <mask> .toast-enter-active { <mask> opacity: 1; </s> Pull request: add UI theme controls Updates #5620 Squashed commit of the following: commit a7095b8ba35c34d333b0bbe772...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/Toasts/Toast.css
import cn from 'classnames';
<mask> import React, { useState, useEffect } from 'react'; <mask> import { useTranslation } from 'react-i18next'; <mask> import { useDispatch, useSelector } from 'react-redux'; <mask> import classNames from 'classnames'; <mask> <mask> import { REPOSITORY, PRIVACY_POLICY_LINK, THEMES } from '../../helpers/constan...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Footer.js
const onThemeChange = (value) => { if (isLoggedIn) { dispatch(changeTheme(value)); } else { setUITheme(value); setCurrentThemeLocal(value); }
<mask> i18n.changeLanguage(value); <mask> setHtmlLangAttr(value); <mask> }; <mask> <mask> const onThemeChanged = (event) => { <mask> const { value } = event.target; <mask> dispatch(changeTheme(value)); <mask> }; <mask> <mask> const onThemeChangedLocal = (event...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Footer.js
className={cn('footer__link', className)}
<mask> <mask> const renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a <mask> key={name} <mask> href={href} <mask> className={classNames('footer__link', className)} <mask> target="_blank" <mask> rel="noopener noreferr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Footer.js
const renderThemeButtons = () => { const currentValue = isLoggedIn ? currentTheme : currentThemeLocal; const content = { auto: { desc: t('theme_auto_desc'), icon: '#auto', }, dark: { desc: t('theme_dark_desc'), ...
<mask> > <mask> {t(name)} <mask> </a>); <mask> <mask> const themeSelectOptions = () => ( <mask> Object.values(THEMES) <mask> .map((theme) => ( <mask> <option key={theme} value={theme}> <mask> {t(`theme_${theme}`)} <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Footer.js
<div className="footer__themes"> <div className="btn-group"> {renderThemeButtons()} </div> </div>
<mask> <div className="footer__column footer__column--links"> <mask> {renderLinks(linksData)} <mask> </div> <mask> <div className="footer__column footer__column--theme"> <mask> {isLoggedI...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Footer.js
<mask> <mask> import { MOBILE_CONFIG_LINKS } from '../../../helpers/constants'; <mask> <mask> import Tabs from '../Tabs'; <mask> import Icons from '../Icons'; <mask> import MobileConfigForm from './MobileConfigForm'; <mask> <mask> const renderLi = ({ label, components }) => <li key={label}> <mask> <Tran...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Guide/Guide.js
<mask> setActiveTabLabel={setActiveTabLabel} <mask> > <mask> {activeTab} <mask> </Tabs> <mask> <Icons /> <mask> </div> <mask> ); <mask> }; <mask> <mask> Guide.defaultProps = { </s> Pull request: add UI theme controls Updates #5...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Guide/Guide.js
<symbol id="auto" width="24" height="24" viewBox="0 0 24 24" fill="none"> <path fillRule="evenodd" clipRule="evenodd" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z" stroke="currentColor" strokeWidth="1.5" /> <path fill...
<mask> </svg> <mask> </symbol> <mask> <mask> <symbol id="chevron-down" width="24" height="24" viewBox="0 0 24 24"> <mask> <g fill="none" fillRule="evenodd"> <mask> <path d="M0 0h24v24H0z" fill="#878787" fillOpacity=".01" /> <mask> <path str...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Icons.js
<path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" d="M8.036 10.93l3.93 4.07 4.068-3.93" />
<mask> <mask> <symbol id="chevron-down" width="24" height="24" viewBox="0 0 24 24"> <mask> <g fill="none" fillRule="evenodd"> <mask> <path d="M0 0h24v24H0z" fill="#878787" fillOpacity=".01" /> <mask> <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="r...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/components/ui/Icons.js
import Icons from '../../components/ui/Icons';
<mask> <mask> import Toasts from '../../components/Toasts'; <mask> import Footer from '../../components/ui/Footer'; <mask> import logo from '../../components/ui/svg/logo.svg'; <mask> <mask> import './Setup.css'; <mask> import '../../components/ui/Tabler.css'; <mask> <mask> class Setup extends Component { <...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/install/Setup/index.js
<Icons />
<mask> </div> <mask> </div> <mask> <Footer /> <mask> <Toasts /> <mask> </Fragment> <mask> } <mask> </Fragment> <mask> ); </s> Pull request: add UI theme co...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2
client/src/install/Setup/index.js
<mask> <mask> import ( <mask> "bufio" <mask> "fmt" <mask> "log" <mask> "net" <mask> "net/http" <mask> "os" <mask> "os/signal" <mask> "path/filepath" </s> Use new log wrapper and add more functions to it. </s> remove "fmt" </s> add </s> remove "log" </s> add </s> remove "log" </s> add </s> r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
app.go
"github.com/AdguardTeam/AdGuardHome/log"
<mask> "syscall" <mask> "time" <mask> <mask> "github.com/gobuffalo/packr" <mask> "golang.org/x/crypto/ssh/terminal" <mask> ) <mask> <mask> // VersionString will be set through ldflags, contains current version </s> Use new log wrapper and add more functions to it. </s> remove "log" </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
app.go
{"verbose", "v", "enable verbose output", nil, func() { log.Verbose = true }},
<mask> panic("Got port that is not a number") <mask> } <mask> bindPort = &v <mask> }, nil}, <mask> // {"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }}, <mask> {"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, <mask> } <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
app.go
<mask> package main <mask> <mask> import ( <mask> "io/ioutil" <mask> "log" <mask> "os" <mask> "path/filepath" <mask> "sync" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dhcpd" </s> Use new log wrapper and add more functions to it. </s> remove "log" </s> add </s> remove "log" </s> add </s> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
config.go
"github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter" <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "gopkg.in/yaml.v2" <mask> ) <mask> <mask> const ( <mask> dataDir = "data" // data storage <mask> filterDir = "filters" // cache location for downloaded filters, it's under DataDir </s>...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
config.go
<mask> import ( <mask> "encoding/json" <mask> "fmt" <mask> "io/ioutil" <mask> "log" <mask> "net" <mask> "net/http" <mask> "os" <mask> "strconv" <mask> "strings" </s> Use new log wrapper and add more functions to it. </s> remove "log" </s> add </s> remove "log" </s> add </s> remove "log" </s>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
control.go
<mask> "strconv" <mask> "strings" <mask> "time" <mask> <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/miekg/dns" <mask> <mask> "gopkg.in/asaskevich/govalidator.v4" <mask> ) </s> Use new log wrapper and add more fun...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
control.go
"github.com/AdguardTeam/AdGuardHome/log" "github.com/AdguardTeam/dnsproxy/upstream"
<mask> <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/miekg/dns" <mask> "gopkg.in/asaskevich/govalidator.v4" <mask> ) <mask> <mask> const updatePeriod = time.Minute * 30 </s> Use new log wrapper and add more functions to it. </s> remove "github.com/AdguardTeam/dnsproxy/upstream"...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
control.go
<mask> import ( <mask> "encoding/json" <mask> "fmt" <mask> "io/ioutil" <mask> "log" <mask> "net" <mask> "net/http" <mask> "strings" <mask> "time" <mask> </s> Use new log wrapper and add more functions to it. </s> remove "log" </s> add </s> remove "log" </s> add </s> remove "log" </s> add </...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcp.go
"github.com/AdguardTeam/AdGuardHome/log"
<mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dhcpd" <mask> "github.com/joomcode/errorx" <mask> ) <mask> <mask> var dhcpServer = dhcpd.Server{} <mask> <mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) { </s> Use new log wrapper and add more functions to it. </s> remo...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcp.go
"github.com/AdguardTeam/AdGuardHome/log"
<mask> "time" <mask> <mask> "github.com/krolaw/dhcp4" <mask> ) <mask> <mask> func CheckIfOtherDHCPServersPresent(ifaceName string) (bool, error) { <mask> iface, err := net.InterfaceByName(ifaceName) </s> Use new log wrapper and add more functions to it. </s> remove "fmt" "os" "path" "runtime" </s> add...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/check_other_dhcp.go
log.Tracef("Listening to udp4 %+v", udpAddr)
<mask> return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst) <mask> } <mask> <mask> // bind to 0.0.0.0:68 <mask> trace("Listening to udp4 %+v", udpAddr) <mask> c, err := net.ListenPacket("udp4", src) <mask> if c != nil { <mask> defer c.Close() <mask> } <mask> // spew.Dump(c, err)...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/check_other_dhcp.go
log.Tracef("Waiting %v for an answer", defaultDiscoverTime)
<mask> return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst) <mask> } <mask> <mask> // wait for answer <mask> trace("Waiting %v for an answer", defaultDiscoverTime) <mask> // TODO: replicate dhclient's behaviour of retrying several times with progressively bigger timeouts <mask> b := make(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/check_other_dhcp.go
<mask> <mask> import ( <mask> "bytes" <mask> "fmt" <mask> "log" <mask> "net" <mask> "time" <mask> <mask> "github.com/krolaw/dhcp4" <mask> ) </s> Use new log wrapper and add more functions to it. </s> remove "log" </s> add </s> remove "log" </s> add </s> remove "log" </s> add </s> remove "os...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
"github.com/AdguardTeam/AdGuardHome/log"
<mask> "net" <mask> "time" <mask> <mask> "github.com/krolaw/dhcp4" <mask> ) <mask> <mask> const defaultDiscoverTime = time.Second * 3 <mask> <mask> // field ordering is important -- yaml fields will mirror ordering from here </s> Use new log wrapper and add more functions to it. </s> remove "log" </s>...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
// log.Tracef("found lease for %s: %+v", hwaddr, foundLease)
<mask> hwaddr := make(net.HardwareAddr, len(hwaddrCOW)) <mask> copy(hwaddr, hwaddrCOW) <mask> foundLease := s.locateLease(p) <mask> if foundLease != nil { <mask> // trace("found lease for %s: %+v", hwaddr, foundLease) <mask> return foundLease, nil <mask> } <mask> // not assigned a lease, create new on...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
log.Tracef("Lease not found for %s: creating new one", hwaddr)
<mask> // trace("found lease for %s: %+v", hwaddr, foundLease) <mask> return foundLease, nil <mask> } <mask> // not assigned a lease, create new one, find IP from LRU <mask> trace("Lease not found for %s: creating new one", hwaddr) <mask> ip, err := s.findFreeIP(p, hwaddr) <mask> if err != nil { <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String())
<mask> ip, err := s.findFreeIP(p, hwaddr) <mask> if err != nil { <mask> return nil, wrapErrPrint(err, "Couldn't find free IP for the lease %s", hwaddr.String()) <mask> } <mask> trace("Assigning to %s IP address %s", hwaddr, ip.String()) <mask> hostname := p.ParseOptions()[dhcp4.OptionHostName] <mask> lea...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
// log.Tracef("bytes.Equal(%s, %s) returned true", hwaddr, s.leases[i].hwaddr)
<mask> func (s *Server) locateLease(p dhcp4.Packet) *Lease { <mask> hwaddr := p.CHAddr() <mask> for i := range s.leases { <mask> if bytes.Equal([]byte(hwaddr), []byte(s.leases[i].HWAddr)) { <mask> // trace("bytes.Equal(%s, %s) returned true", hwaddr, s.leases[i].hwaddr) <mask> return s.leases[i] <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
<mask> var foundIP net.IP <mask> for i := 0; i < dhcp4.IPRange(s.leaseStart, s.leaseStop); i++ { <mask> newIP := dhcp4.IPAdd(s.leaseStart, i) <mask> foundHWaddr := s.getIPpool(newIP) <mask> trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr) <mask> if foundHWaddr != nil && len(foundHWaddr) != 0 { <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
// log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
<mask> foundHWaddr := s.getIPpool(newIP) <mask> trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr) <mask> if foundHWaddr != nil && len(foundHWaddr) != 0 { <mask> // if !bytes.Equal(foundHWaddr, hwaddr) { <mask> // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s",...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
log.Tracef("will try again")
<mask> if foundHWaddr != nil && len(foundHWaddr) != 0 { <mask> // if !bytes.Equal(foundHWaddr, hwaddr) { <mask> // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) <mask> // } <mask> trace("will try again") <mask> continue <mask> } <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go
log.Tracef("Got %v message", msgType) log.Tracef("Leases:")
<mask> delete(s.IPpool, IP4) <mask> } <mask> <mask> func (s *Server) ServeDHCP(p dhcp4.Packet, msgType dhcp4.MessageType, options dhcp4.Options) dhcp4.Packet { <mask> trace("Got %v message", msgType) <mask> trace("Leases:") <mask> for i, lease := range s.leases { <mask> trace("Lease #%d: hwaddr %s, ip %s...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8
dhcpd/dhcpd.go