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
tableRev := make(map[string][]string)
<mask> <mask> // updateHosts - loads system hosts <mask> func (a *AutoHosts) updateHosts() { <mask> table := make(map[string][]net.IP) <mask> tableRev := make(map[string]string) <mask> <mask> a.load(table, tableRev, a.hostsFn) <mask> <mask> for _, dir := range a.hostsDirs { <mask> fis, err := ioutil....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff
internal/util/auto_hosts.go
_ = os.MkdirAll(dir, 0o755)
<mask> <mask> func prepareTestDir() string { <mask> const dir = "./agh-test" <mask> _ = os.RemoveAll(dir) <mask> _ = os.MkdirAll(dir, 0755) <mask> return dir <mask> } <mask> <mask> func TestAutoHostsResolution(t *testing.T) { <mask> ah := AutoHosts{} </s> Pull request: * all: allow multiple hosts in r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff
internal/util/auto_hosts_test.go
names, ok := table["127.0.0.1"]
<mask> assert.Nil(t, ips) <mask> <mask> // Test hosts file <mask> table := ah.List() <mask> name, ok := table["127.0.0.1"] <mask> assert.True(t, ok) <mask> assert.Equal(t, "host", name) <mask> <mask> // Test PTR <mask> a, _ := dns.ReverseAddr("127.0.0.1") </s> Pull request: * all: allow multiple ho...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff
internal/util/auto_hosts_test.go
assert.Equal(t, []string{"host", "localhost"}, names)
<mask> // Test hosts file <mask> table := ah.List() <mask> name, ok := table["127.0.0.1"] <mask> assert.True(t, ok) <mask> assert.Equal(t, "host", name) <mask> <mask> // Test PTR <mask> a, _ := dns.ReverseAddr("127.0.0.1") <mask> a = strings.TrimSuffix(a, ".") <mask> assert.True(t, ah.ProcessReverse...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff
internal/util/auto_hosts_test.go
hosts := ah.ProcessReverse(a, dns.TypePTR) if assert.Len(t, hosts, 2) { assert.Equal(t, hosts[0], "host") }
<mask> <mask> // Test PTR <mask> a, _ := dns.ReverseAddr("127.0.0.1") <mask> a = strings.TrimSuffix(a, ".") <mask> assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host") <mask> a, _ = dns.ReverseAddr("::1") <mask> a = strings.TrimSuffix(a, ".") <mask> assert.True(t, ah.ProcessReverse(a, dns.TypePTR...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff
internal/util/auto_hosts_test.go
hosts = ah.ProcessReverse(a, dns.TypePTR) if assert.Len(t, hosts, 1) { assert.Equal(t, hosts[0], "localhost") }
<mask> a = strings.TrimSuffix(a, ".") <mask> assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host") <mask> a, _ = dns.ReverseAddr("::1") <mask> a = strings.TrimSuffix(a, ".") <mask> assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "localhost") <mask> } <mask> <mask> func TestAutoHostsFSNotify(t *t...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff
internal/util/auto_hosts_test.go
<mask> return nil <mask> }, <mask> } <mask> <mask> var resultHandlers = map[string]logEntryHandler{ <mask> "IsFiltered": func(t json.Token, ent *logEntry) error { <mask> v, ok := t.(bool) <mask> if !ok { <mask> return nil <mask> } <mask> ent.Result.IsFiltered = v <mask> return nil <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/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/decode.go
decHandler, ok := resultDecHandlers[key] if ok { decHandler(dec, ent)
<mask> <mask> return <mask> } <mask> <mask> switch key { <mask> case "ReverseHosts": <mask> decodeResultReverseHosts(dec, ent) <mask> <mask> continue <mask> case "IPList": <mask> decodeResultIPList(dec, ent) <mask> </s> Pull request 1797: AG-21072-querylog-conf-race Merge in DNS/ad...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/decode.go
<mask> case "ReverseHosts": <mask> decodeResultReverseHosts(dec, ent) <mask> <mask> continue <mask> case "IPList": <mask> decodeResultIPList(dec, ent) <mask> <mask> continue <mask> case "Rules": <mask> decodeResultRules(dec, ent) <mask> <mask> continue <mask> case "DNSRewriteRe...
[ "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/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/decode.go
<mask> package querylog <mask> <mask> import ( <mask> "fmt" <mask> "net" <mask> "os" <mask> "strings" <mask> "sync" <mask> "time" <mask> </s> Pull request 1797: AG-21072-querylog-conf-race Merge in DNS/adguard-home from AG-21072-querylog-conf-race to master Squashed commit of the following: commit...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
"github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/golibs/timeutil" <mask> "github.com/miekg/dns" <mask> ) <mask> <mask> const ( </s> Pull request 1797: AG-21072-querylog-co...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
<mask> return "", fmt.Errorf("invalid client proto: %q", s) <mask> } <mask> } <mask> <mask> // logEntry - represents a single log entry <mask> type logEntry struct { <mask> // client is the found client information, if any. <mask> client *Client <mask> <mask> Time time.Time `json:"T"` <mask> <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/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
l.confMu.RLock() defer l.confMu.RUnlock() if l.conf.FileEnabled { err := l.flushLogBuffer() if err != nil { log.Error("querylog: closing: %s", err) } }
<mask> go l.periodicRotate() <mask> } <mask> <mask> func (l *queryLog) Close() { <mask> _ = l.flushLogBuffer(true) <mask> } <mask> <mask> func checkInterval(ivl time.Duration) (ok bool) { <mask> // The constants for possible values of query log's rotation interval. <mask> const ( </s> Pull request 1797...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
l.confMu.RLock() defer l.confMu.RUnlock()
<mask> return nil <mask> } <mask> <mask> func (l *queryLog) WriteDiskConfig(c *Config) { <mask> *c = *l.conf <mask> <mask> // TODO(a.garipov): Add stringutil.Set.Clone. <mask> c.Ignored = stringutil.NewSet(l.conf.Ignored.Values()...) <mask> } <mask> </s> Pull request 1797: AG-21072-querylog-conf-race ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
// TODO(a.garipov): Add stringutil.Set.Clone. c.Ignored = stringutil.NewSet(l.conf.Ignored.Values()...)
<mask> defer l.confMu.RUnlock() <mask> <mask> *c = *l.conf <mask> } <mask> <mask> // Clear memory buffer and remove log files <mask> func (l *queryLog) clear() { <mask> l.fileFlushLock.Lock() <mask> defer l.fileFlushLock.Unlock() </s> Pull request 1797: AG-21072-querylog-conf-race Merge in DNS/adguard-...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
var isEnabled, fileIsEnabled bool var memSize uint32 func() { l.confMu.RLock() defer l.confMu.RUnlock() isEnabled, fileIsEnabled = l.conf.Enabled, l.conf.FileEnabled memSize = l.conf.MemSize }() if !isEnabled {
<mask> log.Debug("querylog: cleared") <mask> } <mask> <mask> func (l *queryLog) Add(params *AddParams) { <mask> if !l.conf.Enabled { <mask> return <mask> } <mask> <mask> err := params.validate() <mask> if err != nil { </s> Pull request 1797: AG-21072-querylog-conf-race Merge in DNS/adguard-home fro...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
entry := &logEntry{
<mask> } <mask> <mask> now := time.Now() <mask> q := params.Question.Question[0] <mask> entry := logEntry{ <mask> Time: now, <mask> <mask> QHost: strings.ToLower(q.Name[:len(q.Name)-1]), <mask> QType: dns.Type(q.Qtype).String(), <mask> QClass: dns.Class(q.Qclass).String(), </s> Pull request 1...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
entry.addResponse(params.Answer, false) entry.addResponse(params.OrigAnswer, true)
<mask> if params.ReqECS != nil { <mask> entry.ReqECS = params.ReqECS.String() <mask> } <mask> <mask> if params.Answer != nil { <mask> var a []byte <mask> a, err = params.Answer.Pack() <mask> if err != nil { <mask> log.Error("querylog: Answer.Pack(): %s", err) <mask> <mask> return <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/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
l.buffer = append(l.buffer, entry)
<mask> func() { <mask> l.bufferLock.Lock() <mask> defer l.bufferLock.Unlock() <mask> <mask> l.buffer = append(l.buffer, &entry) <mask> <mask> if !l.conf.FileEnabled { <mask> if len(l.buffer) > int(l.conf.MemSize) { <mask> // Writing to file is disabled, so just remove the oldest entry <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
if !fileIsEnabled { if len(l.buffer) > int(memSize) {
<mask> defer l.bufferLock.Unlock() <mask> <mask> l.buffer = append(l.buffer, &entry) <mask> <mask> if !l.conf.FileEnabled { <mask> if len(l.buffer) > int(l.conf.MemSize) { <mask> // Writing to file is disabled, so just remove the oldest entry <mask> // from the slices. <mask> // <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
needFlush = len(l.buffer) >= int(memSize)
<mask> l.buffer[0] = nil <mask> l.buffer = l.buffer[1:] <mask> } <mask> } else if !l.flushPending { <mask> needFlush = len(l.buffer) >= int(l.conf.MemSize) <mask> if needFlush { <mask> l.flushPending = true <mask> } <mask> } <mask> }() </s> Pull request 1797: AG-21072-querylog-co...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
<mask> } <mask> } <mask> }() <mask> <mask> // if buffer needs to be flushed to disk, do it now <mask> if needFlush { <mask> go func() { <mask> _ = l.flushLogBuffer(false) <mask> }() <mask> } </s> Pull request 1797: AG-21072-querylog-conf-race Merge in DNS/adguard-home from AG-21072-querylog...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
flushErr := l.flushLogBuffer() if flushErr != nil { log.Error("querylog: flushing after adding: %s", err) }
<mask> <mask> // if buffer needs to be flushed to disk, do it now <mask> if needFlush { <mask> go func() { <mask> _ = l.flushLogBuffer(false) <mask> }() <mask> } <mask> } <mask> <mask> // ShouldLog returns true if request for the host should be logged. </s> Pull request 1797: AG-21072-querylog-co...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
// isIgnored returns true if the host is in the ignored domains list. It // assumes that l.confMu is locked for reading.
<mask> <mask> return !l.isIgnored(host) <mask> } <mask> <mask> // isIgnored returns true if the host is in the Ignored list. <mask> func (l *queryLog) isIgnored(host string) bool { <mask> return l.conf.Ignored.Has(host) <mask> } </s> Pull request 1797: AG-21072-querylog-conf-race Merge in DNS/adguard-home...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog.go
require.NoError(t, l.flushLogBuffer())
<mask> <mask> // Add disk entries. <mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1)) <mask> // Write to disk (first file). <mask> require.NoError(t, l.flushLogBuffer(true)) <mask> // Start writing to the second file. <mask> require.NoError(t, l.rotate()) <mask> // Add disk en...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog_test.go
require.NoError(t, l.flushLogBuffer())
<mask> require.NoError(t, l.rotate()) <mask> // Add disk entries. <mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2)) <mask> // Write to disk. <mask> require.NoError(t, l.flushLogBuffer(true)) <mask> // Add memory entries. <mask> addEntry(l, "test.example.org", net.IPv4(1, 1, 1, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog_test.go
require.NoError(t, l.flushLogBuffer())
<mask> for i := 0; i < entNum; i++ { <mask> addEntry(l, secondPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1)) <mask> } <mask> // Write them to the first file. <mask> require.NoError(t, l.flushLogBuffer(true)) <mask> // Add more to the in-memory part of log. <mask> for i := 0; i < entNum; i++ { <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog_test.go
require.NoError(t, l.flushLogBuffer())
<mask> for i := 0; i < entNum; i++ { <mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1)) <mask> } <mask> // Write them to disk. <mask> require.NoError(t, l.flushLogBuffer(true)) <mask> <mask> params := newSearchParams() <mask> <mask> for _, maxFileScanEntries := range []int{...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/qlog_test.go
func (l *queryLog) flushLogBuffer() (err error) {
<mask> ) <mask> <mask> // flushLogBuffer flushes the current buffer to file and resets the current <mask> // buffer. <mask> func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) { <mask> if !l.conf.FileEnabled { <mask> return nil <mask> } <mask> <mask> l.fileFlushLock.Lock() <mask> defer l.fi...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
<mask> <mask> l.fileFlushLock.Lock() <mask> defer l.fileFlushLock.Unlock() <mask> <mask> // Flush the remainder to file. <mask> var flushBuffer []*logEntry <mask> needFlush := fullFlush <mask> func() { <mask> l.bufferLock.Lock() <mask> defer l.bufferLock.Unlock() </s> Pull request 1797: AG-21072-...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
<mask> defer l.fileFlushLock.Unlock() <mask> <mask> // Flush the remainder to file. <mask> var flushBuffer []*logEntry <mask> needFlush := fullFlush <mask> func() { <mask> l.bufferLock.Lock() <mask> defer l.bufferLock.Unlock() <mask> <mask> needFlush = needFlush || len(l.buffer) >= int(l.conf.Mem...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
flushBuffer = l.buffer l.buffer = nil l.flushPending = false
<mask> func() { <mask> l.bufferLock.Lock() <mask> defer l.bufferLock.Unlock() <mask> <mask> needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize) <mask> if needFlush { <mask> flushBuffer = l.buffer <mask> l.buffer = nil <mask> l.flushPending = false <mask> } <mask> }() <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
<mask> l.buffer = nil <mask> l.flushPending = false <mask> } <mask> }() <mask> if !needFlush { <mask> return nil <mask> } <mask> <mask> err = l.flushToFile(flushBuffer) <mask> if err != nil { <mask> log.Error("querylog: writing to file: %s", err) <mask> </s> Pull request 1797: AG-21072-q...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
<mask> return nil <mask> } <mask> <mask> err = l.flushToFile(flushBuffer) <mask> if err != nil { <mask> log.Error("querylog: writing to file: %s", err) <mask> <mask> return err <mask> } <mask> <mask> return nil </s> Pull request 1797: AG-21072-querylog-conf-race Merge in DNS/adguard-home from...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
return errors.Annotate(err, "writing to file: %w")
<mask> err = l.flushToFile(flushBuffer) <mask> if err != nil { <mask> log.Error("querylog: writing to file: %s", err) <mask> <mask> return err <mask> } <mask> <mask> return nil <mask> } <mask> <mask> // flushToFile saves the specified log entries to the query log file <mask> func (l *queryLog) fl...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
var rotationIvl time.Duration func() { l.confMu.RLock() defer l.confMu.RUnlock() rotationIvl = l.conf.RotationIvl }()
<mask> <mask> // checkAndRotate rotates log files if those are older than the specified <mask> // rotation interval. <mask> func (l *queryLog) checkAndRotate() { <mask> l.confMu.RLock() <mask> defer l.confMu.RUnlock() <mask> <mask> oldest, err := l.readFileFirstTimeValue() <mask> if err != nil && !errors...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
if rotTime, now := oldest.Add(rotationIvl), time.Now(); rotTime.After(now) {
<mask> <mask> return <mask> } <mask> <mask> if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) { <mask> log.Debug( <mask> "querylog: %s <= %s, not rotating", <mask> now.Format(time.RFC3339), <mask> rot.Format(time.RFC3339), <mask> ) </s> Pull request 1797: AG-21072-q...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
rotTime.Format(time.RFC3339),
<mask> if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) { <mask> log.Debug( <mask> "querylog: %s <= %s, not rotating", <mask> now.Format(time.RFC3339), <mask> rot.Format(time.RFC3339), <mask> ) <mask> <mask> return <mask> } <mask> </s> Pull request 1797: AG-21072-q...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db
internal/querylog/querylogfile.go
//go:build windows // +build windows
<mask> //go:build !(linux || darwin || freebsd || openbsd) <mask> // +build !linux,!darwin,!freebsd,!openbsd <mask> <mask> package aghnet <mask> <mask> import ( <mask> "io" </s> Pull request: home: rm unnecessary locking in update; refactor Merge in DNS/adguard-home from 4499-rm-unnecessary-locking to maste...
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/aghnet/net_windows.go
func canBindPrivilegedPorts() (can bool, err error) { return true, nil }
<mask> ) <mask> <mask> func ifaceHasStaticIP(string) (ok bool, err error) { <mask> return false, aghos.Unsupported("checking static ip") <mask> } <mask> <mask> func ifaceSetStaticIP(string) (err error) { <mask> return aghos.Unsupported("setting static ip") </s> Pull request: home: rm unnecessary locking in...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/aghnet/net_windows.go
"fmt"
<mask> "context" <mask> "encoding/json" <mask> "net/http" <mask> "os" <mask> "os/exec" <mask> "path/filepath" <mask> "runtime" </s> Pull request: home: rm unnecessary locking in update; refactor Merge in DNS/adguard-home from 4499-rm-unnecessary-locking to master Squashed commit of the following: comm...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
w.Header().Set("Content-Type", "application/json")
<mask> <mask> // Get the latest available version from the Internet <mask> func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) { <mask> resp := &versionResponse{} <mask> if Context.disableUpdate { <mask> resp.Disabled = true <mask> err := json.NewEncoder(w).Encode(resp) </s> Pull request: h...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
<mask> // Get the latest available version from the Internet <mask> func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) { <mask> resp := &versionResponse{} <mask> if Context.disableUpdate { <mask> // w.Header().Set("Content-Type", "application/json") <mask> resp.Disabled = true <mask> _ = j...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
err := json.NewEncoder(w).Encode(resp) if err != nil { aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err) }
<mask> resp := &versionResponse{} <mask> if Context.disableUpdate { <mask> // w.Header().Set("Content-Type", "application/json") <mask> resp.Disabled = true <mask> _ = json.NewEncoder(w).Encode(resp) <mask> // TODO(e.burkov): Add error handling and deal with headers. <mask> return <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
aghhttp.Error(r, w, http.StatusBadRequest, "parsing request: %s", err)
<mask> var err error <mask> if r.ContentLength != 0 { <mask> err = json.NewDecoder(r.Body).Decode(req) <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusBadRequest, "JSON parse: %s", err) <mask> <mask> return <mask> } <mask> } <mask> </s> Pull request: home: rm unnecessary locking...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
err = requestVersionInfo(resp, req.Recheck) if err != nil { // Don't wrap the error, because it's informative enough as is. aghhttp.Error(r, w, http.StatusBadGateway, "%s", err) return }
<mask> return <mask> } <mask> } <mask> <mask> for i := 0; i != 3; i++ { <mask> func() { <mask> Context.controlLock.Lock() <mask> defer Context.controlLock.Unlock() <mask> <mask> resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck) <mask> }() <mask> <mask> if err != nil ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
err = resp.setAllowedToAutoUpdate() if err != nil { // Don't wrap the error, because it's informative enough as is. aghhttp.Error(r, w, http.StatusInternalServerError, "%s", err) return } err = json.NewEncoder(w).Encode(resp) if err != nil { aghhttp.Error(r, w, http.StatusInternalServerError, "writing bo...
<mask> func() { <mask> Context.controlLock.Lock() <mask> defer Context.controlLock.Unlock() <mask> <mask> resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck) <mask> }() <mask> <mask> if err != nil { <mask> var terr temporaryError <mask> if errors.As(err, &terr) && terr.Temp...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
// requestVersionInfo sets the VersionInfo field of resp if it can reach the // update server. func requestVersionInfo(resp *versionResponse, recheck bool) (err error) { for i := 0; i != 3; i++ { resp.VersionInfo, err = Context.updater.VersionInfo(recheck)
<mask> } <mask> } <mask> <mask> if err != nil { <mask> var terr temporaryError <mask> if errors.As(err, &terr) && terr.Temporary() { <mask> // Temporary network error. This case may happen while we're </s> Pull request: home: rm unnecessary locking in update; refactor Merge in DNS/adguard-home f...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
// Temporary network error. This case may happen while we're // restarting our DNS server. Log and sleep for some time.
<mask> <mask> if err != nil { <mask> var terr temporaryError <mask> if errors.As(err, &terr) && terr.Temporary() { <mask> // Temporary network error. This case may happen while <mask> // we're restarting our DNS server. Log and sleep for <mask> // some time. <mask> // <mask> // S...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
log.Info("update: temp net error: %q; sleeping for %s and retrying", err, d)
<mask> // some time. <mask> // <mask> // See https://github.com/AdguardTeam/AdGuardHome/issues/934. <mask> d := time.Duration(i) * time.Second <mask> log.Info("temp net error: %q; sleeping for %s and retrying", err, d) <mask> time.Sleep(d) <mask> <mask> continue <mask> } <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
<mask> break <mask> } <mask> if err != nil { <mask> vcu := Context.updater.VersionCheckURL() <mask> // TODO(a.garipov): Figure out the purpose of %T verb. <mask> aghhttp.Error( <mask> r, <mask> w, <mask> http.StatusBadGateway, <mask> "Couldn't get version check json from %s: %T %s\n", <...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
return fmt.Errorf("getting version info from %s: %s", vcu, err)
<mask> err, <mask> err, <mask> ) <mask> <mask> return <mask> } <mask> <mask> resp.confirmAutoUpdate() <mask> <mask> w.Header().Set("Content-Type", "application/json") </s> Pull request: home: rm unnecessary locking in update; refactor Merge in DNS/adguard-home from 4499-rm-unnecessary-lockin...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
return nil
<mask> <mask> return <mask> } <mask> <mask> resp.confirmAutoUpdate() <mask> <mask> w.Header().Set("Content-Type", "application/json") <mask> err = json.NewEncoder(w).Encode(resp) <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err) <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
<mask> } <mask> <mask> // versionResponse is the response for /control/version.json endpoint. <mask> type versionResponse struct { <mask> Disabled bool `json:"disabled"` <mask> updater.VersionInfo <mask> } <mask> <mask> // confirmAutoUpdate checks the real possibility of auto update. <mask> func (vr *vers...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
Disabled bool `json:"disabled"`
<mask> type versionResponse struct { <mask> updater.VersionInfo <mask> } <mask> <mask> // setAllowedToAutoUpdate sets CanAutoUpdate to true if AdGuard Home is actually <mask> // allowed to perform an automatic update by the OS. <mask> func (vr *versionResponse) setAllowedToAutoUpdate() (err error) { <mask> i...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
// setAllowedToAutoUpdate sets CanAutoUpdate to true if AdGuard Home is actually // allowed to perform an automatic update by the OS. func (vr *versionResponse) setAllowedToAutoUpdate() (err error) { if vr.CanAutoUpdate == nil || !*vr.CanAutoUpdate { return }
<mask> Disabled bool `json:"disabled"` <mask> updater.VersionInfo <mask> } <mask> <mask> // confirmAutoUpdate checks the real possibility of auto update. <mask> func (vr *versionResponse) confirmAutoUpdate() { <mask> if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate { <mask> canUpdate := true <mask> <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
tlsConf := &tlsConfigSettings{} Context.tls.WriteDiskConfig(tlsConf)
<mask> func (vr *versionResponse) confirmAutoUpdate() { <mask> if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate { <mask> canUpdate := true <mask> <mask> var tlsConf *tlsConfigSettings <mask> if runtime.GOOS != "windows" { <mask> tlsConf = &tlsConfigSettings{} <mask> Context.tls.WriteDiskConfig(tlsC...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
canUpdate := true if tlsConfUsesPrivilegedPorts(tlsConf) || config.BindPort < 1024 || config.DNS.Port < 1024 { canUpdate, err = aghnet.CanBindPrivilegedPorts() if err != nil { return fmt.Errorf("checking ability to bind privileged ports: %w", err)
<mask> tlsConf = &tlsConfigSettings{} <mask> Context.tls.WriteDiskConfig(tlsConf) <mask> } <mask> <mask> if tlsConf != nil && <mask> ((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 || <mask> tlsConf.PortDNSOverTLS < 1024 || <mask> tlsConf.PortDNSOverQUIC < 1024)) || <mask> config.BindP...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
<mask> config.BindPort < 1024 || <mask> config.DNS.Port < 1024) { <mask> canUpdate, _ = aghnet.CanBindPrivilegedPorts() <mask> } <mask> vr.CanAutoUpdate = &canUpdate <mask> } <mask> } <mask> <mask> // finishUpdate completes an update procedure. <mask> func finishUpdate(ctx context.Context) { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
vr.CanAutoUpdate = &canUpdate return nil } // tlsConfUsesPrivilegedPorts returns true if the provided TLS configuration // indicates that privileged ports are used. func tlsConfUsesPrivilegedPorts(c *tlsConfigSettings) (ok bool) { return c.Enabled && (c.PortHTTPS < 1024 || c.PortDNSOverTLS < 1024 || c.PortDNSOverQ...
<mask> return fmt.Errorf("checking ability to bind privileged ports: %w", err) <mask> } <mask> } <mask> } <mask> <mask> // finishUpdate completes an update procedure. <mask> func finishUpdate(ctx context.Context) { <mask> log.Info("Stopping all tasks") <mask> cleanup(ctx) </s> Pull request: home: rm ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/home/controlupdate.go
CanAutoUpdate *bool `json:"can_autoupdate,omitempty"`
<mask> const versionCheckPeriod = 8 * time.Hour <mask> <mask> // VersionInfo contains information about a new version. <mask> type VersionInfo struct { <mask> NewVersion string `json:"new_version,omitempty"` <mask> Announcement string `json:"announcement,omitempty"` <mask> AnnouncementURL ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/updater/check.go
<mask> NewVersion string `json:"new_version,omitempty"` <mask> Announcement string `json:"announcement,omitempty"` <mask> AnnouncementURL string `json:"announcement_url,omitempty"` <mask> SelfUpdateMinVersion string `json:"-"` <mask> CanAutoUpdate *bool `json:"can_autoupdate,omi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f
internal/updater/check.go
export const getProfileRequest = createAction('GET_PROFILE_REQUEST'); export const getProfileFailure = createAction('GET_PROFILE_FAILURE'); export const getProfileSuccess = createAction('GET_PROFILE_SUCCESS'); export const getProfile = () => async (dispatch) => { dispatch(getProfileRequest()); try { co...
<mask> }; <mask> <mask> export const dnsStatusRequest = createAction('DNS_STATUS_REQUEST'); <mask> export const dnsStatusFailure = createAction('DNS_STATUS_FAILURE'); <mask> export const dnsStatusSuccess = createAction('DNS_STATUS_SUCCESS'); <mask> <mask> export const getDnsStatus = () => async (dispatch) => {...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62
client/src/actions/index.js
dispatch(getProfile());
<mask> const dnsStatus = await apiClient.getGlobalStatus(); <mask> dispatch(dnsStatusSuccess(dnsStatus)); <mask> dispatch(getVersion()); <mask> dispatch(getTlsStatus()); <mask> } catch (error) { <mask> dispatch(addErrorToast({ error })); <mask> dispatch(dnsStat...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62
client/src/actions/index.js
// Profile GET_PROFILE = { path: 'profile', method: 'GET' }; getProfile() { const { path, method } = this.GET_PROFILE; return this.makeRequest(path, method); }
<mask> headers: { 'Content-Type': 'application/json' }, <mask> }; <mask> return this.makeRequest(path, method, config); <mask> } <mask> } <mask> <mask> const apiClient = new Api(); <mask> export default apiClient; </s> + client: get profile info </s> remove ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62
client/src/api/Api.js
{!dashboard.processingProfile && dashboard.name && <a href="/control/logout" className="btn btn-sm btn-outline-secondary"> <Trans>sign_out</Trans> </a> ...
<mask> closeMenu={this.closeMenu} <mask> /> <mask> <div className="header__column"> <mask> <div className="header__right"> <mask> <a href="/control/logout" className="btn btn-sm b...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62
client/src/components/Header/index.js
[actions.getProfileRequest]: state => ({ ...state, processingProfile: true }), [actions.getProfileFailure]: state => ({ ...state, processingProfile: false }), [actions.getProfileSuccess]: (state, { payload }) => ({ ...state, name: payload.name, processingProfi...
<mask> bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '', <mask> processingDnsSettings: false, <mask> }; <mask> }, <mask> }, <mask> { <mask> processing: true, <mask> isCoreRunning: false, <mask> processingVersion: t...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62
client/src/reducers/index.js
processingProfile: true,
<mask> processingUpdate: false, <mask> processingDnsSettings: true, <mask> upstreamDns: '', <mask> bootstrapDns: '', <mask> allServers: false, <mask> protectionEnabled: false, <mask> processingProtection: false, <mask> httpPort: 80, </s> + client:...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62
client/src/reducers/index.js
name: '',
<mask> dnsAddresses: [], <mask> dnsVersion: '', <mask> clients: [], <mask> autoClients: [], <mask> }, <mask> ); <mask> <mask> const dhcp = handleActions( <mask> { </s> + client: get profile info
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62
client/src/reducers/index.js
<mask> <mask> netIfaces := []net.Interface{} <mask> <mask> for i := range ifaces { <mask> if ifaces[i].Flags&net.FlagPointToPoint != 0 { <mask> // this interface is ppp, we're not interested in this one <mask> continue <mask> } <mask> <mask> iface := ifaces[i] <mask> netIfaces = append(net...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109
util/network_utils.go
// GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only
<mask> <mask> return netIfaces, nil <mask> } <mask> <mask> // getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only <mask> // we do not return link-local addresses here <mask> func GetValidNetInterfacesForWeb() ([]NetInterface, error) { <mask> ifaces, err := GetValidNetInterface...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109
util/network_utils.go
// GetInterfaceByIP - Get interface name by its IP address.
<mask> <mask> return netInterfaces, nil <mask> } <mask> <mask> // Get interface name by its IP address. <mask> func GetInterfaceByIP(ip string) string { <mask> ifaces, err := GetValidNetInterfacesForWeb() <mask> if err != nil { <mask> return "" <mask> } </s> * GetValidNetInterfaces: don't skip PointT...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109
util/network_utils.go
// GetSubnet - Get IP address with netmask for the specified interface
<mask> <mask> return "" <mask> } <mask> <mask> // Get IP address with netmask for the specified interface <mask> // Returns an empty string if it fails to find it <mask> func GetSubnet(ifaceName string) string { <mask> netIfaces, err := GetValidNetInterfacesForWeb() <mask> if err != nil { <mask> log.Er...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109
util/network_utils.go
// CheckPortAvailable - check if TCP port is available
<mask> <mask> return "" <mask> } <mask> <mask> // checkPortAvailable is not a cheap test to see if the port is bindable, because it's actually doing the bind momentarily <mask> func CheckPortAvailable(host string, port int) error { <mask> ln, err := net.Listen("tcp", net.JoinHostPort(host, strconv.Itoa(port)...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109
util/network_utils.go
// CheckPacketPortAvailable - check if UDP port is available
<mask> } <mask> <mask> func CheckPacketPortAvailable(host string, port int) error { <mask> ln, err := net.ListenPacket("udp", net.JoinHostPort(host, strconv.Itoa(port))) <mask> if err != nil { <mask> return err </s> * GetValidNetInterfaces: don't skip PointToPoint interfaces </s> remove // checkPortAvailabl...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109
util/network_utils.go
// ErrorIsAddrInUse - check if error is "address already in use"
<mask> time.Sleep(100 * time.Millisecond) <mask> return err <mask> } <mask> <mask> // check if error is "address already in use" <mask> func ErrorIsAddrInUse(err error) bool { <mask> errOpError, ok := err.(*net.OpError) <mask> if !ok { <mask> return false <mask> } </s> * GetValidNetInterfaces: don't ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109
util/network_utils.go
"example_upstream_regular_port": "DNS biasa (lebih dari UDP, dengan port);",
<mask> "example_comment_meaning": "hanya sebuah komentar;", <mask> "example_comment_hash": "# Juga sebuah komentar.", <mask> "example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan.", <mask> "example_upstream_regular": "DNS reguler (melalui UDP);", <mask>...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/id.json
"example_upstream_tcp_port": "DNS biasa (melalui TCP, dengan port);",
<mask> "example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>;", <mask> "example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>;", <mask> "example_upstream_sdns": "<0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>;", <mask> "example_upstream_tcp": "DNS reguler (melal...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/id.json
"example_upstream_regular_port": "DNS regolare (su UDP, con porta);",
<mask> "example_comment_meaning": "solo un commento;", <mask> "example_comment_hash": "# Anche un commento.", <mask> "example_regex_meaning": "blocca l'accesso ai domini corrispondenti alla specifica espressione regolare.", <mask> "example_upstream_regular": "DNS regolare (over UDP);", <mask> "...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/it.json
"dns_allowlists": "DNS-toelatingslijsten",
<mask> "no_servers_specified": "Geen servers gespecificeerd", <mask> "general_settings": "Algemene instellingen", <mask> "dns_settings": "DNS instellingen", <mask> "dns_blocklists": "DNS blokkeerlijsten", <mask> "dns_allowlists": "DNS toestemmingslijsten", <mask> "dns_blocklists_desc": "Ad...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.",
<mask> "dns_settings": "DNS instellingen", <mask> "dns_blocklists": "DNS blokkeerlijsten", <mask> "dns_allowlists": "DNS toestemmingslijsten", <mask> "dns_blocklists_desc": "AdGuard Home zal domeinen blokkeren die voorkomen in de blokkeerlijsten.", <mask> "dns_allowlists_desc": "Domeinen in de ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"no_whitelist_added": "Geen toelatingslijsten toegevoegd",
<mask> "delete_table_action": "Verwijderen", <mask> "elapsed": "Verstreken", <mask> "filters_and_hosts_hint": "AdGuard Home kan overweg met basic adblock regels en hosts bestanden syntaxis.", <mask> "no_blocklist_added": "Geen blokkeerlijsten toegevoegd", <mask> "no_whitelist_added": "Geen toes...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"add_allowlist": "Toelatingslijst toevoegen",
<mask> "filters_and_hosts_hint": "AdGuard Home kan overweg met basic adblock regels en hosts bestanden syntaxis.", <mask> "no_blocklist_added": "Geen blokkeerlijsten toegevoegd", <mask> "no_whitelist_added": "Geen toestemmingslijsten toegevoegd", <mask> "add_blocklist": "Blokkeerlijst toevoegen", <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"new_allowlist": "Nieuwe toelatingslijst",
<mask> "enter_name_hint": "Voeg naam toe", <mask> "enter_url_or_path_hint": "Voer een URL in of het pad van de lijst", <mask> "check_updates_btn": "Controleer op updates", <mask> "new_blocklist": "Nieuwe blokkeerlijst", <mask> "new_allowlist": "Nieuwe toestemmingslijst", <mask> "edit_block...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"edit_allowlist": "Toelatingslijst bewerken",
<mask> "check_updates_btn": "Controleer op updates", <mask> "new_blocklist": "Nieuwe blokkeerlijst", <mask> "new_allowlist": "Nieuwe toestemmingslijst", <mask> "edit_blocklist": "Blokkeerlijst beheren", <mask> "edit_allowlist": "Toestemmingslijst beheren", <mask> "choose_blocklist": "Blokk...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"choose_allowlist": "Toelatingslijsten selecteren",
<mask> "new_allowlist": "Nieuwe toestemmingslijst", <mask> "edit_blocklist": "Blokkeerlijst beheren", <mask> "edit_allowlist": "Toestemmingslijst beheren", <mask> "choose_blocklist": "Blokkeringslijsten selecteren", <mask> "choose_allowlist": "Toestemmingslijsten selecteren", <mask> "enter...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"example_upstream_regular_port": "standaard DNS (via UDP, met poort);",
<mask> "example_comment_meaning": "zomaar een opmerking;", <mask> "example_comment_hash": "# Ook een opmerking.", <mask> "example_regex_meaning": "toegang blokkeren tot de domeinen die overeenkomen met de opgegeven reguliere expressie.", <mask> "example_upstream_regular": "standaard DNS (over UDP);"...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"example_upstream_tcp_port": "standaard DNS (via TCP, met poort);",
<mask> "example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>;", <mask> "example_upstream_sdns": "<0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen;", <mask> "example_upstream_tcp": "standaard DNS (over TCP);", <mask> "example_upstream_tcp_hostname": "standaard DNS (via T...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"host_whitelisted": "De host staat op de toelatingslijst",
<mask> "form_enter_host": "Voer een hostnaam in", <mask> "filtered_custom_rules": "Gefilterd door aangepaste filterregels", <mask> "choose_from_list": "Uit de lijst selecteren", <mask> "add_custom_list": "Aangepaste lijst toevoegen", <mask> "host_whitelisted": "De host staat op de toestemmingsl...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
"show_whitelisted_responses": "Op toelatingslijst",
<mask> "dnssec_enable_desc": "Zet de DNSSEC-vlag aan bij uitgaande DNS-query's en controleer het resultaat (DNSSEC-compatibele resolver is vereist)", <mask> "validated_with_dnssec": "Gevalideerd met DNSSEC", <mask> "all_queries": "Alle vragen", <mask> "show_blocked_responses": "Geblokkeerd", <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
client/src/__locales/nl.json
await sleep(400);
<mask> requests.push(request(url, locale)); <mask> <mask> // Don't request the Crowdin API too aggressively to prevent spurious <mask> // 400 errors. <mask> await sleep(300); <mask> } <mask> <mask> Promise <mask> .all(requests) <mask> .then((res) => { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f
scripts/translations/download.js
<mask> github.com/fsnotify/fsnotify v1.4.9 <mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 <mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 <mask> github.com/joomcode/errorx v1.0.3 <mask> github.com/kardianos/service v...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
go.mod
<mask> github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= <mask> github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= <mask> github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk= <mask> github.com/joomcode/errorx v1.0.1/go.mo...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
go.sum
return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err)
<mask> // and waits for a response for a period defined by defaultDiscoverTime <mask> func CheckIfOtherDHCPServersPresentV4(ifaceName string) (bool, error) { <mask> iface, err := net.InterfaceByName(ifaceName) <mask> if err != nil { <mask> return false, wrapErrPrint(err, "Couldn't find interface by name %s", i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv4.NewDiscovery: %w", err)
<mask> hostname, _ := os.Hostname() <mask> <mask> req, err := dhcpv4.NewDiscovery(iface.HardwareAddr) <mask> if err != nil { <mask> return false, fmt.Errorf("dhcpv4.NewDiscovery: %s", err) <mask> } <mask> req.Options.Update(dhcpv4.OptClientIdentifier(iface.HardwareAddr)) <mask> req.Options.Update(dhcpv...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err)
<mask> <mask> // resolve 0.0.0.0:68 <mask> udpAddr, err := net.ResolveUDPAddr("udp4", src) <mask> if err != nil { <mask> return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src) <mask> } <mask> <mask> if !udpAddr.IP.To4().Equal(srcIP) { <mask> return false, wrapErrPrint(err, "Resolved...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err)
<mask> return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src) <mask> } <mask> <mask> if !udpAddr.IP.To4().Equal(srcIP) { <mask> return false, wrapErrPrint(err, "Resolved UDP address is not %s", src) <mask> } <mask> <mask> // resolve 255.255.255.255:67 <mask> dstAddr, err := net.Reso...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err)
<mask> <mask> // resolve 255.255.255.255:67 <mask> dstAddr, err := net.ResolveUDPAddr("udp4", dst) <mask> if err != nil { <mask> return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst) <mask> } <mask> <mask> // bind to 0.0.0.0:68 <mask> log.Tracef("Listening to udp4 %+v", udpAddr) <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("couldn't listen on :68: %w", err)
<mask> // bind to 0.0.0.0:68 <mask> log.Tracef("Listening to udp4 %+v", udpAddr) <mask> c, err := nclient4.NewRawUDPConn(ifaceName, 68) <mask> if err != nil { <mask> return false, wrapErrPrint(err, "Couldn't listen on :68") <mask> } <mask> if c != nil { <mask> defer c.Close() <mask> } <mask> </s>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err)
<mask> <mask> // send to 255.255.255.255:67 <mask> _, err = c.WriteTo(req.ToBytes(), dstAddr) <mask> if err != nil { <mask> return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst) <mask> } <mask> <mask> for { <mask> // wait for answer <mask> log.Tracef("Waiting %v for an answer", def...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go