code_before
stringlengths 16
1.81M
| edits
stringlengths 4
328k
| next_edit
stringlengths 0
76.5k
| code_after
stringlengths 3
49.9M
| label_window
sequencelengths 4
1.81k
| instruction
stringlengths 20
51.9k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|---|---|---|
// updateHosts - loads system hosts
func (a *AutoHosts) updateHosts() {
table := make(map[string][]net.IP)
tableRev := make(map[string]string)
a.load(table, tableRev, a.hostsFn)
for _, dir := range a.hostsDirs {
fis, err := ioutil.ReadDir(dir)
| </s> remove for ip, name := range hosts {
ok, err := clients.addHost(ip, name, ClientSourceHostsFile)
if err != nil {
log.Debug("Clients: %s", err)
}
if ok {
n++
</s> add for ip, names := range hosts {
for _, name := range names {
ok, err := clients.addHost(ip, name, ClientSourceHostsFile)
if err != nil {
log.Debug("Clients: %s", err)
}
if ok {
n++
} </s> remove table[k] = v
</s> add ipToHosts[k] = v </s> remove // List - get "IP -> hostname" table. Thread-safe.
func (a *AutoHosts) List() map[string]string {
table := make(map[string]string)
</s> add // List returns an IP-to-hostnames table. It is safe for concurrent use.
func (a *AutoHosts) List() (ipToHosts map[string][]string) { </s> remove func (a *AutoHosts) load(table map[string][]net.IP, tableRev map[string]string, fn string) {
</s> add func (a *AutoHosts) load(table map[string][]net.IP, tableRev map[string][]string, fn string) { </s> remove log.Debug("AutoHosts: reverse-lookup: %s -> %s", addr, host)
return host
</s> add log.Debug("AutoHosts: reverse-lookup: %s -> %s", addr, hosts)
return hosts | tableRev := make(map[string][]string) |
// updateHosts - loads system hosts
func (a *AutoHosts) updateHosts() {
table := make(map[string][]net.IP)
tableRev := make(map[string][]string)
a.load(table, tableRev, a.hostsFn)
for _, dir := range a.hostsDirs {
fis, err := ioutil.ReadDir(dir) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: allow multiple hosts in reverse lookups
Merge in DNS/adguard-home from 2269-multiple-hosts to master
For #2269.
Squashed commit of the following:
commit f8ae452540b106f2d5b130b8edb08c4e76b003f4
Merge: 8dd06f7cc 3e1f92225
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 6 17:28:12 2020 +0300
Merge branch 'master' into 2269-multiple-hosts
commit 8dd06f7cca27ec32a4690e2673603b166f82af0a
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 5 20:28:33 2020 +0300
* all: allow multiple hosts in reverse lookups | https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff | internal/util/auto_hosts.go |
func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0755)
return dir
}
func TestAutoHostsResolution(t *testing.T) {
ah := AutoHosts{}
| </s> remove assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "localhost")
</s> add hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
} </s> remove tableRev := make(map[string]string)
</s> add tableRev := make(map[string][]string) </s> remove assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host")
</s> add hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
</s> remove table[k] = v
</s> add ipToHosts[k] = v </s> remove a.lock.Unlock()
return table
</s> add return ipToHosts | _ = os.MkdirAll(dir, 0o755) |
func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
}
func TestAutoHostsResolution(t *testing.T) {
ah := AutoHosts{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: allow multiple hosts in reverse lookups
Merge in DNS/adguard-home from 2269-multiple-hosts to master
For #2269.
Squashed commit of the following:
commit f8ae452540b106f2d5b130b8edb08c4e76b003f4
Merge: 8dd06f7cc 3e1f92225
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 6 17:28:12 2020 +0300
Merge branch 'master' into 2269-multiple-hosts
commit 8dd06f7cca27ec32a4690e2673603b166f82af0a
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 5 20:28:33 2020 +0300
* all: allow multiple hosts in reverse lookups | https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff | internal/util/auto_hosts_test.go |
assert.Nil(t, ips)
// Test hosts file
table := ah.List()
name, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, "host", name)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
| </s> remove assert.Equal(t, "host", name)
</s> add assert.Equal(t, []string{"host", "localhost"}, names) </s> remove assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host")
</s> add hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
</s> remove assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "localhost")
</s> add hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
} </s> remove for ip, name := range hosts {
ok, err := clients.addHost(ip, name, ClientSourceHostsFile)
if err != nil {
log.Debug("Clients: %s", err)
}
if ok {
n++
</s> add for ip, names := range hosts {
for _, name := range names {
ok, err := clients.addHost(ip, name, ClientSourceHostsFile)
if err != nil {
log.Debug("Clients: %s", err)
}
if ok {
n++
} </s> remove _, ok := tableRev[ipStr]
</s> add hosts, ok := tableRev[ipStr] | names, ok := table["127.0.0.1"] | assert.Nil(t, ips)
// Test hosts file
table := ah.List()
names, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, "host", name)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: allow multiple hosts in reverse lookups
Merge in DNS/adguard-home from 2269-multiple-hosts to master
For #2269.
Squashed commit of the following:
commit f8ae452540b106f2d5b130b8edb08c4e76b003f4
Merge: 8dd06f7cc 3e1f92225
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 6 17:28:12 2020 +0300
Merge branch 'master' into 2269-multiple-hosts
commit 8dd06f7cca27ec32a4690e2673603b166f82af0a
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 5 20:28:33 2020 +0300
* all: allow multiple hosts in reverse lookups | https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff | internal/util/auto_hosts_test.go |
// Test hosts file
table := ah.List()
name, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, "host", name)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host")
| </s> remove name, ok := table["127.0.0.1"]
</s> add names, ok := table["127.0.0.1"] </s> remove assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host")
</s> add hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
</s> remove assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "localhost")
</s> add hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
} </s> remove for ip, name := range hosts {
ok, err := clients.addHost(ip, name, ClientSourceHostsFile)
if err != nil {
log.Debug("Clients: %s", err)
}
if ok {
n++
</s> add for ip, names := range hosts {
for _, name := range names {
ok, err := clients.addHost(ip, name, ClientSourceHostsFile)
if err != nil {
log.Debug("Clients: %s", err)
}
if ok {
n++
} </s> remove _, ok := tableRev[ipStr]
</s> add hosts, ok := tableRev[ipStr] | assert.Equal(t, []string{"host", "localhost"}, names) | // Test hosts file
table := ah.List()
name, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: allow multiple hosts in reverse lookups
Merge in DNS/adguard-home from 2269-multiple-hosts to master
For #2269.
Squashed commit of the following:
commit f8ae452540b106f2d5b130b8edb08c4e76b003f4
Merge: 8dd06f7cc 3e1f92225
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 6 17:28:12 2020 +0300
Merge branch 'master' into 2269-multiple-hosts
commit 8dd06f7cca27ec32a4690e2673603b166f82af0a
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 5 20:28:33 2020 +0300
* all: allow multiple hosts in reverse lookups | https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff | internal/util/auto_hosts_test.go |
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host")
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "localhost")
}
| </s> remove assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "localhost")
</s> add hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
} </s> remove assert.Equal(t, "host", name)
</s> add assert.Equal(t, []string{"host", "localhost"}, names) </s> remove name, ok := table["127.0.0.1"]
</s> add names, ok := table["127.0.0.1"] </s> remove _ = os.MkdirAll(dir, 0755)
</s> add _ = os.MkdirAll(dir, 0o755) </s> remove // ProcessReverse - process PTR request
// Return "" if not found or an error occurred
func (a *AutoHosts) ProcessReverse(addr string, qtype uint16) string {
</s> add // ProcessReverse processes a PTR request. It returns nil if nothing is found.
func (a *AutoHosts) ProcessReverse(addr string, qtype uint16) (hosts []string) { | hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
|
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "localhost")
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: allow multiple hosts in reverse lookups
Merge in DNS/adguard-home from 2269-multiple-hosts to master
For #2269.
Squashed commit of the following:
commit f8ae452540b106f2d5b130b8edb08c4e76b003f4
Merge: 8dd06f7cc 3e1f92225
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 6 17:28:12 2020 +0300
Merge branch 'master' into 2269-multiple-hosts
commit 8dd06f7cca27ec32a4690e2673603b166f82af0a
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 5 20:28:33 2020 +0300
* all: allow multiple hosts in reverse lookups | https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff | internal/util/auto_hosts_test.go |
a = strings.TrimSuffix(a, ".")
assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host")
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "localhost")
}
func TestAutoHostsFSNotify(t *testing.T) {
ah := AutoHosts{}
| </s> remove assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host")
</s> add hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
</s> remove assert.Equal(t, "host", name)
</s> add assert.Equal(t, []string{"host", "localhost"}, names) </s> remove _ = os.MkdirAll(dir, 0755)
</s> add _ = os.MkdirAll(dir, 0o755) </s> remove name, ok := table["127.0.0.1"]
</s> add names, ok := table["127.0.0.1"] </s> remove table[k] = v
</s> add ipToHosts[k] = v | hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
} | a = strings.TrimSuffix(a, ".")
assert.True(t, ah.ProcessReverse(a, dns.TypePTR) == "host")
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
}
}
func TestAutoHostsFSNotify(t *testing.T) {
ah := AutoHosts{}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: allow multiple hosts in reverse lookups
Merge in DNS/adguard-home from 2269-multiple-hosts to master
For #2269.
Squashed commit of the following:
commit f8ae452540b106f2d5b130b8edb08c4e76b003f4
Merge: 8dd06f7cc 3e1f92225
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 6 17:28:12 2020 +0300
Merge branch 'master' into 2269-multiple-hosts
commit 8dd06f7cca27ec32a4690e2673603b166f82af0a
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 5 20:28:33 2020 +0300
* all: allow multiple hosts in reverse lookups | https://github.com/AdguardTeam/AdGuardHome/commit/298f74ba814770306501bc1a594f18d5ba59d1ff | internal/util/auto_hosts_test.go |
return nil
},
}
var resultHandlers = map[string]logEntryHandler{
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(bool)
if !ok {
return nil
}
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].Text = s
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
n, ok := t.(json.Number)
if !ok {
return nil
}
i, err := n.Int64()
if err != nil {
return err
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].FilterListID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.Reason = filtering.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = s
return nil
},
"CanonName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.CanonName = s
return nil
},
}
func decodeResultRuleKey(key string, i int, dec *json.Decoder, ent *logEntry) {
var vToken json.Token
switch key {
case "FilterListID":
ent.Result.Rules, vToken = decodeVTokenAndAddRule(key, i, dec, ent.Result.Rules)
| </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) </s> remove if !needFlush {
return nil
}
</s> add </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") </s> remove if !l.conf.Enabled {
</s> add 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 { </s> remove switch key {
case "ReverseHosts":
decodeResultReverseHosts(dec, ent)
</s> add decHandler, ok := resultDecHandlers[key]
if ok {
decHandler(dec, ent) | return nil
},
}
func decodeResultRuleKey(key string, i int, dec *json.Decoder, ent *logEntry) {
var vToken json.Token
switch key {
case "FilterListID":
ent.Result.Rules, vToken = decodeVTokenAndAddRule(key, i, dec, ent.Result.Rules) | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/decode.go |
|
return
}
switch key {
case "ReverseHosts":
decodeResultReverseHosts(dec, ent)
continue
case "IPList":
decodeResultIPList(dec, ent)
| </s> remove case "IPList":
decodeResultIPList(dec, ent)
continue
case "Rules":
decodeResultRules(dec, ent)
continue
case "DNSRewriteResult":
decodeResultDNSRewriteResult(dec, ent)
continue
default:
// Go on.
</s> add </s> remove var resultHandlers = map[string]logEntryHandler{
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(bool)
if !ok {
return nil
}
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].Text = s
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
n, ok := t.(json.Number)
if !ok {
return nil
}
i, err := n.Int64()
if err != nil {
return err
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].FilterListID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.Reason = filtering.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = s
return nil
},
"CanonName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.CanonName = s
return nil
},
}
</s> add </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) </s> remove if err != nil {
log.Error("querylog: writing to file: %s", err)
</s> add </s> remove if !l.conf.Enabled {
</s> add 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 { | decHandler, ok := resultDecHandlers[key]
if ok {
decHandler(dec, ent) |
return
}
decHandler, ok := resultDecHandlers[key]
if ok {
decHandler(dec, ent)
decHandler, ok := resultDecHandlers[key]
if ok {
decHandler(dec, ent)
decHandler, ok := resultDecHandlers[key]
if ok {
decHandler(dec, ent)
continue
case "IPList":
decodeResultIPList(dec, ent)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/decode.go |
case "ReverseHosts":
decodeResultReverseHosts(dec, ent)
continue
case "IPList":
decodeResultIPList(dec, ent)
continue
case "Rules":
decodeResultRules(dec, ent)
continue
case "DNSRewriteResult":
decodeResultDNSRewriteResult(dec, ent)
continue
default:
// Go on.
}
handler, ok := resultHandlers[key]
if !ok {
continue
| </s> remove switch key {
case "ReverseHosts":
decodeResultReverseHosts(dec, ent)
</s> add decHandler, ok := resultDecHandlers[key]
if ok {
decHandler(dec, ent) </s> remove var resultHandlers = map[string]logEntryHandler{
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(bool)
if !ok {
return nil
}
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].Text = s
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
n, ok := t.(json.Number)
if !ok {
return nil
}
i, err := n.Int64()
if err != nil {
return err
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].FilterListID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.Reason = filtering.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = s
return nil
},
"CanonName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.CanonName = s
return nil
},
}
</s> add </s> remove // if buffer needs to be flushed to disk, do it now
</s> add </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} | case "ReverseHosts":
decodeResultReverseHosts(dec, ent)
continue
}
handler, ok := resultHandlers[key]
if !ok {
continue | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/decode.go |
|
package querylog
import (
"fmt"
"net"
"os"
"strings"
"sync"
"time"
| </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove rot.Format(time.RFC3339),
</s> add rotTime.Format(time.RFC3339), </s> remove if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) {
</s> add if rotTime, now := oldest.Add(rotationIvl), time.Now(); rotTime.After(now) { </s> remove switch key {
case "ReverseHosts":
decodeResultReverseHosts(dec, ent)
</s> add decHandler, ok := resultDecHandlers[key]
if ok {
decHandler(dec, ent) | package querylog
import (
"fmt"
"os"
"strings"
"sync"
"time"
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/timeutil"
"github.com/miekg/dns"
)
const (
| </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove "net"
</s> add </s> remove rot.Format(time.RFC3339),
</s> add rotTime.Format(time.RFC3339), </s> remove if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) {
</s> add if rotTime, now := oldest.Add(rotationIvl), time.Now(); rotTime.After(now) { </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { | "github.com/AdguardTeam/golibs/stringutil" | "github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/stringutil"
"github.com/AdguardTeam/golibs/timeutil"
"github.com/miekg/dns"
)
const ( | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
return "", fmt.Errorf("invalid client proto: %q", s)
}
}
// logEntry - represents a single log entry
type logEntry struct {
// client is the found client information, if any.
client *Client
Time time.Time `json:"T"`
QHost string `json:"QH"`
QType string `json:"QT"`
QClass string `json:"QC"`
ReqECS string `json:"ECS,omitempty"`
ClientID string `json:"CID,omitempty"`
ClientProto ClientProto `json:"CP"`
Answer []byte `json:",omitempty"` // sometimes empty answers happen like binerdunt.top or rev2.globalrootservers.net
OrigAnswer []byte `json:",omitempty"`
Result filtering.Result
Upstream string `json:",omitempty"`
IP net.IP `json:"IP"`
Elapsed time.Duration
Cached bool `json:",omitempty"`
AuthenticatedData bool `json:"AD,omitempty"`
}
// shallowClone returns a shallow clone of e.
func (e *logEntry) shallowClone() (clone *logEntry) {
cloneVal := *e
return &cloneVal
}
func (l *queryLog) Start() {
if l.conf.HTTPRegister != nil {
l.initWeb()
}
go l.periodicRotate()
| </s> remove // isIgnored returns true if the host is in the Ignored list.
</s> add // isIgnored returns true if the host is in the ignored domains list. It
// assumes that l.confMu is locked for reading. </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove var resultHandlers = map[string]logEntryHandler{
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(bool)
if !ok {
return nil
}
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].Text = s
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
n, ok := t.(json.Number)
if !ok {
return nil
}
i, err := n.Int64()
if err != nil {
return err
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].FilterListID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.Reason = filtering.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = s
return nil
},
"CanonName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.CanonName = s
return nil
},
}
</s> add </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") | return "", fmt.Errorf("invalid client proto: %q", s)
}
}
func (l *queryLog) Start() {
if l.conf.HTTPRegister != nil {
l.initWeb()
}
go l.periodicRotate() | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
|
go l.periodicRotate()
}
func (l *queryLog) Close() {
_ = l.flushLogBuffer(true)
}
func checkInterval(ivl time.Duration) (ok bool) {
// The constants for possible values of query log's rotation interval.
const (
| </s> remove l.confMu.RLock()
defer l.confMu.RUnlock()
</s> add var rotationIvl time.Duration
func() {
l.confMu.RLock()
defer l.confMu.RUnlock()
rotationIvl = l.conf.RotationIvl
}() </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove // if buffer needs to be flushed to disk, do it now
</s> add </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove // logEntry - represents a single log entry
type logEntry struct {
// client is the found client information, if any.
client *Client
Time time.Time `json:"T"`
QHost string `json:"QH"`
QType string `json:"QT"`
QClass string `json:"QC"`
ReqECS string `json:"ECS,omitempty"`
ClientID string `json:"CID,omitempty"`
ClientProto ClientProto `json:"CP"`
Answer []byte `json:",omitempty"` // sometimes empty answers happen like binerdunt.top or rev2.globalrootservers.net
OrigAnswer []byte `json:",omitempty"`
Result filtering.Result
Upstream string `json:",omitempty"`
IP net.IP `json:"IP"`
Elapsed time.Duration
Cached bool `json:",omitempty"`
AuthenticatedData bool `json:"AD,omitempty"`
}
// shallowClone returns a shallow clone of e.
func (e *logEntry) shallowClone() (clone *logEntry) {
cloneVal := *e
return &cloneVal
}
</s> add | l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} | go l.periodicRotate()
}
func (l *queryLog) Close() {
l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
}
}
func checkInterval(ivl time.Duration) (ok bool) {
// The constants for possible values of query log's rotation interval.
const ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
return nil
}
func (l *queryLog) WriteDiskConfig(c *Config) {
*c = *l.conf
// TODO(a.garipov): Add stringutil.Set.Clone.
c.Ignored = stringutil.NewSet(l.conf.Ignored.Values()...)
}
| </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove if !l.conf.Enabled {
</s> add 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 { </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { | l.confMu.RLock()
defer l.confMu.RUnlock()
| return nil
}
func (l *queryLog) WriteDiskConfig(c *Config) {
l.confMu.RLock()
defer l.confMu.RUnlock()
*c = *l.conf
// TODO(a.garipov): Add stringutil.Set.Clone.
c.Ignored = stringutil.NewSet(l.conf.Ignored.Values()...)
}
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
defer l.confMu.RUnlock()
*c = *l.conf
}
// Clear memory buffer and remove log files
func (l *queryLog) clear() {
l.fileFlushLock.Lock()
defer l.fileFlushLock.Unlock()
| </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove l.confMu.RLock()
defer l.confMu.RUnlock()
</s> add var rotationIvl time.Duration
func() {
l.confMu.RLock()
defer l.confMu.RUnlock()
rotationIvl = l.conf.RotationIvl
}() </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove // Flush the remainder to file.
</s> add | // TODO(a.garipov): Add stringutil.Set.Clone.
c.Ignored = stringutil.NewSet(l.conf.Ignored.Values()...) | defer l.confMu.RUnlock()
*c = *l.conf
// TODO(a.garipov): Add stringutil.Set.Clone.
c.Ignored = stringutil.NewSet(l.conf.Ignored.Values()...)
}
// Clear memory buffer and remove log files
func (l *queryLog) clear() {
l.fileFlushLock.Lock()
defer l.fileFlushLock.Unlock() | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
log.Debug("querylog: cleared")
}
func (l *queryLog) Add(params *AddParams) {
if !l.conf.Enabled {
return
}
err := params.validate()
if err != nil {
| </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) </s> remove if !needFlush {
return nil
}
</s> add </s> remove if err != nil {
log.Error("querylog: writing to file: %s", err)
</s> add | 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 { | log.Debug("querylog: cleared")
}
func (l *queryLog) Add(params *AddParams) {
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 {
return
}
err := params.validate()
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
}
now := time.Now()
q := params.Question.Question[0]
entry := logEntry{
Time: now,
QHost: strings.ToLower(q.Name[:len(q.Name)-1]),
QType: dns.Type(q.Qtype).String(),
QClass: dns.Class(q.Qclass).String(),
| </s> remove if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) {
</s> add if rotTime, now := oldest.Add(rotationIvl), time.Now(); rotTime.After(now) { </s> remove // if buffer needs to be flushed to disk, do it now
</s> add </s> remove rot.Format(time.RFC3339),
</s> add rotTime.Format(time.RFC3339), </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove // logEntry - represents a single log entry
type logEntry struct {
// client is the found client information, if any.
client *Client
Time time.Time `json:"T"`
QHost string `json:"QH"`
QType string `json:"QT"`
QClass string `json:"QC"`
ReqECS string `json:"ECS,omitempty"`
ClientID string `json:"CID,omitempty"`
ClientProto ClientProto `json:"CP"`
Answer []byte `json:",omitempty"` // sometimes empty answers happen like binerdunt.top or rev2.globalrootservers.net
OrigAnswer []byte `json:",omitempty"`
Result filtering.Result
Upstream string `json:",omitempty"`
IP net.IP `json:"IP"`
Elapsed time.Duration
Cached bool `json:",omitempty"`
AuthenticatedData bool `json:"AD,omitempty"`
}
// shallowClone returns a shallow clone of e.
func (e *logEntry) shallowClone() (clone *logEntry) {
cloneVal := *e
return &cloneVal
}
</s> add | entry := &logEntry{ | }
now := time.Now()
q := params.Question.Question[0]
entry := &logEntry{
Time: now,
QHost: strings.ToLower(q.Name[:len(q.Name)-1]),
QType: dns.Type(q.Qtype).String(),
QClass: dns.Class(q.Qclass).String(), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
if params.ReqECS != nil {
entry.ReqECS = params.ReqECS.String()
}
if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
needFlush := false
func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock()
| </s> remove if !needFlush {
return nil
}
</s> add </s> remove if err != nil {
log.Error("querylog: writing to file: %s", err)
</s> add </s> remove if !l.conf.Enabled {
</s> add 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 { </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") | entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) | if params.ReqECS != nil {
entry.ReqECS = params.ReqECS.String()
}
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true)
needFlush := false
func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock() | [
"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",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock()
l.buffer = append(l.buffer, &entry)
if !l.conf.FileEnabled {
if len(l.buffer) > int(l.conf.MemSize) {
// Writing to file is disabled, so just remove the oldest entry
// from the slices.
| </s> remove if !l.conf.FileEnabled {
if len(l.buffer) > int(l.conf.MemSize) {
</s> add if !fileIsEnabled {
if len(l.buffer) > int(memSize) { </s> remove needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
}
</s> add flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false </s> remove needFlush := fullFlush
</s> add </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove needFlush = len(l.buffer) >= int(l.conf.MemSize)
</s> add needFlush = len(l.buffer) >= int(memSize) | l.buffer = append(l.buffer, entry) | func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock()
l.buffer = append(l.buffer, entry)
if !l.conf.FileEnabled {
if len(l.buffer) > int(l.conf.MemSize) {
// Writing to file is disabled, so just remove the oldest entry
// from the slices. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
defer l.bufferLock.Unlock()
l.buffer = append(l.buffer, &entry)
if !l.conf.FileEnabled {
if len(l.buffer) > int(l.conf.MemSize) {
// Writing to file is disabled, so just remove the oldest entry
// from the slices.
//
// TODO(a.garipov): This should be replaced by a proper ring
// buffer, but it's currently difficult to do that.
| </s> remove l.buffer = append(l.buffer, &entry)
</s> add l.buffer = append(l.buffer, entry) </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove // if buffer needs to be flushed to disk, do it now
</s> add </s> remove needFlush := fullFlush
</s> add | if !fileIsEnabled {
if len(l.buffer) > int(memSize) { | defer l.bufferLock.Unlock()
l.buffer = append(l.buffer, &entry)
if !fileIsEnabled {
if len(l.buffer) > int(memSize) {
if !fileIsEnabled {
if len(l.buffer) > int(memSize) {
// Writing to file is disabled, so just remove the oldest entry
// from the slices.
//
// TODO(a.garipov): This should be replaced by a proper ring
// buffer, but it's currently difficult to do that. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
l.buffer[0] = nil
l.buffer = l.buffer[1:]
}
} else if !l.flushPending {
needFlush = len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
l.flushPending = true
}
}
}()
| </s> remove needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
}
</s> add flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false </s> remove if !needFlush {
return nil
}
</s> add </s> remove // if buffer needs to be flushed to disk, do it now
</s> add </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) | needFlush = len(l.buffer) >= int(memSize) | l.buffer[0] = nil
l.buffer = l.buffer[1:]
}
} else if !l.flushPending {
needFlush = len(l.buffer) >= int(memSize)
if needFlush {
l.flushPending = true
}
}
}() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
}
}
}()
// if buffer needs to be flushed to disk, do it now
if needFlush {
go func() {
_ = l.flushLogBuffer(false)
}()
}
| </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove needFlush = len(l.buffer) >= int(l.conf.MemSize)
</s> add needFlush = len(l.buffer) >= int(memSize) </s> remove needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
}
</s> add flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove if !needFlush {
return nil
}
</s> add | }
}
}()
if needFlush {
go func() {
_ = l.flushLogBuffer(false)
}()
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
|
// if buffer needs to be flushed to disk, do it now
if needFlush {
go func() {
_ = l.flushLogBuffer(false)
}()
}
}
// ShouldLog returns true if request for the host should be logged.
| </s> remove // if buffer needs to be flushed to disk, do it now
</s> add </s> remove // isIgnored returns true if the host is in the Ignored list.
</s> add // isIgnored returns true if the host is in the ignored domains list. It
// assumes that l.confMu is locked for reading. </s> remove if !l.conf.FileEnabled {
if len(l.buffer) > int(l.conf.MemSize) {
</s> add if !fileIsEnabled {
if len(l.buffer) > int(memSize) { </s> remove needFlush = len(l.buffer) >= int(l.conf.MemSize)
</s> add needFlush = len(l.buffer) >= int(memSize) </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} | flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} |
// if buffer needs to be flushed to disk, do it now
if needFlush {
go func() {
flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
}
}()
}
}
// ShouldLog returns true if request for the host should be logged. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
return !l.isIgnored(host)
}
// isIgnored returns true if the host is in the Ignored list.
func (l *queryLog) isIgnored(host string) bool {
return l.conf.Ignored.Has(host)
}
| </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove // logEntry - represents a single log entry
type logEntry struct {
// client is the found client information, if any.
client *Client
Time time.Time `json:"T"`
QHost string `json:"QH"`
QType string `json:"QT"`
QClass string `json:"QC"`
ReqECS string `json:"ECS,omitempty"`
ClientID string `json:"CID,omitempty"`
ClientProto ClientProto `json:"CP"`
Answer []byte `json:",omitempty"` // sometimes empty answers happen like binerdunt.top or rev2.globalrootservers.net
OrigAnswer []byte `json:",omitempty"`
Result filtering.Result
Upstream string `json:",omitempty"`
IP net.IP `json:"IP"`
Elapsed time.Duration
Cached bool `json:",omitempty"`
AuthenticatedData bool `json:"AD,omitempty"`
}
// shallowClone returns a shallow clone of e.
func (e *logEntry) shallowClone() (clone *logEntry) {
cloneVal := *e
return &cloneVal
}
</s> add </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove if !l.conf.Enabled {
</s> add 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 { </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") | // isIgnored returns true if the host is in the ignored domains list. It
// assumes that l.confMu is locked for reading. |
return !l.isIgnored(host)
}
// isIgnored returns true if the host is in the ignored domains list. It
// assumes that l.confMu is locked for reading.
func (l *queryLog) isIgnored(host string) bool {
return l.conf.Ignored.Has(host)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog.go |
// Add disk entries.
addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
// Write to disk (first file).
require.NoError(t, l.flushLogBuffer(true))
// Start writing to the second file.
require.NoError(t, l.rotate())
// Add disk entries.
addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
// Write to disk.
| </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { | require.NoError(t, l.flushLogBuffer()) |
// Add disk entries.
addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
// Write to disk (first file).
require.NoError(t, l.flushLogBuffer())
// Start writing to the second file.
require.NoError(t, l.rotate())
// Add disk entries.
addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
// Write to disk. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog_test.go |
require.NoError(t, l.rotate())
// Add disk entries.
addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
// Write to disk.
require.NoError(t, l.flushLogBuffer(true))
// Add memory entries.
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))
type tcAssertion struct {
| </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) | require.NoError(t, l.flushLogBuffer()) | require.NoError(t, l.rotate())
// Add disk entries.
addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
// Write to disk.
require.NoError(t, l.flushLogBuffer())
// Add memory entries.
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))
type tcAssertion struct { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog_test.go |
for i := 0; i < entNum; i++ {
addEntry(l, secondPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
}
// Write them to the first file.
require.NoError(t, l.flushLogBuffer(true))
// Add more to the in-memory part of log.
for i := 0; i < entNum; i++ {
addEntry(l, firstPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
}
| </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} | require.NoError(t, l.flushLogBuffer()) | for i := 0; i < entNum; i++ {
addEntry(l, secondPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
}
// Write them to the first file.
require.NoError(t, l.flushLogBuffer())
// Add more to the in-memory part of log.
for i := 0; i < entNum; i++ {
addEntry(l, firstPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog_test.go |
for i := 0; i < entNum; i++ {
addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
}
// Write them to disk.
require.NoError(t, l.flushLogBuffer(true))
params := newSearchParams()
for _, maxFileScanEntries := range []int{5, 0} {
t.Run(fmt.Sprintf("limit_%d", maxFileScanEntries), func(t *testing.T) {
| </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove require.NoError(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer()) </s> remove var resultHandlers = map[string]logEntryHandler{
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(bool)
if !ok {
return nil
}
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].Text = s
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
n, ok := t.(json.Number)
if !ok {
return nil
}
i, err := n.Int64()
if err != nil {
return err
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].FilterListID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.Reason = filtering.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = s
return nil
},
"CanonName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.CanonName = s
return nil
},
}
</s> add </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} | require.NoError(t, l.flushLogBuffer()) | for i := 0; i < entNum; i++ {
addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
}
// Write them to disk.
require.NoError(t, l.flushLogBuffer())
params := newSearchParams()
for _, maxFileScanEntries := range []int{5, 0} {
t.Run(fmt.Sprintf("limit_%d", maxFileScanEntries), func(t *testing.T) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/qlog_test.go |
)
// flushLogBuffer flushes the current buffer to file and resets the current
// buffer.
func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
l.fileFlushLock.Lock()
defer l.fileFlushLock.Unlock()
// Flush the remainder to file.
var flushBuffer []*logEntry
| </s> remove // Flush the remainder to file.
</s> add </s> remove needFlush := fullFlush
</s> add </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") </s> remove l.buffer = append(l.buffer, &entry)
</s> add l.buffer = append(l.buffer, entry) | func (l *queryLog) flushLogBuffer() (err error) { | )
// flushLogBuffer flushes the current buffer to file and resets the current
// buffer.
func (l *queryLog) flushLogBuffer() (err error) {
func (l *queryLog) flushLogBuffer() (err error) {
func (l *queryLog) flushLogBuffer() (err error) {
func (l *queryLog) flushLogBuffer() (err error) {
func (l *queryLog) flushLogBuffer() (err error) {
l.fileFlushLock.Lock()
defer l.fileFlushLock.Unlock()
// Flush the remainder to file.
var flushBuffer []*logEntry | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
l.fileFlushLock.Lock()
defer l.fileFlushLock.Unlock()
// Flush the remainder to file.
var flushBuffer []*logEntry
needFlush := fullFlush
func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock()
| </s> remove needFlush := fullFlush
</s> add </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
}
</s> add flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false </s> remove l.buffer = append(l.buffer, &entry)
</s> add l.buffer = append(l.buffer, entry) |
l.fileFlushLock.Lock()
defer l.fileFlushLock.Unlock()
var flushBuffer []*logEntry
needFlush := fullFlush
func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
|
defer l.fileFlushLock.Unlock()
// Flush the remainder to file.
var flushBuffer []*logEntry
needFlush := fullFlush
func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock()
needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
| </s> remove // Flush the remainder to file.
</s> add </s> remove needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
}
</s> add flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove needFlush = len(l.buffer) >= int(l.conf.MemSize)
</s> add needFlush = len(l.buffer) >= int(memSize) </s> remove l.buffer = append(l.buffer, &entry)
</s> add l.buffer = append(l.buffer, entry) | defer l.fileFlushLock.Unlock()
// Flush the remainder to file.
var flushBuffer []*logEntry
func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock()
needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
|
func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock()
needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
}
}()
if !needFlush {
return nil
}
| </s> remove needFlush = len(l.buffer) >= int(l.conf.MemSize)
</s> add needFlush = len(l.buffer) >= int(memSize) </s> remove needFlush := fullFlush
</s> add </s> remove if !needFlush {
return nil
}
</s> add </s> remove l.buffer = append(l.buffer, &entry)
</s> add l.buffer = append(l.buffer, entry) </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) | flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false | func() {
l.bufferLock.Lock()
defer l.bufferLock.Unlock()
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
}()
if !needFlush {
return nil
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
l.buffer = nil
l.flushPending = false
}
}()
if !needFlush {
return nil
}
err = l.flushToFile(flushBuffer)
if err != nil {
log.Error("querylog: writing to file: %s", err)
| </s> remove if err != nil {
log.Error("querylog: writing to file: %s", err)
</s> add </s> remove needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false
}
</s> add flushBuffer = l.buffer
l.buffer = nil
l.flushPending = false </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) </s> remove needFlush = len(l.buffer) >= int(l.conf.MemSize)
</s> add needFlush = len(l.buffer) >= int(memSize) | l.buffer = nil
l.flushPending = false
}
}()
err = l.flushToFile(flushBuffer)
if err != nil {
log.Error("querylog: writing to file: %s", err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
|
return nil
}
err = l.flushToFile(flushBuffer)
if err != nil {
log.Error("querylog: writing to file: %s", err)
return err
}
return nil
| </s> remove if !needFlush {
return nil
}
</s> add </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove var resultHandlers = map[string]logEntryHandler{
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(bool)
if !ok {
return nil
}
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].Text = s
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
n, ok := t.(json.Number)
if !ok {
return nil
}
i, err := n.Int64()
if err != nil {
return err
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].FilterListID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.Reason = filtering.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = s
return nil
},
"CanonName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.CanonName = s
return nil
},
}
</s> add | return nil
}
err = l.flushToFile(flushBuffer)
return err
}
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
|
err = l.flushToFile(flushBuffer)
if err != nil {
log.Error("querylog: writing to file: %s", err)
return err
}
return nil
}
// flushToFile saves the specified log entries to the query log file
func (l *queryLog) flushToFile(buffer []*logEntry) (err error) {
if len(buffer) == 0 {
| </s> remove if err != nil {
log.Error("querylog: writing to file: %s", err)
</s> add </s> remove if !needFlush {
return nil
}
</s> add </s> remove l.confMu.RLock()
defer l.confMu.RUnlock()
</s> add var rotationIvl time.Duration
func() {
l.confMu.RLock()
defer l.confMu.RUnlock()
rotationIvl = l.conf.RotationIvl
}() </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { | return errors.Annotate(err, "writing to file: %w") | err = l.flushToFile(flushBuffer)
if err != nil {
log.Error("querylog: writing to file: %s", err)
return errors.Annotate(err, "writing to file: %w")
return errors.Annotate(err, "writing to file: %w")
return errors.Annotate(err, "writing to file: %w")
return errors.Annotate(err, "writing to file: %w")
}
// flushToFile saves the specified log entries to the query log file
func (l *queryLog) flushToFile(buffer []*logEntry) (err error) {
if len(buffer) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
// checkAndRotate rotates log files if those are older than the specified
// rotation interval.
func (l *queryLog) checkAndRotate() {
l.confMu.RLock()
defer l.confMu.RUnlock()
oldest, err := l.readFileFirstTimeValue()
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Error("querylog: reading oldest record for rotation: %s", err)
| </s> remove _ = l.flushLogBuffer(true)
</s> add l.confMu.RLock()
defer l.confMu.RUnlock()
if l.conf.FileEnabled {
err := l.flushLogBuffer()
if err != nil {
log.Error("querylog: closing: %s", err)
}
} </s> remove return err
}
return nil
</s> add return errors.Annotate(err, "writing to file: %w") </s> remove if !l.conf.Enabled {
</s> add 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 { </s> remove if params.Answer != nil {
var a []byte
a, err = params.Answer.Pack()
if err != nil {
log.Error("querylog: Answer.Pack(): %s", err)
return
}
entry.Answer = a
}
if params.OrigAnswer != nil {
var a []byte
a, err = params.OrigAnswer.Pack()
if err != nil {
log.Error("querylog: OrigAnswer.Pack(): %s", err)
return
}
entry.OrigAnswer = a
}
</s> add entry.addResponse(params.Answer, false)
entry.addResponse(params.OrigAnswer, true) | var rotationIvl time.Duration
func() {
l.confMu.RLock()
defer l.confMu.RUnlock()
rotationIvl = l.conf.RotationIvl
}() |
// checkAndRotate rotates log files if those are older than the specified
// rotation interval.
func (l *queryLog) checkAndRotate() {
var rotationIvl time.Duration
func() {
l.confMu.RLock()
defer l.confMu.RUnlock()
rotationIvl = l.conf.RotationIvl
}()
var rotationIvl time.Duration
func() {
l.confMu.RLock()
defer l.confMu.RUnlock()
rotationIvl = l.conf.RotationIvl
}()
oldest, err := l.readFileFirstTimeValue()
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Error("querylog: reading oldest record for rotation: %s", err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
return
}
if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) {
log.Debug(
"querylog: %s <= %s, not rotating",
now.Format(time.RFC3339),
rot.Format(time.RFC3339),
)
| </s> remove rot.Format(time.RFC3339),
</s> add rotTime.Format(time.RFC3339), </s> remove // if buffer needs to be flushed to disk, do it now
</s> add </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove var resultHandlers = map[string]logEntryHandler{
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(bool)
if !ok {
return nil
}
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].Text = s
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
n, ok := t.(json.Number)
if !ok {
return nil
}
i, err := n.Int64()
if err != nil {
return err
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].FilterListID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.Reason = filtering.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = s
return nil
},
"CanonName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.CanonName = s
return nil
},
}
</s> add | if rotTime, now := oldest.Add(rotationIvl), time.Now(); rotTime.After(now) { |
return
}
if rotTime, now := oldest.Add(rotationIvl), time.Now(); rotTime.After(now) {
log.Debug(
"querylog: %s <= %s, not rotating",
now.Format(time.RFC3339),
rot.Format(time.RFC3339),
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) {
log.Debug(
"querylog: %s <= %s, not rotating",
now.Format(time.RFC3339),
rot.Format(time.RFC3339),
)
return
}
| </s> remove if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) {
</s> add if rotTime, now := oldest.Add(rotationIvl), time.Now(); rotTime.After(now) { </s> remove // if buffer needs to be flushed to disk, do it now
</s> add </s> remove _ = l.flushLogBuffer(false)
</s> add flushErr := l.flushLogBuffer()
if flushErr != nil {
log.Error("querylog: flushing after adding: %s", err)
} </s> remove func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
if !l.conf.FileEnabled {
return nil
}
</s> add func (l *queryLog) flushLogBuffer() (err error) { </s> remove var resultHandlers = map[string]logEntryHandler{
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(bool)
if !ok {
return nil
}
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].Text = s
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
n, ok := t.(json.Number)
if !ok {
return nil
}
i, err := n.Int64()
if err != nil {
return err
}
l := len(ent.Result.Rules)
if l == 0 {
ent.Result.Rules = []*filtering.ResultRule{{}}
l++
}
ent.Result.Rules[l-1].FilterListID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.Reason = filtering.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = s
return nil
},
"CanonName": func(t json.Token, ent *logEntry) error {
s, ok := t.(string)
if !ok {
return nil
}
ent.Result.CanonName = s
return nil
},
}
</s> add | rotTime.Format(time.RFC3339), | if rot, now := oldest.Add(l.conf.RotationIvl), time.Now(); rot.After(now) {
log.Debug(
"querylog: %s <= %s, not rotating",
now.Format(time.RFC3339),
rotTime.Format(time.RFC3339),
)
return
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races | https://github.com/AdguardTeam/AdGuardHome/commit/2a0d06294734ba87549c8e13dfb7463706af90db | internal/querylog/querylogfile.go |
//go:build !(linux || darwin || freebsd || openbsd)
// +build !linux,!darwin,!freebsd,!openbsd
package aghnet
import (
"io"
| </s> remove if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
</s> add 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) </s> remove var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
</s> add tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) </s> remove vr.CanAutoUpdate = &canUpdate
</s> add | //go:build windows
// +build windows | //go:build windows
// +build windows
//go:build windows
// +build windows
package aghnet
import (
"io" | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/aghnet/net_windows.go |
)
func ifaceHasStaticIP(string) (ok bool, err error) {
return false, aghos.Unsupported("checking static ip")
}
func ifaceSetStaticIP(string) (err error) {
return aghos.Unsupported("setting static ip")
| </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} </s> remove // TODO(a.garipov): Figure out the purpose of %T verb.
aghhttp.Error(
r,
w,
http.StatusBadGateway,
"Couldn't get version check json from %s: %T %s\n",
vcu,
err,
err,
)
</s> add | func canBindPrivilegedPorts() (can bool, err error) {
return true, nil
}
| )
func canBindPrivilegedPorts() (can bool, err error) {
return true, nil
}
func ifaceHasStaticIP(string) (ok bool, err error) {
return false, aghos.Unsupported("checking static ip")
}
func ifaceSetStaticIP(string) (err error) {
return aghos.Unsupported("setting static ip") | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/aghnet/net_windows.go |
"context"
"encoding/json"
"net/http"
"os"
"os/exec"
"path/filepath"
"runtime"
| </s> remove CanAutoUpdate *bool `json:"can_autoupdate,omitempty"`
</s> add </s> remove // w.Header().Set("Content-Type", "application/json")
</s> add | "fmt" | "context"
"encoding/json"
"fmt"
"net/http"
"os"
"os/exec"
"path/filepath"
"runtime" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
// Get the latest available version from the Internet
func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) {
resp := &versionResponse{}
if Context.disableUpdate {
resp.Disabled = true
err := json.NewEncoder(w).Encode(resp)
| </s> remove // w.Header().Set("Content-Type", "application/json")
</s> add </s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove _ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
</s> add err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
</s> remove // TODO(a.garipov): Figure out the purpose of %T verb.
aghhttp.Error(
r,
w,
http.StatusBadGateway,
"Couldn't get version check json from %s: %T %s\n",
vcu,
err,
err,
)
</s> add | w.Header().Set("Content-Type", "application/json")
|
// Get the latest available version from the Internet
func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
resp := &versionResponse{}
if Context.disableUpdate {
resp.Disabled = true
err := json.NewEncoder(w).Encode(resp) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
// Get the latest available version from the Internet
func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) {
resp := &versionResponse{}
if Context.disableUpdate {
// w.Header().Set("Content-Type", "application/json")
resp.Disabled = true
_ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
return
}
| </s> remove _ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
</s> add err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
</s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove vr.CanAutoUpdate = &canUpdate
</s> add | // Get the latest available version from the Internet
func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) {
resp := &versionResponse{}
if Context.disableUpdate {
resp.Disabled = true
_ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
|
resp := &versionResponse{}
if Context.disableUpdate {
// w.Header().Set("Content-Type", "application/json")
resp.Disabled = true
_ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
return
}
req := &struct {
Recheck bool `json:"recheck_now"`
| </s> remove // w.Header().Set("Content-Type", "application/json")
</s> add </s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} </s> remove vr.CanAutoUpdate = &canUpdate
</s> add | err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
| resp := &versionResponse{}
if Context.disableUpdate {
// w.Header().Set("Content-Type", "application/json")
resp.Disabled = true
err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
return
}
req := &struct {
Recheck bool `json:"recheck_now"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
var err error
if r.ContentLength != 0 {
err = json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "JSON parse: %s", err)
return
}
}
| </s> remove resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
</s> add 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 body: %s", err)
}
} </s> remove _ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
</s> add err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
</s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove for i := 0; i != 3; i++ {
func() {
Context.controlLock.Lock()
defer Context.controlLock.Unlock()
</s> add 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
} </s> remove if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
</s> add 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) | aghhttp.Error(r, w, http.StatusBadRequest, "parsing request: %s", err) | var err error
if r.ContentLength != 0 {
err = json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "parsing request: %s", err)
return
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
return
}
}
for i := 0; i != 3; i++ {
func() {
Context.controlLock.Lock()
defer Context.controlLock.Unlock()
resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
if err != nil {
| </s> remove resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
</s> add 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 body: %s", err)
}
} </s> remove aghhttp.Error(r, w, http.StatusBadRequest, "JSON parse: %s", err)
</s> add aghhttp.Error(r, w, http.StatusBadRequest, "parsing request: %s", err) </s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
</s> add 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) | 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
} | return
}
}
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
}
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
}
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
}
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
}
resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
func() {
Context.controlLock.Lock()
defer Context.controlLock.Unlock()
resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
if err != nil {
var terr temporaryError
if errors.As(err, &terr) && terr.Temporary() {
// Temporary network error. This case may happen while
| </s> remove // Temporary network error. This case may happen while
// we're restarting our DNS server. Log and sleep for
// some time.
</s> add // Temporary network error. This case may happen while we're
// restarting our DNS server. Log and sleep for some time. </s> remove for i := 0; i != 3; i++ {
func() {
Context.controlLock.Lock()
defer Context.controlLock.Unlock()
</s> add 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
} </s> remove var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
</s> add tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} | 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 body: %s", err)
}
} | func() {
Context.controlLock.Lock()
defer Context.controlLock.Unlock()
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 body: %s", err)
}
}
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 body: %s", err)
}
}
if err != nil {
var terr temporaryError
if errors.As(err, &terr) && terr.Temporary() {
// Temporary network error. This case may happen while | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
}
}
if err != nil {
var terr temporaryError
if errors.As(err, &terr) && terr.Temporary() {
// Temporary network error. This case may happen while we're
| </s> remove // Temporary network error. This case may happen while
// we're restarting our DNS server. Log and sleep for
// some time.
</s> add // Temporary network error. This case may happen while we're
// restarting our DNS server. Log and sleep for some time. </s> remove resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
</s> add 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 body: %s", err)
}
} </s> remove var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
</s> add tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} </s> remove aghhttp.Error(r, w, http.StatusBadRequest, "JSON parse: %s", err)
</s> add aghhttp.Error(r, w, http.StatusBadRequest, "parsing request: %s", err) | // 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) | }
}
// 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)
if err != nil {
var terr temporaryError
if errors.As(err, &terr) && terr.Temporary() {
// Temporary network error. This case may happen while we're | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
if err != nil {
var terr temporaryError
if errors.As(err, &terr) && terr.Temporary() {
// Temporary network error. This case may happen while
// we're restarting our DNS server. Log and sleep for
// some time.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/934.
d := time.Duration(i) * time.Second
log.Info("temp net error: %q; sleeping for %s and retrying", err, d)
time.Sleep(d)
| </s> remove log.Info("temp net error: %q; sleeping for %s and retrying", err, d)
</s> add log.Info("update: temp net error: %q; sleeping for %s and retrying", err, d) </s> remove resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
</s> add 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 body: %s", err)
}
} </s> remove _ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
</s> add err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
</s> remove // w.Header().Set("Content-Type", "application/json")
</s> add | // Temporary network error. This case may happen while we're
// restarting our DNS server. Log and sleep for some time. |
if err != nil {
var terr temporaryError
if errors.As(err, &terr) && terr.Temporary() {
// Temporary network error. This case may happen while we're
// restarting our DNS server. Log and sleep for some time.
// Temporary network error. This case may happen while we're
// restarting our DNS server. Log and sleep for some time.
// Temporary network error. This case may happen while we're
// restarting our DNS server. Log and sleep for some time.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/934.
d := time.Duration(i) * time.Second
log.Info("temp net error: %q; sleeping for %s and retrying", err, d)
time.Sleep(d) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
// some time.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/934.
d := time.Duration(i) * time.Second
log.Info("temp net error: %q; sleeping for %s and retrying", err, d)
time.Sleep(d)
continue
}
}
| </s> remove // Temporary network error. This case may happen while
// we're restarting our DNS server. Log and sleep for
// some time.
</s> add // Temporary network error. This case may happen while we're
// restarting our DNS server. Log and sleep for some time. </s> remove // TODO(a.garipov): Figure out the purpose of %T verb.
aghhttp.Error(
r,
w,
http.StatusBadGateway,
"Couldn't get version check json from %s: %T %s\n",
vcu,
err,
err,
)
</s> add </s> remove Disabled bool `json:"disabled"`
</s> add </s> remove // w.Header().Set("Content-Type", "application/json")
</s> add </s> remove _ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
</s> add err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
| log.Info("update: temp net error: %q; sleeping for %s and retrying", err, d) | // some time.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/934.
d := time.Duration(i) * time.Second
log.Info("update: temp net error: %q; sleeping for %s and retrying", err, d)
time.Sleep(d)
continue
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
break
}
if err != nil {
vcu := Context.updater.VersionCheckURL()
// TODO(a.garipov): Figure out the purpose of %T verb.
aghhttp.Error(
r,
w,
http.StatusBadGateway,
"Couldn't get version check json from %s: %T %s\n",
vcu,
err,
err,
)
return
}
resp.confirmAutoUpdate()
| </s> remove return
</s> add return fmt.Errorf("getting version info from %s: %s", vcu, err) </s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove for i := 0; i != 3; i++ {
func() {
Context.controlLock.Lock()
defer Context.controlLock.Unlock()
</s> add 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
} </s> remove log.Info("temp net error: %q; sleeping for %s and retrying", err, d)
</s> add log.Info("update: temp net error: %q; sleeping for %s and retrying", err, d) </s> remove // w.Header().Set("Content-Type", "application/json")
</s> add | break
}
if err != nil {
vcu := Context.updater.VersionCheckURL()
return
}
resp.confirmAutoUpdate() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
|
err,
err,
)
return
}
resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
| </s> remove // TODO(a.garipov): Figure out the purpose of %T verb.
aghhttp.Error(
r,
w,
http.StatusBadGateway,
"Couldn't get version check json from %s: %T %s\n",
vcu,
err,
err,
)
</s> add </s> remove log.Info("temp net error: %q; sleeping for %s and retrying", err, d)
</s> add log.Info("update: temp net error: %q; sleeping for %s and retrying", err, d) </s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove // w.Header().Set("Content-Type", "application/json")
</s> add </s> remove _ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
</s> add err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
| return fmt.Errorf("getting version info from %s: %s", vcu, err) | err,
err,
)
return fmt.Errorf("getting version info from %s: %s", vcu, err)
}
resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
return
}
resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
}
// handleUpdate performs an update to the latest available version procedure.
func handleUpdate(w http.ResponseWriter, r *http.Request) {
if Context.updater.NewVersion() == "" {
| </s> remove // w.Header().Set("Content-Type", "application/json")
</s> add </s> remove _ = json.NewEncoder(w).Encode(resp)
// TODO(e.burkov): Add error handling and deal with headers.
</s> add err := json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "writing body: %s", err)
}
</s> remove resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
</s> add 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 body: %s", err)
}
} </s> remove aghhttp.Error(r, w, http.StatusBadRequest, "JSON parse: %s", err)
</s> add aghhttp.Error(r, w, http.StatusBadRequest, "parsing request: %s", err) | return nil |
return
}
return nil
return nil
return nil
return nil
return nil
return nil
return nil
}
// handleUpdate performs an update to the latest available version procedure.
func handleUpdate(w http.ResponseWriter, r *http.Request) {
if Context.updater.NewVersion() == "" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
}
// versionResponse is the response for /control/version.json endpoint.
type versionResponse struct {
Disabled bool `json:"disabled"`
updater.VersionInfo
}
// confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
| </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} </s> remove var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
</s> add tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) | }
// versionResponse is the response for /control/version.json endpoint.
type versionResponse struct {
updater.VersionInfo
}
// confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
|
type versionResponse struct {
updater.VersionInfo
}
// 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 {
| </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} </s> remove Disabled bool `json:"disabled"`
</s> add </s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil | Disabled bool `json:"disabled"` | type versionResponse struct {
updater.VersionInfo
Disabled bool `json:"disabled"`
}
// 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 { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
Disabled bool `json:"disabled"`
updater.VersionInfo
}
// confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
| </s> remove var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
</s> add tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) </s> remove Disabled bool `json:"disabled"`
</s> add </s> remove if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
</s> add 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) | // 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
} | Disabled bool `json:"disabled"`
updater.VersionInfo
}
// 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
}
// 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
}
// 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
}
// 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
}
var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
| </s> remove if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
</s> add 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) </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} </s> remove vr.CanAutoUpdate = &canUpdate
</s> add | tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) | func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) || | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
}
vr.CanAutoUpdate = &canUpdate
}
}
| </s> remove var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
</s> add tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) </s> remove vr.CanAutoUpdate = &canUpdate
</s> add </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} </s> remove resp.VersionInfo, err = Context.updater.VersionInfo(req.Recheck)
}()
</s> add 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 body: %s", err)
}
} | 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) | tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
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)
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)
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)
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)
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)
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)
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)
}
vr.CanAutoUpdate = &canUpdate
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
}
vr.CanAutoUpdate = &canUpdate
}
}
// finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) {
| </s> remove if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
</s> add 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) </s> remove var tlsConf *tlsConfigSettings
if runtime.GOOS != "windows" {
tlsConf = &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf)
}
</s> add tlsConf := &tlsConfigSettings{}
Context.tls.WriteDiskConfig(tlsConf) </s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} | config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
}
}
}
// finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
|
return fmt.Errorf("checking ability to bind privileged ports: %w", err)
}
}
}
// finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) {
log.Info("Stopping all tasks")
cleanup(ctx)
| </s> remove vr.CanAutoUpdate = &canUpdate
</s> add </s> remove if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
</s> add 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) </s> remove resp.confirmAutoUpdate()
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add return nil </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} | 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.PortDNSOverQUIC < 1024) | return fmt.Errorf("checking ability to bind privileged ports: %w", err)
}
}
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.PortDNSOverQUIC < 1024)
}
// finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) {
log.Info("Stopping all tasks")
cleanup(ctx) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/home/controlupdate.go |
const versionCheckPeriod = 8 * time.Hour
// VersionInfo contains information about a new version.
type VersionInfo struct {
NewVersion string `json:"new_version,omitempty"`
Announcement string `json:"announcement,omitempty"`
AnnouncementURL string `json:"announcement_url,omitempty"`
SelfUpdateMinVersion string `json:"-"`
| </s> remove CanAutoUpdate *bool `json:"can_autoupdate,omitempty"`
</s> add </s> remove Disabled bool `json:"disabled"`
</s> add </s> remove // Temporary network error. This case may happen while
// we're restarting our DNS server. Log and sleep for
// some time.
</s> add // Temporary network error. This case may happen while we're
// restarting our DNS server. Log and sleep for some time. | CanAutoUpdate *bool `json:"can_autoupdate,omitempty"` | const versionCheckPeriod = 8 * time.Hour
// VersionInfo contains information about a new version.
type VersionInfo struct {
CanAutoUpdate *bool `json:"can_autoupdate,omitempty"`
NewVersion string `json:"new_version,omitempty"`
Announcement string `json:"announcement,omitempty"`
AnnouncementURL string `json:"announcement_url,omitempty"`
SelfUpdateMinVersion string `json:"-"` | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/updater/check.go |
NewVersion string `json:"new_version,omitempty"`
Announcement string `json:"announcement,omitempty"`
AnnouncementURL string `json:"announcement_url,omitempty"`
SelfUpdateMinVersion string `json:"-"`
CanAutoUpdate *bool `json:"can_autoupdate,omitempty"`
}
// MaxResponseSize is responses on server's requests maximum length in bytes.
const MaxResponseSize = 64 * 1024
| </s> remove // confirmAutoUpdate checks the real possibility of auto update.
func (vr *versionResponse) confirmAutoUpdate() {
if vr.CanAutoUpdate != nil && *vr.CanAutoUpdate {
canUpdate := true
</s> add // 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
} </s> remove vr.CanAutoUpdate = &canUpdate
</s> add </s> remove if tlsConf != nil &&
((tlsConf.Enabled && (tlsConf.PortHTTPS < 1024 ||
tlsConf.PortDNSOverTLS < 1024 ||
tlsConf.PortDNSOverQUIC < 1024)) ||
config.BindPort < 1024 ||
config.DNS.Port < 1024) {
canUpdate, _ = aghnet.CanBindPrivilegedPorts()
</s> add 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) | NewVersion string `json:"new_version,omitempty"`
Announcement string `json:"announcement,omitempty"`
AnnouncementURL string `json:"announcement_url,omitempty"`
SelfUpdateMinVersion string `json:"-"`
}
// MaxResponseSize is responses on server's requests maximum length in bytes.
const MaxResponseSize = 64 * 1024
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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:
commit 6d70472506dd0fd69225454c73d9f7f6a208b76b
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 25 17:26:54 2022 +0300
home: rm unnecessary locking in update; refactor | https://github.com/AdguardTeam/AdGuardHome/commit/2a1ad532f454ed2ab25d19eaf168ba9f6d534f2f | internal/updater/check.go |
|
};
export const dnsStatusRequest = createAction('DNS_STATUS_REQUEST');
export const dnsStatusFailure = createAction('DNS_STATUS_FAILURE');
export const dnsStatusSuccess = createAction('DNS_STATUS_SUCCESS');
export const getDnsStatus = () => async (dispatch) => {
dispatch(dnsStatusRequest());
| </s> | 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 {
const profile = await apiClient.getProfile();
dispatch(getProfileSuccess(profile));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getProfileFailure());
}
};
| };
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 {
const profile = await apiClient.getProfile();
dispatch(getProfileSuccess(profile));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getProfileFailure());
}
};
export const dnsStatusRequest = createAction('DNS_STATUS_REQUEST');
export const dnsStatusFailure = createAction('DNS_STATUS_FAILURE');
export const dnsStatusSuccess = createAction('DNS_STATUS_SUCCESS');
export const getDnsStatus = () => async (dispatch) => {
dispatch(dnsStatusRequest()); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: get profile info | https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62 | client/src/actions/index.js |
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(dnsStatusSuccess(dnsStatus));
dispatch(getVersion());
dispatch(getTlsStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(dnsStatusFailure());
}
| </s> remove <a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
</s> add {!dashboard.processingProfile && dashboard.name &&
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
} | dispatch(getProfile()); | const dnsStatus = await apiClient.getGlobalStatus();
dispatch(dnsStatusSuccess(dnsStatus));
dispatch(getVersion());
dispatch(getTlsStatus());
dispatch(getProfile());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(dnsStatusFailure());
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + client: get profile info | https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62 | client/src/actions/index.js |
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
}
const apiClient = new Api();
export default apiClient;
| </s> remove <a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
</s> add {!dashboard.processingProfile && dashboard.name &&
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
} | // Profile
GET_PROFILE = { path: 'profile', method: 'GET' };
getProfile() {
const { path, method } = this.GET_PROFILE;
return this.makeRequest(path, method);
} | headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
// Profile
GET_PROFILE = { path: 'profile', method: 'GET' };
getProfile() {
const { path, method } = this.GET_PROFILE;
return this.makeRequest(path, method);
}
}
const apiClient = new Api();
export default apiClient; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + client: get profile info | https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62 | client/src/api/Api.js |
closeMenu={this.closeMenu}
/>
<div className="header__column">
<div className="header__right">
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
</div>
</div>
</div>
</div>
</div>
| </s> | {!dashboard.processingProfile && dashboard.name &&
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
} | closeMenu={this.closeMenu}
/>
<div className="header__column">
<div className="header__right">
{!dashboard.processingProfile && dashboard.name &&
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
}
{!dashboard.processingProfile && dashboard.name &&
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
}
{!dashboard.processingProfile && dashboard.name &&
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
}
</div>
</div>
</div>
</div>
</div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: get profile info | https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62 | client/src/components/Header/index.js |
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
},
{
processing: true,
isCoreRunning: false,
processingVersion: true,
| </s> remove <a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
</s> add {!dashboard.processingProfile && dashboard.name &&
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
} | [actions.getProfileRequest]: state => ({ ...state, processingProfile: true }),
[actions.getProfileFailure]: state => ({ ...state, processingProfile: false }),
[actions.getProfileSuccess]: (state, { payload }) => ({
...state,
name: payload.name,
processingProfile: false,
}), | bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
[actions.getProfileRequest]: state => ({ ...state, processingProfile: true }),
[actions.getProfileFailure]: state => ({ ...state, processingProfile: false }),
[actions.getProfileSuccess]: (state, { payload }) => ({
...state,
name: payload.name,
processingProfile: false,
}),
},
{
processing: true,
isCoreRunning: false,
processingVersion: true, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: get profile info | https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62 | client/src/reducers/index.js |
processingUpdate: false,
processingDnsSettings: true,
upstreamDns: '',
bootstrapDns: '',
allServers: false,
protectionEnabled: false,
processingProtection: false,
httpPort: 80,
| </s> remove <a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
</s> add {!dashboard.processingProfile && dashboard.name &&
<a href="/control/logout" className="btn btn-sm btn-outline-secondary">
<Trans>sign_out</Trans>
</a>
} | processingProfile: true, | processingUpdate: false,
processingDnsSettings: true,
processingProfile: true,
upstreamDns: '',
bootstrapDns: '',
allServers: false,
protectionEnabled: false,
processingProtection: false,
httpPort: 80, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: get profile info | https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62 | client/src/reducers/index.js |
dnsAddresses: [],
dnsVersion: '',
clients: [],
autoClients: [],
},
);
const dhcp = handleActions(
{
| </s> | name: '', | dnsAddresses: [],
dnsVersion: '',
clients: [],
autoClients: [],
name: '',
},
);
const dhcp = handleActions(
{ | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: get profile info | https://github.com/AdguardTeam/AdGuardHome/commit/2a2647dc3f4fa69dc1cab755607193df3fc19f62 | client/src/reducers/index.js |
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
| </s> remove // check if error is "address already in use"
</s> add // ErrorIsAddrInUse - check if error is "address already in use" </s> remove // Get interface name by its IP address.
</s> add // GetInterfaceByIP - Get interface name by its IP address. </s> remove // Get IP address with netmask for the specified interface
</s> add // GetSubnet - Get IP address with netmask for the specified interface </s> remove // checkPortAvailable is not a cheap test to see if the port is bindable, because it's actually doing the bind momentarily
</s> add // CheckPortAvailable - check if TCP port is available </s> remove // getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
</s> add // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only |
netIfaces := []net.Interface{}
for i := range ifaces {
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * GetValidNetInterfaces: don't skip PointToPoint interfaces | https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109 | util/network_utils.go |
|
return netIfaces, nil
}
// getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
// we do not return link-local addresses here
func GetValidNetInterfacesForWeb() ([]NetInterface, error) {
ifaces, err := GetValidNetInterfaces()
if err != nil {
return nil, errorx.Decorate(err, "Couldn't get interfaces")
| </s> remove // Get IP address with netmask for the specified interface
</s> add // GetSubnet - Get IP address with netmask for the specified interface </s> remove // Get interface name by its IP address.
</s> add // GetInterfaceByIP - Get interface name by its IP address. </s> remove // checkPortAvailable is not a cheap test to see if the port is bindable, because it's actually doing the bind momentarily
</s> add // CheckPortAvailable - check if TCP port is available </s> remove // check if error is "address already in use"
</s> add // ErrorIsAddrInUse - check if error is "address already in use" | // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only |
return netIfaces, nil
}
// GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only
// we do not return link-local addresses here
func GetValidNetInterfacesForWeb() ([]NetInterface, error) {
ifaces, err := GetValidNetInterfaces()
if err != nil {
return nil, errorx.Decorate(err, "Couldn't get interfaces") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * GetValidNetInterfaces: don't skip PointToPoint interfaces | https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109 | util/network_utils.go |
return netInterfaces, nil
}
// Get interface name by its IP address.
func GetInterfaceByIP(ip string) string {
ifaces, err := GetValidNetInterfacesForWeb()
if err != nil {
return ""
}
| </s> remove // Get IP address with netmask for the specified interface
</s> add // GetSubnet - Get IP address with netmask for the specified interface </s> remove // getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
</s> add // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only </s> remove // checkPortAvailable is not a cheap test to see if the port is bindable, because it's actually doing the bind momentarily
</s> add // CheckPortAvailable - check if TCP port is available </s> remove if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
</s> add | // GetInterfaceByIP - Get interface name by its IP address. |
return netInterfaces, nil
}
// GetInterfaceByIP - Get interface name by its IP address.
func GetInterfaceByIP(ip string) string {
ifaces, err := GetValidNetInterfacesForWeb()
if err != nil {
return ""
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * GetValidNetInterfaces: don't skip PointToPoint interfaces | https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109 | util/network_utils.go |
return ""
}
// Get IP address with netmask for the specified interface
// Returns an empty string if it fails to find it
func GetSubnet(ifaceName string) string {
netIfaces, err := GetValidNetInterfacesForWeb()
if err != nil {
log.Error("Could not get network interfaces info: %v", err)
| </s> remove // Get interface name by its IP address.
</s> add // GetInterfaceByIP - Get interface name by its IP address. </s> remove // getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
</s> add // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only </s> remove // checkPortAvailable is not a cheap test to see if the port is bindable, because it's actually doing the bind momentarily
</s> add // CheckPortAvailable - check if TCP port is available </s> remove if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
</s> add | // GetSubnet - Get IP address with netmask for the specified interface |
return ""
}
// GetSubnet - Get IP address with netmask for the specified interface
// Returns an empty string if it fails to find it
func GetSubnet(ifaceName string) string {
netIfaces, err := GetValidNetInterfacesForWeb()
if err != nil {
log.Error("Could not get network interfaces info: %v", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * GetValidNetInterfaces: don't skip PointToPoint interfaces | https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109 | util/network_utils.go |
return ""
}
// checkPortAvailable is not a cheap test to see if the port is bindable, because it's actually doing the bind momentarily
func CheckPortAvailable(host string, port int) error {
ln, err := net.Listen("tcp", net.JoinHostPort(host, strconv.Itoa(port)))
if err != nil {
return err
}
| </s> remove // Get IP address with netmask for the specified interface
</s> add // GetSubnet - Get IP address with netmask for the specified interface </s> remove // check if error is "address already in use"
</s> add // ErrorIsAddrInUse - check if error is "address already in use" </s> remove // Get interface name by its IP address.
</s> add // GetInterfaceByIP - Get interface name by its IP address. </s> remove // getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
</s> add // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only | // CheckPortAvailable - check if TCP port is available |
return ""
}
// CheckPortAvailable - check if TCP port is available
func CheckPortAvailable(host string, port int) error {
ln, err := net.Listen("tcp", net.JoinHostPort(host, strconv.Itoa(port)))
if err != nil {
return err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * GetValidNetInterfaces: don't skip PointToPoint interfaces | https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109 | util/network_utils.go |
}
func CheckPacketPortAvailable(host string, port int) error {
ln, err := net.ListenPacket("udp", net.JoinHostPort(host, strconv.Itoa(port)))
if err != nil {
return err
| </s> remove // checkPortAvailable is not a cheap test to see if the port is bindable, because it's actually doing the bind momentarily
</s> add // CheckPortAvailable - check if TCP port is available </s> remove // Get interface name by its IP address.
</s> add // GetInterfaceByIP - Get interface name by its IP address. </s> remove // check if error is "address already in use"
</s> add // ErrorIsAddrInUse - check if error is "address already in use" </s> remove // getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
</s> add // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only </s> remove // Get IP address with netmask for the specified interface
</s> add // GetSubnet - Get IP address with netmask for the specified interface | // CheckPacketPortAvailable - check if UDP port is available | }
// CheckPacketPortAvailable - check if UDP port is available
func CheckPacketPortAvailable(host string, port int) error {
ln, err := net.ListenPacket("udp", net.JoinHostPort(host, strconv.Itoa(port)))
if err != nil {
return err | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | * GetValidNetInterfaces: don't skip PointToPoint interfaces | https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109 | util/network_utils.go |
time.Sleep(100 * time.Millisecond)
return err
}
// check if error is "address already in use"
func ErrorIsAddrInUse(err error) bool {
errOpError, ok := err.(*net.OpError)
if !ok {
return false
}
| </s> remove // checkPortAvailable is not a cheap test to see if the port is bindable, because it's actually doing the bind momentarily
</s> add // CheckPortAvailable - check if TCP port is available </s> remove if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
</s> add </s> remove // getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
</s> add // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only </s> remove // Get interface name by its IP address.
</s> add // GetInterfaceByIP - Get interface name by its IP address. | // ErrorIsAddrInUse - check if error is "address already in use" | time.Sleep(100 * time.Millisecond)
return err
}
// ErrorIsAddrInUse - check if error is "address already in use"
func ErrorIsAddrInUse(err error) bool {
errOpError, ok := err.(*net.OpError)
if !ok {
return false
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * GetValidNetInterfaces: don't skip PointToPoint interfaces | https://github.com/AdguardTeam/AdGuardHome/commit/2b1919137d88902d0cfc0cc8f480274e18b2d109 | util/network_utils.go |
"example_comment_meaning": "hanya sebuah komentar;",
"example_comment_hash": "# Juga sebuah komentar.",
"example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan.",
"example_upstream_regular": "DNS reguler (melalui UDP);",
"example_upstream_udp": "DNS biasa (lebih dari UDP, nama host);",
"example_upstream_dot": "terenkripsi <0>DNS-over-TLS</0>;",
"example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>;",
"example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>;",
| </s> remove "dns_allowlists": "DNS toestemmingslijsten",
</s> add "dns_allowlists": "DNS-toelatingslijsten", </s> remove "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
</s> add "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.", | "example_upstream_regular_port": "DNS biasa (lebih dari UDP, dengan port);", | "example_comment_meaning": "hanya sebuah komentar;",
"example_comment_hash": "# Juga sebuah komentar.",
"example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan.",
"example_upstream_regular": "DNS reguler (melalui UDP);",
"example_upstream_regular_port": "DNS biasa (lebih dari UDP, dengan port);",
"example_upstream_udp": "DNS biasa (lebih dari UDP, nama host);",
"example_upstream_dot": "terenkripsi <0>DNS-over-TLS</0>;",
"example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>;",
"example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>;", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/id.json |
"example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>;",
"example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>;",
"example_upstream_sdns": "<0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>;",
"example_upstream_tcp": "DNS reguler (melalui TCP);",
"example_upstream_tcp_hostname": "DNS biasa (lebih dari TCP, nama host);",
"all_lists_up_to_date_toast": "Semua daftar sudah diperbarui",
"updated_upstream_dns_toast": "Server upstream berhasil disimpan",
"dns_test_ok_toast": "Server DNS yang ditentukan bekerja dengan benar",
"dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
"dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik",
| </s> remove "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
</s> add "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.", | "example_upstream_tcp_port": "DNS biasa (melalui TCP, dengan port);", | "example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>;",
"example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>;",
"example_upstream_sdns": "<0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>;",
"example_upstream_tcp": "DNS reguler (melalui TCP);",
"example_upstream_tcp_port": "DNS biasa (melalui TCP, dengan port);",
"example_upstream_tcp_hostname": "DNS biasa (lebih dari TCP, nama host);",
"all_lists_up_to_date_toast": "Semua daftar sudah diperbarui",
"updated_upstream_dns_toast": "Server upstream berhasil disimpan",
"dns_test_ok_toast": "Server DNS yang ditentukan bekerja dengan benar",
"dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
"dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/id.json |
"example_comment_meaning": "solo un commento;",
"example_comment_hash": "# Anche un commento.",
"example_regex_meaning": "blocca l'accesso ai domini corrispondenti alla specifica espressione regolare.",
"example_upstream_regular": "DNS regolare (over UDP);",
"example_upstream_udp": "DNS regolare (over UDP, nome host);",
"example_upstream_dot": "<0>DNS su TLS</0> crittografato;",
"example_upstream_doh": "<0>DNS su HTTPS</0> crittografato;",
"example_upstream_doq": "<0>DNS su QUIC</0> crittografato;",
| </s> remove "dns_allowlists": "DNS toestemmingslijsten",
</s> add "dns_allowlists": "DNS-toelatingslijsten", | "example_upstream_regular_port": "DNS regolare (su UDP, con porta);", | "example_comment_meaning": "solo un commento;",
"example_comment_hash": "# Anche un commento.",
"example_regex_meaning": "blocca l'accesso ai domini corrispondenti alla specifica espressione regolare.",
"example_upstream_regular": "DNS regolare (over UDP);",
"example_upstream_regular_port": "DNS regolare (su UDP, con porta);",
"example_upstream_udp": "DNS regolare (over UDP, nome host);",
"example_upstream_dot": "<0>DNS su TLS</0> crittografato;",
"example_upstream_doh": "<0>DNS su HTTPS</0> crittografato;",
"example_upstream_doq": "<0>DNS su QUIC</0> crittografato;", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/it.json |
"no_servers_specified": "Geen servers gespecificeerd",
"general_settings": "Algemene instellingen",
"dns_settings": "DNS instellingen",
"dns_blocklists": "DNS blokkeerlijsten",
"dns_allowlists": "DNS toestemmingslijsten",
"dns_blocklists_desc": "AdGuard Home zal domeinen blokkeren die voorkomen in de blokkeerlijsten.",
"dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
"custom_filtering_rules": "Aangepaste filter regels",
"encryption_settings": "Encryptie instellingen",
"dhcp_settings": "DHCP instellingen",
| </s> remove "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
</s> add "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.", </s> remove "no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
</s> add "no_whitelist_added": "Geen toelatingslijsten toegevoegd", </s> remove "add_allowlist": "Toestemmingslijst toevoegen",
</s> add "add_allowlist": "Toelatingslijst toevoegen", </s> remove "choose_allowlist": "Toestemmingslijsten selecteren",
</s> add "choose_allowlist": "Toelatingslijsten selecteren", | "dns_allowlists": "DNS-toelatingslijsten", | "no_servers_specified": "Geen servers gespecificeerd",
"general_settings": "Algemene instellingen",
"dns_settings": "DNS instellingen",
"dns_blocklists": "DNS blokkeerlijsten",
"dns_allowlists": "DNS-toelatingslijsten",
"dns_blocklists_desc": "AdGuard Home zal domeinen blokkeren die voorkomen in de blokkeerlijsten.",
"dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
"custom_filtering_rules": "Aangepaste filter regels",
"encryption_settings": "Encryptie instellingen",
"dhcp_settings": "DHCP instellingen", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"dns_settings": "DNS instellingen",
"dns_blocklists": "DNS blokkeerlijsten",
"dns_allowlists": "DNS toestemmingslijsten",
"dns_blocklists_desc": "AdGuard Home zal domeinen blokkeren die voorkomen in de blokkeerlijsten.",
"dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
"custom_filtering_rules": "Aangepaste filter regels",
"encryption_settings": "Encryptie instellingen",
"dhcp_settings": "DHCP instellingen",
"upstream_dns": "Upstream DNS-servers",
"upstream_dns_help": "Een server-adres per regel invoeren. <a>Meer weten</a> over het configureren van upstream DNS-servers.",
| </s> remove "dns_allowlists": "DNS toestemmingslijsten",
</s> add "dns_allowlists": "DNS-toelatingslijsten", </s> remove "no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
</s> add "no_whitelist_added": "Geen toelatingslijsten toegevoegd", </s> remove "add_allowlist": "Toestemmingslijst toevoegen",
</s> add "add_allowlist": "Toelatingslijst toevoegen", | "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.", | "dns_settings": "DNS instellingen",
"dns_blocklists": "DNS blokkeerlijsten",
"dns_allowlists": "DNS toestemmingslijsten",
"dns_blocklists_desc": "AdGuard Home zal domeinen blokkeren die voorkomen in de blokkeerlijsten.",
"dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.",
"custom_filtering_rules": "Aangepaste filter regels",
"encryption_settings": "Encryptie instellingen",
"dhcp_settings": "DHCP instellingen",
"upstream_dns": "Upstream DNS-servers",
"upstream_dns_help": "Een server-adres per regel invoeren. <a>Meer weten</a> over het configureren van upstream DNS-servers.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"delete_table_action": "Verwijderen",
"elapsed": "Verstreken",
"filters_and_hosts_hint": "AdGuard Home kan overweg met basic adblock regels en hosts bestanden syntaxis.",
"no_blocklist_added": "Geen blokkeerlijsten toegevoegd",
"no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
"add_blocklist": "Blokkeerlijst toevoegen",
"add_allowlist": "Toestemmingslijst toevoegen",
"cancel_btn": "Annuleren",
"enter_name_hint": "Voeg naam toe",
"enter_url_or_path_hint": "Voer een URL in of het pad van de lijst",
| </s> remove "add_allowlist": "Toestemmingslijst toevoegen",
</s> add "add_allowlist": "Toelatingslijst toevoegen", </s> remove "new_allowlist": "Nieuwe toestemmingslijst",
</s> add "new_allowlist": "Nieuwe toelatingslijst", </s> remove "choose_allowlist": "Toestemmingslijsten selecteren",
</s> add "choose_allowlist": "Toelatingslijsten selecteren", </s> remove "dns_allowlists": "DNS toestemmingslijsten",
</s> add "dns_allowlists": "DNS-toelatingslijsten", </s> remove "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
</s> add "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.", | "no_whitelist_added": "Geen toelatingslijsten toegevoegd", | "delete_table_action": "Verwijderen",
"elapsed": "Verstreken",
"filters_and_hosts_hint": "AdGuard Home kan overweg met basic adblock regels en hosts bestanden syntaxis.",
"no_blocklist_added": "Geen blokkeerlijsten toegevoegd",
"no_whitelist_added": "Geen toelatingslijsten toegevoegd",
"add_blocklist": "Blokkeerlijst toevoegen",
"add_allowlist": "Toestemmingslijst toevoegen",
"cancel_btn": "Annuleren",
"enter_name_hint": "Voeg naam toe",
"enter_url_or_path_hint": "Voer een URL in of het pad van de lijst", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"filters_and_hosts_hint": "AdGuard Home kan overweg met basic adblock regels en hosts bestanden syntaxis.",
"no_blocklist_added": "Geen blokkeerlijsten toegevoegd",
"no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
"add_blocklist": "Blokkeerlijst toevoegen",
"add_allowlist": "Toestemmingslijst toevoegen",
"cancel_btn": "Annuleren",
"enter_name_hint": "Voeg naam toe",
"enter_url_or_path_hint": "Voer een URL in of het pad van de lijst",
"check_updates_btn": "Controleer op updates",
"new_blocklist": "Nieuwe blokkeerlijst",
| </s> remove "no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
</s> add "no_whitelist_added": "Geen toelatingslijsten toegevoegd", </s> remove "new_allowlist": "Nieuwe toestemmingslijst",
</s> add "new_allowlist": "Nieuwe toelatingslijst", </s> remove "edit_allowlist": "Toestemmingslijst beheren",
</s> add "edit_allowlist": "Toelatingslijst bewerken", </s> remove "choose_allowlist": "Toestemmingslijsten selecteren",
</s> add "choose_allowlist": "Toelatingslijsten selecteren", </s> remove "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
</s> add "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.", | "add_allowlist": "Toelatingslijst toevoegen", | "filters_and_hosts_hint": "AdGuard Home kan overweg met basic adblock regels en hosts bestanden syntaxis.",
"no_blocklist_added": "Geen blokkeerlijsten toegevoegd",
"no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
"add_blocklist": "Blokkeerlijst toevoegen",
"add_allowlist": "Toelatingslijst toevoegen",
"cancel_btn": "Annuleren",
"enter_name_hint": "Voeg naam toe",
"enter_url_or_path_hint": "Voer een URL in of het pad van de lijst",
"check_updates_btn": "Controleer op updates",
"new_blocklist": "Nieuwe blokkeerlijst", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"enter_name_hint": "Voeg naam toe",
"enter_url_or_path_hint": "Voer een URL in of het pad van de lijst",
"check_updates_btn": "Controleer op updates",
"new_blocklist": "Nieuwe blokkeerlijst",
"new_allowlist": "Nieuwe toestemmingslijst",
"edit_blocklist": "Blokkeerlijst beheren",
"edit_allowlist": "Toestemmingslijst beheren",
"choose_blocklist": "Blokkeringslijsten selecteren",
"choose_allowlist": "Toestemmingslijsten selecteren",
"enter_valid_blocklist": "Voer een geldige URL in voor de blokkeerlijst.",
| </s> remove "edit_allowlist": "Toestemmingslijst beheren",
</s> add "edit_allowlist": "Toelatingslijst bewerken", </s> remove "choose_allowlist": "Toestemmingslijsten selecteren",
</s> add "choose_allowlist": "Toelatingslijsten selecteren", </s> remove "add_allowlist": "Toestemmingslijst toevoegen",
</s> add "add_allowlist": "Toelatingslijst toevoegen", </s> remove "no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
</s> add "no_whitelist_added": "Geen toelatingslijsten toegevoegd", </s> remove "host_whitelisted": "De host staat op de toestemmingslijst",
</s> add "host_whitelisted": "De host staat op de toelatingslijst", | "new_allowlist": "Nieuwe toelatingslijst", | "enter_name_hint": "Voeg naam toe",
"enter_url_or_path_hint": "Voer een URL in of het pad van de lijst",
"check_updates_btn": "Controleer op updates",
"new_blocklist": "Nieuwe blokkeerlijst",
"new_allowlist": "Nieuwe toelatingslijst",
"edit_blocklist": "Blokkeerlijst beheren",
"edit_allowlist": "Toestemmingslijst beheren",
"choose_blocklist": "Blokkeringslijsten selecteren",
"choose_allowlist": "Toestemmingslijsten selecteren",
"enter_valid_blocklist": "Voer een geldige URL in voor de blokkeerlijst.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"check_updates_btn": "Controleer op updates",
"new_blocklist": "Nieuwe blokkeerlijst",
"new_allowlist": "Nieuwe toestemmingslijst",
"edit_blocklist": "Blokkeerlijst beheren",
"edit_allowlist": "Toestemmingslijst beheren",
"choose_blocklist": "Blokkeringslijsten selecteren",
"choose_allowlist": "Toestemmingslijsten selecteren",
"enter_valid_blocklist": "Voer een geldige URL in voor de blokkeerlijst.",
"enter_valid_allowlist": "Voer een geldige URL in voor de toestemmingslijst.",
"form_error_url_format": "Ongeldig URL-opmaak",
| </s> remove "choose_allowlist": "Toestemmingslijsten selecteren",
</s> add "choose_allowlist": "Toelatingslijsten selecteren", </s> remove "new_allowlist": "Nieuwe toestemmingslijst",
</s> add "new_allowlist": "Nieuwe toelatingslijst", </s> remove "add_allowlist": "Toestemmingslijst toevoegen",
</s> add "add_allowlist": "Toelatingslijst toevoegen", </s> remove "host_whitelisted": "De host staat op de toestemmingslijst",
</s> add "host_whitelisted": "De host staat op de toelatingslijst", </s> remove "no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
</s> add "no_whitelist_added": "Geen toelatingslijsten toegevoegd", | "edit_allowlist": "Toelatingslijst bewerken", | "check_updates_btn": "Controleer op updates",
"new_blocklist": "Nieuwe blokkeerlijst",
"new_allowlist": "Nieuwe toestemmingslijst",
"edit_blocklist": "Blokkeerlijst beheren",
"edit_allowlist": "Toelatingslijst bewerken",
"choose_blocklist": "Blokkeringslijsten selecteren",
"choose_allowlist": "Toestemmingslijsten selecteren",
"enter_valid_blocklist": "Voer een geldige URL in voor de blokkeerlijst.",
"enter_valid_allowlist": "Voer een geldige URL in voor de toestemmingslijst.",
"form_error_url_format": "Ongeldig URL-opmaak", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"new_allowlist": "Nieuwe toestemmingslijst",
"edit_blocklist": "Blokkeerlijst beheren",
"edit_allowlist": "Toestemmingslijst beheren",
"choose_blocklist": "Blokkeringslijsten selecteren",
"choose_allowlist": "Toestemmingslijsten selecteren",
"enter_valid_blocklist": "Voer een geldige URL in voor de blokkeerlijst.",
"enter_valid_allowlist": "Voer een geldige URL in voor de toestemmingslijst.",
"form_error_url_format": "Ongeldig URL-opmaak",
"form_error_url_or_path_format": "Ongeldig URL of pad van de lijst",
"custom_filter_rules": "Aangepaste filterregels",
| </s> remove "edit_allowlist": "Toestemmingslijst beheren",
</s> add "edit_allowlist": "Toelatingslijst bewerken", </s> remove "new_allowlist": "Nieuwe toestemmingslijst",
</s> add "new_allowlist": "Nieuwe toelatingslijst", </s> remove "add_allowlist": "Toestemmingslijst toevoegen",
</s> add "add_allowlist": "Toelatingslijst toevoegen", </s> remove "no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
</s> add "no_whitelist_added": "Geen toelatingslijsten toegevoegd", </s> remove "host_whitelisted": "De host staat op de toestemmingslijst",
</s> add "host_whitelisted": "De host staat op de toelatingslijst", | "choose_allowlist": "Toelatingslijsten selecteren", | "new_allowlist": "Nieuwe toestemmingslijst",
"edit_blocklist": "Blokkeerlijst beheren",
"edit_allowlist": "Toestemmingslijst beheren",
"choose_blocklist": "Blokkeringslijsten selecteren",
"choose_allowlist": "Toelatingslijsten selecteren",
"enter_valid_blocklist": "Voer een geldige URL in voor de blokkeerlijst.",
"enter_valid_allowlist": "Voer een geldige URL in voor de toestemmingslijst.",
"form_error_url_format": "Ongeldig URL-opmaak",
"form_error_url_or_path_format": "Ongeldig URL of pad van de lijst",
"custom_filter_rules": "Aangepaste filterregels", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"example_comment_meaning": "zomaar een opmerking;",
"example_comment_hash": "# Ook een opmerking.",
"example_regex_meaning": "toegang blokkeren tot de domeinen die overeenkomen met de opgegeven reguliere expressie.",
"example_upstream_regular": "standaard DNS (over UDP);",
"example_upstream_udp": "standaard DNS (via UDP, hostnaam);",
"example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>;",
"example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</0>;",
"example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>;",
"example_upstream_sdns": "<0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen;",
"example_upstream_tcp": "standaard DNS (over TCP);",
| </s> remove "dns_allowlists": "DNS toestemmingslijsten",
</s> add "dns_allowlists": "DNS-toelatingslijsten", </s> remove "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
</s> add "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.", | "example_upstream_regular_port": "standaard DNS (via UDP, met poort);", | "example_comment_meaning": "zomaar een opmerking;",
"example_comment_hash": "# Ook een opmerking.",
"example_regex_meaning": "toegang blokkeren tot de domeinen die overeenkomen met de opgegeven reguliere expressie.",
"example_upstream_regular": "standaard DNS (over UDP);",
"example_upstream_regular_port": "standaard DNS (via UDP, met poort);",
"example_upstream_udp": "standaard DNS (via UDP, hostnaam);",
"example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>;",
"example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</0>;",
"example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>;",
"example_upstream_sdns": "<0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen;",
"example_upstream_tcp": "standaard DNS (over TCP);", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>;",
"example_upstream_sdns": "<0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen;",
"example_upstream_tcp": "standaard DNS (over TCP);",
"example_upstream_tcp_hostname": "standaard DNS (via TCP, hostnaam);",
"all_lists_up_to_date_toast": "Alle lijsten zijn reeds actueel",
"updated_upstream_dns_toast": "Upstream-servers succesvol opgeslagen",
"dns_test_ok_toast": "Opgegeven DNS-servers werken correct",
"dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven",
"dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed",
| </s> remove "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
</s> add "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.", </s> remove "show_whitelisted_responses": "Op toestemmingslijst",
</s> add "show_whitelisted_responses": "Op toelatingslijst", | "example_upstream_tcp_port": "standaard DNS (via TCP, met poort);", | "example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>;",
"example_upstream_sdns": "<0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen;",
"example_upstream_tcp": "standaard DNS (over TCP);",
"example_upstream_tcp_port": "standaard DNS (via TCP, met poort);",
"example_upstream_tcp_hostname": "standaard DNS (via TCP, hostnaam);",
"all_lists_up_to_date_toast": "Alle lijsten zijn reeds actueel",
"updated_upstream_dns_toast": "Upstream-servers succesvol opgeslagen",
"dns_test_ok_toast": "Opgegeven DNS-servers werken correct",
"dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven",
"dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"form_enter_host": "Voer een hostnaam in",
"filtered_custom_rules": "Gefilterd door aangepaste filterregels",
"choose_from_list": "Uit de lijst selecteren",
"add_custom_list": "Aangepaste lijst toevoegen",
"host_whitelisted": "De host staat op de toestemmingslijst",
"check_ip": "IP-adressen: {{ip}}",
"check_cname": "CNAME: {{cname}}",
"check_reason": "Reden: {{reason}}",
"check_service": "Servicenaam: {{service}}",
"service_name": "Naam service",
| </s> remove "choose_allowlist": "Toestemmingslijsten selecteren",
</s> add "choose_allowlist": "Toelatingslijsten selecteren", </s> remove "edit_allowlist": "Toestemmingslijst beheren",
</s> add "edit_allowlist": "Toelatingslijst bewerken", </s> remove "new_allowlist": "Nieuwe toestemmingslijst",
</s> add "new_allowlist": "Nieuwe toelatingslijst", </s> remove "add_allowlist": "Toestemmingslijst toevoegen",
</s> add "add_allowlist": "Toelatingslijst toevoegen", </s> remove "show_whitelisted_responses": "Op toestemmingslijst",
</s> add "show_whitelisted_responses": "Op toelatingslijst", | "host_whitelisted": "De host staat op de toelatingslijst", | "form_enter_host": "Voer een hostnaam in",
"filtered_custom_rules": "Gefilterd door aangepaste filterregels",
"choose_from_list": "Uit de lijst selecteren",
"add_custom_list": "Aangepaste lijst toevoegen",
"host_whitelisted": "De host staat op de toelatingslijst",
"check_ip": "IP-adressen: {{ip}}",
"check_cname": "CNAME: {{cname}}",
"check_reason": "Reden: {{reason}}",
"check_service": "Servicenaam: {{service}}",
"service_name": "Naam service", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
"dnssec_enable_desc": "Zet de DNSSEC-vlag aan bij uitgaande DNS-query's en controleer het resultaat (DNSSEC-compatibele resolver is vereist)",
"validated_with_dnssec": "Gevalideerd met DNSSEC",
"all_queries": "Alle vragen",
"show_blocked_responses": "Geblokkeerd",
"show_whitelisted_responses": "Op toestemmingslijst",
"show_processed_responses": "Verwerkt",
"blocked_safebrowsing": "Geblokkeerd door Veilig browsen",
"blocked_adult_websites": "Geblokkeerd door ouderlijk toezicht",
"blocked_threats": "Geblokkeerde bedreigingen",
"allowed": "Toegestaan",
| </s> remove "host_whitelisted": "De host staat op de toestemmingslijst",
</s> add "host_whitelisted": "De host staat op de toelatingslijst", </s> remove "no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
</s> add "no_whitelist_added": "Geen toelatingslijsten toegevoegd", </s> remove "add_allowlist": "Toestemmingslijst toevoegen",
</s> add "add_allowlist": "Toelatingslijst toevoegen", </s> remove "new_allowlist": "Nieuwe toestemmingslijst",
</s> add "new_allowlist": "Nieuwe toelatingslijst", | "show_whitelisted_responses": "Op toelatingslijst", | "dnssec_enable_desc": "Zet de DNSSEC-vlag aan bij uitgaande DNS-query's en controleer het resultaat (DNSSEC-compatibele resolver is vereist)",
"validated_with_dnssec": "Gevalideerd met DNSSEC",
"all_queries": "Alle vragen",
"show_blocked_responses": "Geblokkeerd",
"show_whitelisted_responses": "Op toelatingslijst",
"show_processed_responses": "Verwerkt",
"blocked_safebrowsing": "Geblokkeerd door Veilig browsen",
"blocked_adult_websites": "Geblokkeerd door ouderlijk toezicht",
"blocked_threats": "Geblokkeerde bedreigingen",
"allowed": "Toegestaan", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | client/src/__locales/nl.json |
requests.push(request(url, locale));
// Don't request the Crowdin API too aggressively to prevent spurious
// 400 errors.
await sleep(300);
}
Promise
.all(requests)
.then((res) => {
| </s> remove "show_whitelisted_responses": "Op toestemmingslijst",
</s> add "show_whitelisted_responses": "Op toelatingslijst", </s> remove "host_whitelisted": "De host staat op de toestemmingslijst",
</s> add "host_whitelisted": "De host staat op de toelatingslijst", </s> remove "choose_allowlist": "Toestemmingslijsten selecteren",
</s> add "choose_allowlist": "Toelatingslijsten selecteren", | await sleep(400); | requests.push(request(url, locale));
// Don't request the Crowdin API too aggressively to prevent spurious
// 400 errors.
await sleep(400);
}
Promise
.all(requests)
.then((res) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit e32d907806f29d78d91a9962f7d0a7ba1f17f5a5
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 15:01:22 2022 +0300
client: imp be locale
commit 4701b98b4115b66cf5decda4e43d4e4d459b95ad
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 7 14:57:27 2022 +0300
client: upd i18n | https://github.com/AdguardTeam/AdGuardHome/commit/2b4158e5c90bcde7cb25953f32e58f1822d2fb8f | scripts/translations/download.js |
github.com/fsnotify/fsnotify v1.4.9
github.com/gobuffalo/packr v1.30.1
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
github.com/joomcode/errorx v1.0.3
github.com/kardianos/service v1.1.0
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect
| </s> remove github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
</s> add </s> remove var (
nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
</s> add var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID </s> remove MaxAge: ls.LogMaxAge, //days
</s> add MaxAge: ls.LogMaxAge, // days </s> remove "github.com/joomcode/errorx"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/agherr" </s> remove log.Debug("DHCPv4: received message: %s", req.Summary())
</s> add log.Debug("dhcpv4: received message: %s", req.Summary()) | github.com/fsnotify/fsnotify v1.4.9
github.com/gobuffalo/packr v1.30.1
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
github.com/kardianos/service v1.1.0
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | go.mod |
|
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk=
github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/kardianos/service v1.1.0 h1:QV2SiEeWK42P0aEmGcsAgjApw/lRxkwopvT+Gu6t1/0=
github.com/kardianos/service v1.1.0/go.mod h1:RrJI2xn5vve/r32U5suTbeaSGoMU6GbNPoj36CVYcHc=
github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU=
| </s> remove github.com/joomcode/errorx v1.0.3
</s> add </s> remove log.Debug("DHCPv4: bad option string: %s", o)
</s> add log.Debug("dhcpv4: bad option string: %s", o) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %w", f.FilePath, err) </s> remove return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
</s> add return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) | github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk=
github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/kardianos/service v1.1.0 h1:QV2SiEeWK42P0aEmGcsAgjApw/lRxkwopvT+Gu6t1/0=
github.com/kardianos/service v1.1.0/go.mod h1:RrJI2xn5vve/r32U5suTbeaSGoMU6GbNPoj36CVYcHc=
github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | go.sum |
|
// and waits for a response for a period defined by defaultDiscoverTime
func CheckIfOtherDHCPServersPresentV4(ifaceName string) (bool, error) {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
}
// get ipv4 address of an interface
ifaceIPNet := getIfaceIPv4(*iface)
if len(ifaceIPNet) == 0 {
| </s> remove return false, fmt.Errorf("DHCPv6: net.InterfaceByName: %s: %s", ifaceName, err)
</s> add return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
</s> add return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err)
</s> add return fmt.Errorf("dhcpv4: Couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove log.Debug("DHCPv4: starting...")
</s> add log.Debug("dhcpv4: starting...") </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
</s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) | return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) | // and waits for a response for a period defined by defaultDiscoverTime
func CheckIfOtherDHCPServersPresentV4(ifaceName string) (bool, error) {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err)
}
// get ipv4 address of an interface
ifaceIPNet := getIfaceIPv4(*iface)
if len(ifaceIPNet) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
hostname, _ := os.Hostname()
req, err := dhcpv4.NewDiscovery(iface.HardwareAddr)
if err != nil {
return false, fmt.Errorf("dhcpv4.NewDiscovery: %s", err)
}
req.Options.Update(dhcpv4.OptClientIdentifier(iface.HardwareAddr))
req.Options.Update(dhcpv4.OptHostName(hostname))
// resolve 0.0.0.0:68
| </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) | return false, fmt.Errorf("dhcpv4.NewDiscovery: %w", err) | hostname, _ := os.Hostname()
req, err := dhcpv4.NewDiscovery(iface.HardwareAddr)
if err != nil {
return false, fmt.Errorf("dhcpv4.NewDiscovery: %w", err)
}
req.Options.Update(dhcpv4.OptClientIdentifier(iface.HardwareAddr))
req.Options.Update(dhcpv4.OptHostName(hostname))
// resolve 0.0.0.0:68 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
// resolve 0.0.0.0:68
udpAddr, err := net.ResolveUDPAddr("udp4", src)
if err != nil {
return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
}
if !udpAddr.IP.To4().Equal(srcIP) {
return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
}
| </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err) </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err) | return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) |
// resolve 0.0.0.0:68
udpAddr, err := net.ResolveUDPAddr("udp4", src)
if err != nil {
return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err)
}
if !udpAddr.IP.To4().Equal(srcIP) {
return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
}
if !udpAddr.IP.To4().Equal(srcIP) {
return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
}
// resolve 255.255.255.255:67
dstAddr, err := net.ResolveUDPAddr("udp4", dst)
if err != nil {
| </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) | return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) | return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
}
if !udpAddr.IP.To4().Equal(srcIP) {
return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err)
}
// resolve 255.255.255.255:67
dstAddr, err := net.ResolveUDPAddr("udp4", dst)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
// resolve 255.255.255.255:67
dstAddr, err := net.ResolveUDPAddr("udp4", dst)
if err != nil {
return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
}
// bind to 0.0.0.0:68
log.Tracef("Listening to udp4 %+v", udpAddr)
c, err := nclient4.NewRawUDPConn(ifaceName, 68)
| </s> remove return false, wrapErrPrint(err, "Couldn't listen on :68")
</s> add return false, fmt.Errorf("couldn't listen on :68: %w", err) </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err) | return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err) |
// resolve 255.255.255.255:67
dstAddr, err := net.ResolveUDPAddr("udp4", dst)
if err != nil {
return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err)
}
// bind to 0.0.0.0:68
log.Tracef("Listening to udp4 %+v", udpAddr)
c, err := nclient4.NewRawUDPConn(ifaceName, 68) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
// bind to 0.0.0.0:68
log.Tracef("Listening to udp4 %+v", udpAddr)
c, err := nclient4.NewRawUDPConn(ifaceName, 68)
if err != nil {
return false, wrapErrPrint(err, "Couldn't listen on :68")
}
if c != nil {
defer c.Close()
}
| </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't listen on :546: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't listen on :546: %w", err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst)
</s> add return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err) | return false, fmt.Errorf("couldn't listen on :68: %w", err) | // bind to 0.0.0.0:68
log.Tracef("Listening to udp4 %+v", udpAddr)
c, err := nclient4.NewRawUDPConn(ifaceName, 68)
if err != nil {
return false, fmt.Errorf("couldn't listen on :68: %w", err)
}
if c != nil {
defer c.Close()
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
// send to 255.255.255.255:67
_, err = c.WriteTo(req.ToBytes(), dstAddr)
if err != nil {
return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst)
}
for {
// wait for answer
log.Tracef("Waiting %v for an answer", defaultDiscoverTime)
| </s> remove return false, fmt.Errorf("DHCPv6: Couldn't send a packet to %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err) </s> remove log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets")
</s> add log.Debug("dhcpv6 ra: starting to send periodic RouterAdvertisement packets") </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) | return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err) |
// send to 255.255.255.255:67
_, err = c.WriteTo(req.ToBytes(), dstAddr)
if err != nil {
return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err)
}
for {
// wait for answer
log.Tracef("Waiting %v for an answer", defaultDiscoverTime) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.