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
w.ipChan = make(chan net.IP, 255)
<mask> cconf.EnableLRU = true <mask> cconf.MaxCount = 10000 <mask> w.ipAddrs = cache.New(cconf) <mask> <mask> w.ipChan = make(chan string, 255) <mask> go w.workerLoop() <mask> return &w <mask> } <mask> <mask> // If the value is too large - cut it and append "..." </s> Pull request: 2508 ip conversion...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/home/whois.go
func (w *Whois) process(ip net.IP) [][]string {
<mask> return "", fmt.Errorf("whois: redirect loop") <mask> } <mask> <mask> // Request WHOIS information <mask> func (w *Whois) process(ip string) [][]string { <mask> data := [][]string{} <mask> resp, err := w.queryAll(ip) <mask> if err != nil { <mask> log.Debug("Whois: error: %s IP:%s", err, ip) <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/home/whois.go
resp, err := w.queryAll(ip.String())
<mask> <mask> // Request WHOIS information <mask> func (w *Whois) process(ip string) [][]string { <mask> data := [][]string{} <mask> resp, err := w.queryAll(ip) <mask> if err != nil { <mask> log.Debug("Whois: error: %s IP:%s", err, ip) <mask> return data <mask> } <mask> </s> Pull request: 2508 ip ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/home/whois.go
func (w *Whois) Begin(ip net.IP) {
<mask> return data <mask> } <mask> <mask> // Begin - begin requesting WHOIS info <mask> func (w *Whois) Begin(ip string) { <mask> now := uint64(time.Now().Unix()) <mask> expire := w.ipAddrs.Get([]byte(ip)) <mask> if len(expire) != 0 { <mask> exp := binary.BigEndian.Uint64(expire) <mask> if exp > now ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/home/whois.go
if ent.IP == nil { ent.IP = net.ParseIP(v)
<mask> v, ok := t.(string) <mask> if !ok { <mask> return nil <mask> } <mask> if len(ent.IP) == 0 { <mask> ent.IP = v <mask> } <mask> return nil <mask> }, <mask> "T": func(t json.Token, ent *logEntry) error { <mask> v, ok := t.(string) </s> Pull request: 2508 ip conversion vol.2 Merge ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/decode.go
IP: net.IPv4(127, 0, 0, 1),
<mask> ans, err := base64.StdEncoding.DecodeString(ansStr) <mask> assert.Nil(t, err) <mask> <mask> want := &logEntry{ <mask> IP: "127.0.0.1", <mask> Time: time.Date(2020, 11, 25, 15, 55, 56, 519796000, time.UTC), <mask> QHost: "an.yandex.ru", <mask> QType: "A", <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/decode_test.go
func (l *queryLog) getClientIP(ip net.IP) (clientIP net.IP) { if l.conf.AnonymizeClientIP && ip != nil { const AnonymizeClientIPv4Mask = 16 const AnonymizeClientIPv6Mask = 112 if ip.To4() != nil { return ip.Mask(net.CIDRMask(AnonymizeClientIPv4Mask, 32))
<mask> <mask> // TODO(a.garipov): Use a proper structured approach here. <mask> <mask> // Get Client IP address <mask> func (l *queryLog) getClientIP(clientIP string) string { <mask> if l.conf.AnonymizeClientIP { <mask> ip := net.ParseIP(clientIP) <mask> if ip != nil { <mask> ip4 := ip.To4() <mask> ...
[ "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/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/json.go
return ip.Mask(net.CIDRMask(AnonymizeClientIPv6Mask, 128))
<mask> return ip.Mask(net.CIDRMask(AnonymizeClientIPv4Mask, 32)) <mask> } <mask> } <mask> <mask> return ip <mask> } </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master Closes #2508. Squashed commit of the following: commit 5b9d33f9cd352756831f6...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/json.go
return ip
<mask> } <mask> } <mask> } <mask> <mask> return clientIP <mask> } <mask> <mask> // jobject is a JSON object alias. <mask> type jobject = map[string]interface{} <mask> </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master Closes #2508. Squash...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/json.go
answer["value"] = v.A
<mask> } <mask> // try most common record types <mask> switch v := k.(type) { <mask> case *dns.A: <mask> answer["value"] = v.A.String() <mask> case *dns.AAAA: <mask> answer["value"] = v.AAAA.String() <mask> case *dns.MX: <mask> answer["value"] = fmt.Sprintf("%v %v", v.Preference, v.Mx) <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/json.go
answer["value"] = v.AAAA
<mask> switch v := k.(type) { <mask> case *dns.A: <mask> answer["value"] = v.A.String() <mask> case *dns.AAAA: <mask> answer["value"] = v.AAAA.String() <mask> case *dns.MX: <mask> answer["value"] = fmt.Sprintf("%v %v", v.Preference, v.Mx) <mask> case *dns.CNAME: <mask> answer["value"] = v...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/json.go
"net"
<mask> import ( <mask> "fmt" <mask> "os" <mask> "path/filepath" <mask> "strings" <mask> "sync" <mask> "time" <mask> </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master Closes #2508. Squashed commit of the following: commit 5b9d33f9cd352756831f...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog.go
IP net.IP `json:"IP"` // Client IP
<mask> } <mask> <mask> // logEntry - represents a single log entry <mask> type logEntry struct { <mask> IP string `json:"IP"` // Client IP <mask> Time time.Time `json:"T"` <mask> <mask> QHost string `json:"QH"` <mask> QType string `json:"QT"` <mask> QClass string `json:"QC"` </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog.go
IP: l.getClientIP(params.ClientIP),
<mask> } <mask> <mask> now := time.Now() <mask> entry := logEntry{ <mask> IP: l.getClientIP(params.ClientIP.String()), <mask> Time: now, <mask> <mask> Result: *params.Result, <mask> Elapsed: params.Elapsed, <mask> Upstream: params.Upstream, </s> Pull request: 2508 ip conversion v...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog.go
addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> defer func() { _ = os.RemoveAll(conf.BaseDir) }() <mask> l := newQueryLog(conf) <mask> <mask> // add disk entries <mask> addEntry(l, "example.org", "1.1.1.1", "2.2.2.1") <mask> // write to disk (first file) <mask> _ = l.flushLogBuffer(true) <mask> // start writing to the second file <mask> _ = ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
<mask> _ = l.flushLogBuffer(true) <mask> // start writing to the second file <mask> _ = l.rotate() <mask> // add disk entries <mask> addEntry(l, "example.org", "1.1.1.2", "2.2.2.2") <mask> // write to disk <mask> _ = l.flushLogBuffer(true) <mask> // add memory entries <mask> addEntry(l, "test.example....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
addEntry(l, "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3)) addEntry(l, "example.com", net.IPv4(1, 1, 1, 4), net.IPv4(2, 2, 2, 4))
<mask> addEntry(l, "example.org", "1.1.1.2", "2.2.2.2") <mask> // write to disk <mask> _ = l.flushLogBuffer(true) <mask> // add memory entries <mask> addEntry(l, "test.example.org", "1.1.1.3", "2.2.2.3") <mask> addEntry(l, "example.com", "1.1.1.4", "2.2.2.4") <mask> <mask> // get all entries <mask> pa...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
assertLogEntry(t, entries[0], "example.com", net.IPv4(1, 1, 1, 4), net.IPv4(2, 2, 2, 4)) assertLogEntry(t, entries[1], "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3)) assertLogEntry(t, entries[2], "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2)) assertLogEntry(t, entries[3], "example.org",...
<mask> // get all entries <mask> params := newSearchParams() <mask> entries, _ := l.search(params) <mask> assert.Len(t, entries, 4) <mask> assertLogEntry(t, entries[0], "example.com", "1.1.1.4", "2.2.2.4") <mask> assertLogEntry(t, entries[1], "test.example.org", "1.1.1.3", "2.2.2.3") <mask> assertLogEntry...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
assertLogEntry(t, entries[0], "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3))
<mask> value: "TEST.example.org", <mask> }) <mask> entries, _ = l.search(params) <mask> assert.Len(t, entries, 1) <mask> assertLogEntry(t, entries[0], "test.example.org", "1.1.1.3", "2.2.2.3") <mask> <mask> // search by domain (not strict) <mask> params = newSearchParams() <mask> params.search...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
assertLogEntry(t, entries[0], "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3)) assertLogEntry(t, entries[1], "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2)) assertLogEntry(t, entries[2], "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> value: "example.ORG", <mask> }) <mask> entries, _ = l.search(params) <mask> assert.Len(t, entries, 3) <mask> assertLogEntry(t, entries[0], "test.example.org", "1.1.1.3", "2.2.2.3") <mask> assertLogEntry(t, entries[1], "example.org", "1.1.1.2", "2.2.2.2") <mask> assertLogEntry(t, entries[2],...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
assertLogEntry(t, entries[0], "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
<mask> value: "2.2.2.2", <mask> }) <mask> entries, _ = l.search(params) <mask> assert.Len(t, entries, 1) <mask> assertLogEntry(t, entries[0], "example.org", "1.1.1.2", "2.2.2.2") <mask> <mask> // search by client IP (part of) <mask> params = newSearchParams() <mask> params.searchCriteria = app...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
assertLogEntry(t, entries[0], "example.com", net.IPv4(1, 1, 1, 4), net.IPv4(2, 2, 2, 4)) assertLogEntry(t, entries[1], "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3)) assertLogEntry(t, entries[2], "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2)) assertLogEntry(t, entries[3], "example.org",...
<mask> value: "2.2.2", <mask> }) <mask> entries, _ = l.search(params) <mask> assert.Len(t, entries, 4) <mask> assertLogEntry(t, entries[0], "example.com", "1.1.1.4", "2.2.2.4") <mask> assertLogEntry(t, entries[1], "test.example.org", "1.1.1.3", "2.2.2.3") <mask> assertLogEntry(t, entries[2], "exam...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
addEntry(l, "second.example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> l := newQueryLog(conf) <mask> <mask> // add 10 entries to the log <mask> for i := 0; i < 10; i++ { <mask> addEntry(l, "second.example.org", "1.1.1.1", "2.2.2.1") <mask> } <mask> // write them to disk (first file) <mask> _ = l.flushLogBuffer(true) <mask> // add 10 more entries to the log (memor...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
addEntry(l, "first.example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> // write them to disk (first file) <mask> _ = l.flushLogBuffer(true) <mask> // add 10 more entries to the log (memory) <mask> for i := 0; i < 10; i++ { <mask> addEntry(l, "first.example.org", "1.1.1.1", "2.2.2.1") <mask> } <mask> <mask> // First page <mask> params := newSearchParams() <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> l := newQueryLog(conf) <mask> <mask> // add 10 entries to the log <mask> for i := 0; i < 10; i++ { <mask> addEntry(l, "example.org", "1.1.1.1", "2.2.2.1") <mask> } <mask> // write them to disk (first file) <mask> _ = l.flushLogBuffer(true) <mask> <mask> params := newSearchParams() </s> Pull...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
addEntry(l, "example1.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1)) addEntry(l, "example2.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1)) addEntry(l, "example3.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> conf.BaseDir = prepareTestDir() <mask> defer func() { _ = os.RemoveAll(conf.BaseDir) }() <mask> l := newQueryLog(conf) <mask> <mask> addEntry(l, "example1.org", "1.1.1.1", "2.2.2.1") <mask> addEntry(l, "example2.org", "1.1.1.1", "2.2.2.1") <mask> addEntry(l, "example3.org", "1.1.1.1", "2.2.2.1") <...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
func addEntry(l *queryLog, host string, answerStr, client net.IP) {
<mask> assert.Equal(t, "example3.org", ll[0].QHost) <mask> assert.Equal(t, "example2.org", ll[1].QHost) <mask> } <mask> <mask> func addEntry(l *queryLog, host, answerStr, client string) { <mask> q := dns.Msg{} <mask> q.Question = append(q.Question, dns.Question{ <mask> Name: host + ".", <mask> Qtype...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
answer.A = answerStr
<mask> Name: q.Question[0].Name, <mask> Rrtype: dns.TypeA, <mask> Class: dns.ClassINET, <mask> } <mask> answer.A = net.ParseIP(answerStr) <mask> a.Answer = append(a.Answer, answer) <mask> res := dnsfilter.Result{ <mask> IsFiltered: true, <mask> Reason: dnsfilter.Rewritten, <mask> Serv...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
ClientIP: client,
<mask> Question: &q, <mask> Answer: &a, <mask> OrigAnswer: &a, <mask> Result: &res, <mask> ClientIP: net.ParseIP(client), <mask> Upstream: "upstream", <mask> } <mask> l.Add(params) <mask> } <mask> </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
func assertLogEntry(t *testing.T, entry *logEntry, host string, answer, client net.IP) bool {
<mask> } <mask> l.Add(params) <mask> } <mask> <mask> func assertLogEntry(t *testing.T, entry *logEntry, host, answer, client string) bool { <mask> assert.Equal(t, host, entry.QHost) <mask> assert.Equal(t, client, entry.IP) <mask> assert.Equal(t, "A", entry.QType) <mask> assert.Equal(t, "IN", entry.QClas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]).To16()
<mask> <mask> msg := new(dns.Msg) <mask> assert.Nil(t, msg.Unpack(entry.Answer)) <mask> assert.Len(t, msg.Answer, 1) <mask> ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]) <mask> assert.NotNil(t, ip) <mask> assert.Equal(t, answer, ip.String()) <mask> return true <mask> } <mask> </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
assert.Equal(t, answer, ip)
<mask> assert.Nil(t, msg.Unpack(entry.Answer)) <mask> assert.Len(t, msg.Answer, 1) <mask> ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]) <mask> assert.NotNil(t, ip) <mask> assert.Equal(t, answer, ip.String()) <mask> return true <mask> } <mask> <mask> func testEntries() (entries []*logEntry) { <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/qlog_test.go
ipStr := entry.IP.String() if c.strict && ipStr == c.value {
<mask> if !c.strict && strings.Contains(qhost, searchVal) { <mask> return true <mask> } <mask> <mask> if c.strict && entry.IP == c.value { <mask> return true <mask> } <mask> if !c.strict && strings.Contains(entry.IP, c.value) { <mask> return true <mask> } </s> Pull request: 2508 ip conversion vo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/searchcriteria.go
if !c.strict && strings.Contains(ipStr, c.value) {
<mask> <mask> if c.strict && entry.IP == c.value { <mask> return true <mask> } <mask> if !c.strict && strings.Contains(entry.IP, c.value) { <mask> return true <mask> } <mask> return false <mask> } <mask> </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/querylog/searchcriteria.go
GetTopClientsIP(limit uint) []net.IP
<mask> // Update counters <mask> Update(e Entry) <mask> <mask> // Get IP addresses of the clients with the most number of requests <mask> GetTopClientsIP(limit uint) []string <mask> <mask> // WriteDiskConfig - write configuration <mask> WriteDiskConfig(dc *DiskConfig) <mask> } <mask> </s> Pull reque...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/stats.go
assert.True(t, net.IP{127, 0, 0, 1}.Equal(topClients[0]))
<mask> assert.EqualValues(t, 0, d["num_replaced_parental"].(uint64)) <mask> assert.EqualValues(t, 0.123456, d["avg_processing_time"].(float64)) <mask> <mask> topClients := s.GetTopClientsIP(2) <mask> assert.Equal(t, "127.0.0.1", topClients[0]) <mask> <mask> s.clear() <mask> s.Close() <mask> os.Remove(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/stats_test.go
func (s *statsCtx) getClientIP(ip net.IP) (clientIP net.IP) { if s.conf.AnonymizeClientIP && ip != nil { const AnonymizeClientIP4Mask = 16 const AnonymizeClientIP6Mask = 112 if ip.To4() != nil { return ip.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32))
<mask> log.Debug("Stats: cleared") <mask> } <mask> <mask> // Get Client IP address <mask> func (s *statsCtx) getClientIP(clientIP string) string { <mask> if s.conf.AnonymizeClientIP { <mask> ip := net.ParseIP(clientIP) <mask> if ip != nil { <mask> ip4 := ip.To4() <mask> const AnonymizeClientIP4Ma...
[ "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/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/unit.go
return ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128))
<mask> <mask> if ip.To4() != nil { <mask> return ip.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32)) <mask> } <mask> } <mask> <mask> return ip <mask> } </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master Closes #2508. Squashed commit of the f...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/unit.go
return ip
<mask> } <mask> } <mask> } <mask> <mask> return clientIP <mask> } <mask> <mask> func (s *statsCtx) Update(e Entry) { <mask> if e.Result == 0 || <mask> e.Result >= rLast || </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master Closes #2508. ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/unit.go
client := s.getClientIP(e.Client)
<mask> len(e.Domain) == 0 || <mask> !(len(e.Client) == 4 || len(e.Client) == 16) { <mask> return <mask> } <mask> client := s.getClientIP(e.Client.String()) <mask> <mask> s.unitLock.Lock() <mask> u := s.unit <mask> <mask> u.nResult[e.Result]++ </s> Pull request: 2508 ip conversion vol.2 Merge in...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/unit.go
u.clients[client.String()]++
<mask> } else { <mask> u.blockedDomains[e.Domain]++ <mask> } <mask> <mask> u.clients[client]++ <mask> u.timeSum += uint64(e.Time) <mask> u.nTotal++ <mask> s.unitLock.Unlock() <mask> } <mask> </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to maste...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/unit.go
func (s *statsCtx) GetTopClientsIP(maxCount uint) []net.IP {
<mask> <mask> return d <mask> } <mask> <mask> func (s *statsCtx) GetTopClientsIP(maxCount uint) []string { <mask> units, _ := s.loadUnits(s.conf.limit) <mask> if units == nil { <mask> return nil <mask> } <mask> </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conve...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/unit.go
d := []net.IP{}
<mask> m[it.Name] += it.Count <mask> } <mask> } <mask> a := convertMapToArray(m, int(maxCount)) <mask> d := []string{} <mask> for _, it := range a { <mask> d = append(d, it.Name) <mask> } <mask> return d <mask> } </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/unit.go
d = append(d, net.ParseIP(it.Name))
<mask> } <mask> a := convertMapToArray(m, int(maxCount)) <mask> d := []string{} <mask> for _, it := range a { <mask> d = append(d, it.Name) <mask> } <mask> return d <mask> } </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master Closes #2508. Squ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/stats/unit.go
ipNet := util.GetSubnet(ifaceName) if ipNet.IP == nil {
<mask> return false, s.Err() <mask> } <mask> <mask> func ifaceSetStaticIP(ifaceName string) (err error) { <mask> ip := util.GetSubnet(ifaceName) <mask> if len(ip) == 0 { <mask> return errors.New("can't get IP address") <mask> } <mask> <mask> ip4, _, err := net.ParseCIDR(ip) <mask> if err != nil { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/sysutil/net_linux.go
<mask> if len(ip) == 0 { <mask> return errors.New("can't get IP address") <mask> } <mask> <mask> ip4, _, err := net.ParseCIDR(ip) <mask> if err != nil { <mask> return err <mask> } <mask> gatewayIP := GatewayIP(ifaceName) <mask> add := updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, ip4) <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/sysutil/net_linux.go
add := updateStaticIPdhcpcdConf(ifaceName, ipNet.String(), gatewayIP, ipNet.IP)
<mask> if err != nil { <mask> return err <mask> } <mask> gatewayIP := GatewayIP(ifaceName) <mask> add := updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, ip4) <mask> <mask> body, err := ioutil.ReadFile("/etc/dhcpcd.conf") <mask> if err != nil { <mask> return err <mask> } </s> Pull request: 2508...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/sysutil/net_linux.go
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
<mask> // Check if we are notified about changes <mask> ips = ah.Process("newhost", dns.TypeA) <mask> assert.NotNil(t, ips) <mask> assert.Len(t, ips, 1) <mask> assert.Equal(t, "127.0.0.2", ips[0].String()) <mask> } <mask> <mask> func TestIP(t *testing.T) { <mask> assert.Equal(t, "127.0.0.1", DNSUnrevers...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/autohosts_test.go
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
<mask> assert.Equal(t, "127.0.0.2", ips[0].String()) <mask> } <mask> <mask> func TestIP(t *testing.T) { <mask> assert.Equal(t, "127.0.0.1", DNSUnreverseAddr("1.0.0.127.in-addr.arpa").String()) <mask> assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/autohosts_test.go
Name string // Network interface name MTU int // MTU HardwareAddr string // Hardware address Addresses []net.IP // Array with the network interface addresses Subnets []*net.IPNet // Array with CIDR addresses of this network interface Flags string // N...
<mask> ) <mask> <mask> // NetInterface represents a list of network interfaces <mask> type NetInterface struct { <mask> Name string // Network interface name <mask> MTU int // MTU <mask> HardwareAddr string // Hardware address <mask> Addresses []string // Array with the network...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
netIface.Addresses = append(netIface.Addresses, ipNet.IP) netIface.Subnets = append(netIface.Subnets, ipNet)
<mask> // ignore link-local <mask> if ipNet.IP.IsLinkLocalUnicast() { <mask> continue <mask> } <mask> netIface.Addresses = append(netIface.Addresses, ipNet.IP.String()) <mask> netIface.Subnets = append(netIface.Subnets, ipNet.String()) <mask> } <mask> <mask> // Discard interfaces with n...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
// GetInterfaceByIP returns the name of interface containing provided ip. func GetInterfaceByIP(ip net.IP) string {
<mask> <mask> return netInterfaces, nil <mask> } <mask> <mask> // GetInterfaceByIP - Get interface name by its IP address. <mask> func GetInterfaceByIP(ip string) string { <mask> ifaces, err := GetValidNetInterfacesForWeb() <mask> if err != nil { <mask> return "" <mask> } <mask> </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
if ip.Equal(addr) {
<mask> } <mask> <mask> for _, iface := range ifaces { <mask> for _, addr := range iface.Addresses { <mask> if ip == addr { <mask> return iface.Name <mask> } <mask> } <mask> } <mask> </s> Pull request: 2508 ip conversion vol.2 Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to maste...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
// GetSubnet returns pointer to net.IPNet for the specified interface or nil if // the search fails. func GetSubnet(ifaceName string) *net.IPNet {
<mask> <mask> return "" <mask> } <mask> <mask> // GetSubnet - 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 { <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
return nil
<mask> func GetSubnet(ifaceName string) string { <mask> netIfaces, err := GetValidNetInterfacesForWeb() <mask> if err != nil { <mask> log.Error("Could not get network interfaces info: %v", err) <mask> return "" <mask> } <mask> <mask> for _, netIface := range netIfaces { <mask> if netIface.Name == if...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
return nil
<mask> return netIface.Subnets[0] <mask> } <mask> } <mask> <mask> return "" <mask> } <mask> <mask> // CheckPortAvailable - check if TCP port is available <mask> func CheckPortAvailable(host string, port int) error { <mask> ln, err := net.Listen("tcp", net.JoinHostPort(host, strconv.Itoa(port))) </s...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
func CheckPortAvailable(host net.IP, port int) error { ln, err := net.Listen("tcp", net.JoinHostPort(host.String(), strconv.Itoa(port)))
<mask> return "" <mask> } <mask> <mask> // CheckPortAvailable - check if TCP port is available <mask> func CheckPortAvailable(host string, port int) error { <mask> ln, err := net.Listen("tcp", net.JoinHostPort(host, strconv.Itoa(port))) <mask> if err != nil { <mask> return err <mask> } <mask> _ = ln.C...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
func CheckPacketPortAvailable(host net.IP, port int) error { ln, err := net.ListenPacket("udp", net.JoinHostPort(host.String(), strconv.Itoa(port)))
<mask> return nil <mask> } <mask> <mask> // CheckPacketPortAvailable - check if UDP port is available <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 <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fab31beaeb8c7d1c9892746bbf37e99d4f9dc01
internal/util/network.go
export const setDnsRunningStatus = createAction('SET_DNS_RUNNING_STATUS');
<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) => { <mask> dispatc...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fade498b910a2492b2e214f0b2a706b51548b34
client/src/actions/index.js
const { running } = dnsStatus; const runningStatus = dnsStatus && running; if (runningStatus === true) {
<mask> }; <mask> <mask> const handleRequestSuccess = (response) => { <mask> const dnsStatus = response.data; <mask> if (dnsStatus) { <mask> dispatch(dnsStatusSuccess(dnsStatus)); <mask> dispatch(getVersion()); <mask> dispatch(getTlsStatus()); <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fade498b910a2492b2e214f0b2a706b51548b34
client/src/actions/index.js
} else { dispatch(setDnsRunningStatus(running));
<mask> dispatch(getTlsStatus()); <mask> dispatch(getProfile()); <mask> } <mask> }; <mask> <mask> try { </s> - client: add setDnsRunningStatus action </s> remove if (dnsStatus) { </s> add const { running } = dnsStatus; const runningStatus = dnsStat...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fade498b910a2492b2e214f0b2a706b51548b34
client/src/actions/index.js
[actions.setDnsRunningStatus]: (state, { payload }) => ({ ...state, isCoreRunning: payload }),
<mask> const dashboard = handleActions( <mask> { <mask> [actions.dnsStatusRequest]: state => ({ ...state, processing: true }), <mask> [actions.dnsStatusFailure]: state => ({ ...state, processing: false }), <mask> [actions.dnsStatusSuccess]: (state, { payload }) => { <mask> ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fade498b910a2492b2e214f0b2a706b51548b34
client/src/reducers/index.js
<mask> [actions.dnsStatusFailure]: state => ({ ...state, processing: false }), <mask> [actions.dnsStatusSuccess]: (state, { payload }) => { <mask> const { <mask> version, <mask> running, <mask> dns_port: dnsPort, <mask> d...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fade498b910a2492b2e214f0b2a706b51548b34
client/src/reducers/index.js
isCoreRunning: true,
<mask> http_port: httpPort, <mask> } = payload; <mask> const newState = { <mask> ...state, <mask> isCoreRunning: running, <mask> processing: false, <mask> dnsVersion: version, <mask> dnsPort, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7fade498b910a2492b2e214f0b2a706b51548b34
client/src/reducers/index.js
github.com/AdguardTeam/dnsproxy v0.39.5
<mask> <mask> go 1.16 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.39.4 <mask> github.com/AdguardTeam/golibs v0.9.2 <mask> github.com/AdguardTeam/urlfilter v0.14.6 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.2.2 <mask> github.com/digineo/...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80548233ba0df565074b156ea6cb62e8818dde04
go.mod
github.com/AdguardTeam/dnsproxy v0.39.5 h1:SQorhRLR1241t6hy9CiAGZUjRULhsDJlPJTl0UGX8uw= github.com/AdguardTeam/dnsproxy v0.39.5/go.mod h1:eDpJKAdkHORRwAedjuERv+7SWlcz4cn+5uwrbUAWHRY=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= <mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= <mask> github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80548233ba0df565074b156ea6cb62e8818dde04
go.sum
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQB...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80548233ba0df565074b156ea6cb62e8818dde04
go.sum
"local_ptr_title": "Private DNS servers", "local_ptr_desc": "The DNS server or servers that AdGuard Home will use for queries for locally served resources. For instance, this server will be used for resolving clients' hostnames for the clients with private IP addresses. If not set, AdGuard Home will automatical...
<mask> "load_balancing_desc": "Query one upstream server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server is used more often.", <mask> "bootstrap_dns": "Bootstrap DNS servers", <mask> "bootstrap_dns_desc": "Bootstrap DNS servers are used to reso...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/__locales/en.json
if (Object.prototype.hasOwnProperty.call(data, 'local_ptr_upstreams')) { data.local_ptr_upstreams = splitByNewLine(config.local_ptr_upstreams); hasDnsSettings = true; }
<mask> data.bootstrap_dns = splitByNewLine(config.bootstrap_dns); <mask> hasDnsSettings = true; <mask> } <mask> if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) { <mask> data.upstream_dns = splitByNewLine(config.upstream_dns); <mask> h...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/actions/dnsConfig.js
{ bootstrap_dns, upstream_dns, local_ptr_upstreams }, upstream_dns_file,
<mask> export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE'); <mask> export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS'); <mask> <mask> export const testUpstream = ( <mask> { bootstrap_dns, upstream_dns }, upstream_dns_file, <mask> ) => async (dispatch) => { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/actions/index.js
private_upstream: splitByNewLine(local_ptr_upstreams),
<mask> const config = { <mask> bootstrap_dns: splitByNewLine(bootstrap_dns), <mask> ...(upstream_dns_file ? null : { <mask> upstream_dns: removeComments(upstream_dns), <mask> }), <mask> }; </s> Pull request: 2704 local addresses vol.3 Merge in ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/actions/index.js
const { bootstrap_dns, upstream_dns, local_ptr_upstreams, } = getState().form[FORM_NAME.UPSTREAM].values; return dispatch(testUpstream({ bootstrap_dns, upstream_dns, local_ptr_upstreams, }, upstream_dns_file));
<mask> }; <mask> <mask> export const testUpstreamWithFormValues = () => async (dispatch, getState) => { <mask> const { upstream_dns_file } = getState().dnsConfig; <mask> const { bootstrap_dns, upstream_dns } = getState().form[FORM_NAME.UPSTREAM].values; <mask> return dispatch(testUpstream({ bootstrap...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/actions/index.js
import { renderRadioField, renderTextareaField, CheckboxField } from '../../../../helpers/form';
<mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, useTranslation } from 'react-i18next'; <mask> import classnames from 'classnames'; <mask> import Examples from './Examples'; <mask> import { renderRadioField, renderTextareaField } from '../../../../helpers/form'; <mask> import { <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/Form.js
return ( <div
<mask> const { t } = useTranslation(); <mask> const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream); <mask> const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig); <mask> <mask> return <div <mask> key={placeholder...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/Form.js
> <Field
<mask> <mask> return <div <mask> key={placeholder} <mask> className={classnames('col-12 mb-4', containerClass)} <mask> > <mask> <Field <mask> id={name} <mask> value={value} <mask> name={name} <mask> compon...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/Form.js
/> </div> );
<mask> subtitle={t(subtitle)} <mask> disabled={processingSetConfig || processingTestUpstream} <mask> normalizeOnBlur={normalizeOnBlur} <mask> onScroll={onScroll} <mask> /> <mask> </div>; <mask> }; <mask> <mask> renderField.propTypes =...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/Form.js
href="https://kb.adguard.com/general/dns-providers" target="_blank" rel="noopener noreferrer" key="0"
<mask> <Trans components={components}>upstream_dns_help</Trans> <mask> {' '} <mask> <Trans components={[ <mask> <a <mask> href="https://kb.adguard.com/general/dns-providers" <mask> target="_...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/Form.js
resolve_clients, local_ptr_upstreams,
<mask> upstream_dns, <mask> bootstrap_dns, <mask> upstream_mode, <mask> } = useSelector((state) => state.dnsConfig, shallowEqual); <mask> <mask> const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file); <mask> <mask> const handleSubmit = (values) ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/index.js
resolve_clients, local_ptr_upstreams,
<mask> upstream_dns, <mask> upstream_mode, <mask> } = values; <mask> <mask> const dnsConfig = { <mask> bootstrap_dns, <mask> upstream_mode, <mask> resolve_clients, </s> Pull request: 2704 local addresses vol.3 Merge in DNS/adguard-ho...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/index.js
resolve_clients, local_ptr_upstreams,
<mask> <mask> const dnsConfig = { <mask> bootstrap_dns, <mask> upstream_mode, <mask> ...(upstream_dns_file ? null : { upstream_dns }), <mask> }; <mask> <mask> dispatch(setDnsConfig(dnsConfig)); </s> Pull request: 2704 local addresses vol.3 Merge in...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/index.js
resolve_clients, local_ptr_upstreams,
<mask> bootstrap_dns, <mask> upstream_mode, <mask> }} <mask> onSubmit={handleSubmit} <mask> /> <mask> </div> </s> Pull request: 2704 local addresses vol.3 Merge in DNS/adguard-home from 2704-local...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/components/Settings/Dns/Upstream/index.js
local_ptr_upstreams,
<mask> blocking_ipv4, <mask> blocking_ipv6, <mask> upstream_dns, <mask> bootstrap_dns, <mask> ...values <mask> } = payload; <mask> <mask> return { </s> Pull request: 2704 local addresses vol.3 Merge in DNS...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/reducers/dnsConfig.js
local_ptr_upstreams: (local_ptr_upstreams && local_ptr_upstreams.join('\n')) || '',
<mask> blocking_ipv4: blocking_ipv4 || DEFAULT_BLOCKING_IPV4, <mask> blocking_ipv6: blocking_ipv6 || DEFAULT_BLOCKING_IPV6, <mask> upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '', <mask> bootstrap_dns: (bootstrap_dns && bootstrap_dns.join...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
client/src/reducers/dnsConfig.js
// errors. We don't use aghstrings.WriteToBuilder here since // this package should be importable for any other.
<mask> default: <mask> b := &strings.Builder{} <mask> <mask> // Ignore errors, since strings.(*Buffer).Write never returns <mask> // errors. <mask> _, _ = fmt.Fprintf(b, "%s: %s (hidden: %s", e.message, e.underlying[0], e.underlying[1]) <mask> for _, u := range e.underlying[2:] { <mask> // See co...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/agherr/agherr.go
func NewMultiAddrExchanger( addrs []string, bootstraps []string, timeout time.Duration, ) (e Exchanger, err error) {
<mask> } <mask> <mask> // NewMultiAddrExchanger creates an Exchanger instance from passed addresses. <mask> // It returns an error if any of addrs failed to become an upstream. <mask> func NewMultiAddrExchanger(addrs []string, timeout time.Duration) (e Exchanger, err error) { <mask> defer agherr.Annotate("excha...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/exchanger.go
u, err = upstream.AddressToUpstream(addr, upstream.Options{ Bootstrap: bootstraps, Timeout: timeout, })
<mask> <mask> var ups []upstream.Upstream = make([]upstream.Upstream, 0, len(addrs)) <mask> for _, addr := range addrs { <mask> var u upstream.Upstream <mask> u, err = upstream.AddressToUpstream(addr, upstream.Options{Timeout: timeout}) <mask> if err != nil { <mask> return nil, err <mask> } <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/exchanger.go
e, err = NewMultiAddrExchanger([]string{}, nil, 0)
<mask> var e Exchanger <mask> var err error <mask> <mask> t.Run("empty", func(t *testing.T) { <mask> e, err = NewMultiAddrExchanger([]string{}, 0) <mask> require.NoError(t, err) <mask> assert.NotNil(t, e) <mask> }) <mask> <mask> t.Run("successful", func(t *testing.T) { </s> Pull request: 2704 lo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/exchanger_test.go
e, err = NewMultiAddrExchanger([]string{"www.example.com"}, nil, 0)
<mask> assert.NotNil(t, e) <mask> }) <mask> <mask> t.Run("successful", func(t *testing.T) { <mask> e, err = NewMultiAddrExchanger([]string{"www.example.com"}, 0) <mask> require.NoError(t, err) <mask> assert.NotNil(t, e) <mask> }) <mask> <mask> t.Run("unsuccessful", func(t *testing.T) { </s> Pul...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/exchanger_test.go
e, err = NewMultiAddrExchanger([]string{"invalid-proto://www.example.com"}, nil, 0)
<mask> assert.NotNil(t, e) <mask> }) <mask> <mask> t.Run("unsuccessful", func(t *testing.T) { <mask> e, err = NewMultiAddrExchanger([]string{"invalid-proto://www.example.com"}, 0) <mask> require.Error(t, err) <mask> assert.Nil(t, e) <mask> }) <mask> } <mask> </s> Pull request: 2704 local address...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/exchanger_test.go
"github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "syscall" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> // ErrNoStaticIPInfo is returned by IfaceHasStaticIP when no information about </s> Pull request: 2704 local addresses vol.3 Merge in DNS/ad...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/net.go
const dot = "."
<mask> // github.com/miekg/dns package with no error among returned values. <mask> func ReverseAddr(ip net.IP) (arpa string) { <mask> var strLen int <mask> var suffix string <mask> var writeByte func(val byte) <mask> b := &strings.Builder{} </s> Pull request: 2704 local addresses vol.3 Merge in DNS/adguard-...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/net.go
<mask> // github.com/miekg/dns package with no error among returned values. <mask> func ReverseAddr(ip net.IP) (arpa string) { <mask> var strLen int <mask> var suffix string <mask> // Don't handle errors in implementations since strings.WriteString <mask> // never returns non-nil errors. <mask> var writeByt...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/net.go
aghstrings.WriteToBuilder(b, strconv.Itoa(int(val)), dot)
<mask> if ip4 := ip.To4(); ip4 != nil { <mask> strLen, suffix = arpaV4MaxLen, arpaV4Suffix[1:] <mask> ip = ip4 <mask> writeByte = func(val byte) { <mask> _, _ = b.WriteString(strconv.Itoa(int(val))) <mask> _, _ = b.WriteRune('.') <mask> } <mask> <mask> } else if ip6 := ip.To16(); ip6 != nil { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/net.go
aghstrings.WriteToBuilder( b, strconv.FormatUint(uint64(val&0xF), 16), dot, strconv.FormatUint(uint64(val>>4), 16), dot, )
<mask> } else if ip6 := ip.To16(); ip6 != nil { <mask> strLen, suffix = arpaV6MaxLen, arpaV6Suffix[1:] <mask> ip = ip6 <mask> writeByte = func(val byte) { <mask> lByte, rByte := val&0xF, val>>4 <mask> <mask> _, _ = b.WriteString(strconv.FormatUint(uint64(lByte), 16)) <mask> _, _ = b.WriteRune('...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/net.go
aghstrings.WriteToBuilder(b, suffix)
<mask> b.Grow(strLen) <mask> for i := len(ip) - 1; i >= 0; i-- { <mask> writeByte(ip[i]) <mask> } <mask> _, _ = b.WriteString(suffix) <mask> <mask> return b.String() <mask> } </s> Pull request: 2704 local addresses vol.3 Merge in DNS/adguard-home from 2704-local-addresses-vol.3 to master Updates #270...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghnet/net.go
func (e *Exchanger) Exchange(req *dns.Msg) (resp *dns.Msg, err error) { if e.Ups == nil { e.Ups = &TestErrUpstream{}
<mask> Ups upstream.Upstream <mask> } <mask> <mask> // Exchange implements aghnet.Exchanger interface for *Exchanger. <mask> func (lr *Exchanger) Exchange(req *dns.Msg) (resp *dns.Msg, err error) { <mask> if lr.Ups == nil { <mask> lr.Ups = &TestErrUpstream{} <mask> } <mask> <mask> return lr.Ups.Exchan...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghtest/exchanger.go
return e.Ups.Exchange(req)
<mask> if lr.Ups == nil { <mask> lr.Ups = &TestErrUpstream{} <mask> } <mask> <mask> return lr.Ups.Exchange(req) <mask> } </s> Pull request: 2704 local addresses vol.3 Merge in DNS/adguard-home from 2704-local-addresses-vol.3 to master Updates #2704. Updates #2829. Updates #2928. Squashed commit of the f...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/aghtest/exchanger.go
CustomResolver Resolver `yaml:"-"`
<mask> // Register an HTTP handler <mask> HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"` <mask> <mask> // CustomResolver is the resolver used by DNSFilter. <mask> CustomResolver Resolver <mask> } <mask> <mask> // LookupStats store stats collected during safebrowsing...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/dnsfilter/dnsfilter.go
"github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "time" <mask> <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/cache" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/miekg/dns" <mask> "golang.org/x/net/publicsuffix" </s> Pull request: 2704 local addresses vol.3 Merge in DNS/adguard-home from...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/dnsfilter/safebrowsing.go
<mask> <mask> // convert hash array to string <mask> func (c *sbCtx) getQuestion() string { <mask> b := &strings.Builder{} <mask> encoder := hex.NewEncoder(b) <mask> <mask> for hash := range c.hashToHost { <mask> // Ignore errors, since strings.(*Buffer).Write never returns <mask> // errors. <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/80ed8be14538418a1faa3fd52e84e391b2f53f55
internal/dnsfilter/safebrowsing.go