docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
bootstrapDNS, ok := newDNSConfig["bootstrap_dns"]
if !ok { | <mask> return fmt.Errorf("dns configuration is not a map")
<mask> }
<mask>
<mask> // Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside
<mask> if bootstrapDNS, ok := (newDNSConfig)["bootstrap_dns"]; ok {
<mask> newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)}
<mask> (newDNSConfig)["bootstrap_dns"] = newBootstrapConfig
<mask> (*diskConfig)["dns"] = newDNSConfig
<mask> } else {
<mask> return fmt.Errorf("no bootstrap DNS in DNS config")
<mask> }
<mask>
<mask> // Bump schema version
<mask> (*diskConfig)["schema_version"] = 3
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove log.Fatalf("client.mac is not a string: %v", _mac)
</s> add log.Fatalf("client.mac is not a string: %v", macVal) </s> remove _mac, ok := c["mac"]
</s> add var macVal interface{}
macVal, ok = c["mac"] </s> remove log.Fatalf("client.ip is not a string: %v", _ip)
</s> add log.Fatalf("client.ip is not a string: %v", ipVal) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)}
newDNSConfig["bootstrap_dns"] = newBootstrapConfig
(*diskConfig)["dns"] = newDNSConfig
| <mask> }
<mask>
<mask> // Bump schema version
<mask> (*diskConfig)["schema_version"] = 3
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove if bootstrapDNS, ok := (newDNSConfig)["bootstrap_dns"]; ok {
newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)}
(newDNSConfig)["bootstrap_dns"] = newBootstrapConfig
(*diskConfig)["dns"] = newDNSConfig
} else {
</s> add bootstrapDNS, ok := newDNSConfig["bootstrap_dns"]
if !ok { </s> remove _dhcp, ok := (*diskConfig)["dhcp"]
</s> add dhcpVal, ok := (*diskConfig)["dhcp"] </s> remove return err
</s> add return ferr </s> remove if err == nil {
err = eff()
</s> add if ferr == nil {
ferr = eff() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
var ipVal interface{}
ipVal, ok = c["ip"] | <mask> for i := range arr {
<mask> switch c := arr[i].(type) {
<mask>
<mask> case map[interface{}]interface{}:
<mask> _ip, ok := c["ip"]
<mask> ids := []string{}
<mask> if ok {
<mask> ip, ok := _ip.(string)
<mask> if !ok {
<mask> log.Fatalf("client.ip is not a string: %v", _ip)
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove ip, ok := _ip.(string)
</s> add var ip string
ip, ok = ipVal.(string) </s> remove log.Fatalf("client.ip is not a string: %v", _ip)
</s> add log.Fatalf("client.ip is not a string: %v", ipVal) </s> remove log.Fatalf("client.mac is not a string: %v", _mac)
</s> add log.Fatalf("client.mac is not a string: %v", macVal) </s> remove switch dhcp := _dhcp.(type) {
</s> add switch dhcp := dhcpVal.(type) { </s> remove _mac, ok := c["mac"]
</s> add var macVal interface{}
macVal, ok = c["mac"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
var ip string
ip, ok = ipVal.(string) | <mask> case map[interface{}]interface{}:
<mask> _ip, ok := c["ip"]
<mask> ids := []string{}
<mask> if ok {
<mask> ip, ok := _ip.(string)
<mask> if !ok {
<mask> log.Fatalf("client.ip is not a string: %v", _ip)
<mask> return nil
<mask> }
<mask> if len(ip) != 0 {
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove log.Fatalf("client.ip is not a string: %v", _ip)
</s> add log.Fatalf("client.ip is not a string: %v", ipVal) </s> remove _ip, ok := c["ip"]
</s> add var ipVal interface{}
ipVal, ok = c["ip"] </s> remove log.Fatalf("client.mac is not a string: %v", _mac)
</s> add log.Fatalf("client.mac is not a string: %v", macVal) </s> remove mac, ok := _mac.(string)
</s> add var mac string
mac, ok = macVal.(string) </s> remove _mac, ok := c["mac"]
</s> add var macVal interface{}
macVal, ok = c["mac"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
log.Fatalf("client.ip is not a string: %v", ipVal) | <mask> ids := []string{}
<mask> if ok {
<mask> ip, ok := _ip.(string)
<mask> if !ok {
<mask> log.Fatalf("client.ip is not a string: %v", _ip)
<mask> return nil
<mask> }
<mask> if len(ip) != 0 {
<mask> ids = append(ids, ip)
<mask> }
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove ip, ok := _ip.(string)
</s> add var ip string
ip, ok = ipVal.(string) </s> remove _ip, ok := c["ip"]
</s> add var ipVal interface{}
ipVal, ok = c["ip"] </s> remove log.Fatalf("client.mac is not a string: %v", _mac)
</s> add log.Fatalf("client.mac is not a string: %v", macVal) </s> remove _mac, ok := c["mac"]
</s> add var macVal interface{}
macVal, ok = c["mac"] </s> remove mac, ok := _mac.(string)
</s> add var mac string
mac, ok = macVal.(string) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
var macVal interface{}
macVal, ok = c["mac"] | <mask> ids = append(ids, ip)
<mask> }
<mask> }
<mask>
<mask> _mac, ok := c["mac"]
<mask> if ok {
<mask> mac, ok := _mac.(string)
<mask> if !ok {
<mask> log.Fatalf("client.mac is not a string: %v", _mac)
<mask> return nil
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove log.Fatalf("client.mac is not a string: %v", _mac)
</s> add log.Fatalf("client.mac is not a string: %v", macVal) </s> remove mac, ok := _mac.(string)
</s> add var mac string
mac, ok = macVal.(string) </s> remove log.Fatalf("client.ip is not a string: %v", _ip)
</s> add log.Fatalf("client.ip is not a string: %v", ipVal) </s> remove ip, ok := _ip.(string)
</s> add var ip string
ip, ok = ipVal.(string) </s> remove _ip, ok := c["ip"]
</s> add var ipVal interface{}
ipVal, ok = c["ip"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
var mac string
mac, ok = macVal.(string) | <mask> }
<mask>
<mask> _mac, ok := c["mac"]
<mask> if ok {
<mask> mac, ok := _mac.(string)
<mask> if !ok {
<mask> log.Fatalf("client.mac is not a string: %v", _mac)
<mask> return nil
<mask> }
<mask> if len(mac) != 0 {
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove log.Fatalf("client.mac is not a string: %v", _mac)
</s> add log.Fatalf("client.mac is not a string: %v", macVal) </s> remove _mac, ok := c["mac"]
</s> add var macVal interface{}
macVal, ok = c["mac"] </s> remove log.Fatalf("client.ip is not a string: %v", _ip)
</s> add log.Fatalf("client.ip is not a string: %v", ipVal) </s> remove ip, ok := _ip.(string)
</s> add var ip string
ip, ok = ipVal.(string) </s> remove _ip, ok := c["ip"]
</s> add var ipVal interface{}
ipVal, ok = c["ip"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
log.Fatalf("client.mac is not a string: %v", macVal) | <mask> _mac, ok := c["mac"]
<mask> if ok {
<mask> mac, ok := _mac.(string)
<mask> if !ok {
<mask> log.Fatalf("client.mac is not a string: %v", _mac)
<mask> return nil
<mask> }
<mask> if len(mac) != 0 {
<mask> ids = append(ids, mac)
<mask> }
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove mac, ok := _mac.(string)
</s> add var mac string
mac, ok = macVal.(string) </s> remove _mac, ok := c["mac"]
</s> add var macVal interface{}
macVal, ok = c["mac"] </s> remove log.Fatalf("client.ip is not a string: %v", _ip)
</s> add log.Fatalf("client.ip is not a string: %v", ipVal) </s> remove ip, ok := _ip.(string)
</s> add var ip string
ip, ok = ipVal.(string) </s> remove _ip, ok := c["ip"]
</s> add var ipVal interface{}
ipVal, ok = c["ip"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
dhcpVal, ok := (*diskConfig)["dhcp"] | <mask> log.Printf("Upgrade yaml: 6 to 7")
<mask>
<mask> (*diskConfig)["schema_version"] = 7
<mask>
<mask> _dhcp, ok := (*diskConfig)["dhcp"]
<mask> if !ok {
<mask> return nil
<mask> }
<mask>
<mask> switch dhcp := _dhcp.(type) {
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove switch dhcp := _dhcp.(type) {
</s> add switch dhcp := dhcpVal.(type) { </s> remove dhcpv4 := map[string]interface{}{}
val, ok := dhcp["gateway_ip"].(string)
</s> add var str string
str, ok = dhcp["gateway_ip"].(string) </s> remove if bootstrapDNS, ok := (newDNSConfig)["bootstrap_dns"]; ok {
newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)}
(newDNSConfig)["bootstrap_dns"] = newBootstrapConfig
(*diskConfig)["dns"] = newDNSConfig
} else {
</s> add bootstrapDNS, ok := newDNSConfig["bootstrap_dns"]
if !ok { </s> remove _ip, ok := c["ip"]
</s> add var ipVal interface{}
ipVal, ok = c["ip"] </s> remove mac, ok := _mac.(string)
</s> add var mac string
mac, ok = macVal.(string) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
switch dhcp := dhcpVal.(type) { | <mask> if !ok {
<mask> return nil
<mask> }
<mask>
<mask> switch dhcp := _dhcp.(type) {
<mask> case map[interface{}]interface{}:
<mask> dhcpv4 := map[string]interface{}{}
<mask> val, ok := dhcp["gateway_ip"].(string)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "gateway_ip")
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove dhcpv4 := map[string]interface{}{}
val, ok := dhcp["gateway_ip"].(string)
</s> add var str string
str, ok = dhcp["gateway_ip"].(string) </s> remove dhcpv4["gateway_ip"] = val
</s> add dhcpv4 := map[string]interface{}{
"gateway_ip": str,
} </s> remove _dhcp, ok := (*diskConfig)["dhcp"]
</s> add dhcpVal, ok := (*diskConfig)["dhcp"] </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str </s> remove dhcpv4["range_start"] = val
</s> add dhcpv4["range_start"] = str | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
var str string
str, ok = dhcp["gateway_ip"].(string) | <mask> }
<mask>
<mask> switch dhcp := _dhcp.(type) {
<mask> case map[interface{}]interface{}:
<mask> dhcpv4 := map[string]interface{}{}
<mask> val, ok := dhcp["gateway_ip"].(string)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "gateway_ip")
<mask> return nil
<mask> }
<mask> dhcpv4["gateway_ip"] = val
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove switch dhcp := _dhcp.(type) {
</s> add switch dhcp := dhcpVal.(type) { </s> remove dhcpv4["gateway_ip"] = val
</s> add dhcpv4 := map[string]interface{}{
"gateway_ip": str,
} </s> remove val, ok = dhcp["subnet_mask"].(string)
</s> add str, ok = dhcp["subnet_mask"].(string) </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str </s> remove dhcpv4["range_start"] = val
</s> add dhcpv4["range_start"] = str | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
dhcpv4 := map[string]interface{}{
"gateway_ip": str,
} | <mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "gateway_ip")
<mask> return nil
<mask> }
<mask> dhcpv4["gateway_ip"] = val
<mask> delete(dhcp, "gateway_ip")
<mask>
<mask> val, ok = dhcp["subnet_mask"].(string)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "subnet_mask")
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove val, ok = dhcp["subnet_mask"].(string)
</s> add str, ok = dhcp["subnet_mask"].(string) </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str </s> remove dhcpv4["range_start"] = val
</s> add dhcpv4["range_start"] = str </s> remove val, ok = dhcp["range_start"].(string)
</s> add str, ok = dhcp["range_start"].(string) </s> remove dhcpv4 := map[string]interface{}{}
val, ok := dhcp["gateway_ip"].(string)
</s> add var str string
str, ok = dhcp["gateway_ip"].(string) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
str, ok = dhcp["subnet_mask"].(string) | <mask> }
<mask> dhcpv4["gateway_ip"] = val
<mask> delete(dhcp, "gateway_ip")
<mask>
<mask> val, ok = dhcp["subnet_mask"].(string)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "subnet_mask")
<mask> return nil
<mask> }
<mask> dhcpv4["subnet_mask"] = val
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove dhcpv4["gateway_ip"] = val
</s> add dhcpv4 := map[string]interface{}{
"gateway_ip": str,
} </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str </s> remove val, ok = dhcp["range_start"].(string)
</s> add str, ok = dhcp["range_start"].(string) </s> remove val, ok = dhcp["range_end"].(string)
</s> add str, ok = dhcp["range_end"].(string) </s> remove dhcpv4["range_start"] = val
</s> add dhcpv4["range_start"] = str | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
dhcpv4["subnet_mask"] = str | <mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "subnet_mask")
<mask> return nil
<mask> }
<mask> dhcpv4["subnet_mask"] = val
<mask> delete(dhcp, "subnet_mask")
<mask>
<mask> val, ok = dhcp["range_start"].(string)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "range_start")
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove val, ok = dhcp["range_start"].(string)
</s> add str, ok = dhcp["range_start"].(string) </s> remove dhcpv4["gateway_ip"] = val
</s> add dhcpv4 := map[string]interface{}{
"gateway_ip": str,
} </s> remove val, ok = dhcp["subnet_mask"].(string)
</s> add str, ok = dhcp["subnet_mask"].(string) </s> remove dhcpv4["range_start"] = val
</s> add dhcpv4["range_start"] = str </s> remove val, ok = dhcp["range_end"].(string)
</s> add str, ok = dhcp["range_end"].(string) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
str, ok = dhcp["range_start"].(string) | <mask> }
<mask> dhcpv4["subnet_mask"] = val
<mask> delete(dhcp, "subnet_mask")
<mask>
<mask> val, ok = dhcp["range_start"].(string)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "range_start")
<mask> return nil
<mask> }
<mask> dhcpv4["range_start"] = val
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str </s> remove dhcpv4["range_start"] = val
</s> add dhcpv4["range_start"] = str </s> remove val, ok = dhcp["range_end"].(string)
</s> add str, ok = dhcp["range_end"].(string) </s> remove val, ok = dhcp["subnet_mask"].(string)
</s> add str, ok = dhcp["subnet_mask"].(string) </s> remove dhcpv4["gateway_ip"] = val
</s> add dhcpv4 := map[string]interface{}{
"gateway_ip": str,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
dhcpv4["range_start"] = str | <mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "range_start")
<mask> return nil
<mask> }
<mask> dhcpv4["range_start"] = val
<mask> delete(dhcp, "range_start")
<mask>
<mask> val, ok = dhcp["range_end"].(string)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "range_end")
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove val, ok = dhcp["range_end"].(string)
</s> add str, ok = dhcp["range_end"].(string) </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str </s> remove val, ok = dhcp["range_start"].(string)
</s> add str, ok = dhcp["range_start"].(string) </s> remove dhcpv4["range_end"] = val
</s> add dhcpv4["range_end"] = str </s> remove dhcpv4["gateway_ip"] = val
</s> add dhcpv4 := map[string]interface{}{
"gateway_ip": str,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
str, ok = dhcp["range_end"].(string) | <mask> }
<mask> dhcpv4["range_start"] = val
<mask> delete(dhcp, "range_start")
<mask>
<mask> val, ok = dhcp["range_end"].(string)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "range_end")
<mask> return nil
<mask> }
<mask> dhcpv4["range_end"] = val
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove dhcpv4["range_start"] = val
</s> add dhcpv4["range_start"] = str </s> remove val, ok = dhcp["range_start"].(string)
</s> add str, ok = dhcp["range_start"].(string) </s> remove dhcpv4["range_end"] = val
</s> add dhcpv4["range_end"] = str </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str </s> remove val, ok = dhcp["subnet_mask"].(string)
</s> add str, ok = dhcp["subnet_mask"].(string) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
dhcpv4["range_end"] = str | <mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be a string", "range_end")
<mask> return nil
<mask> }
<mask> dhcpv4["range_end"] = val
<mask> delete(dhcp, "range_end")
<mask>
<mask> intVal, ok := dhcp["lease_duration"].(int)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be an integer", "lease_duration")
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove intVal, ok := dhcp["lease_duration"].(int)
</s> add var n int
n, ok = dhcp["lease_duration"].(int) </s> remove dhcpv4["lease_duration"] = intVal
</s> add dhcpv4["lease_duration"] = n </s> remove dhcpv4["range_start"] = val
</s> add dhcpv4["range_start"] = str </s> remove val, ok = dhcp["range_end"].(string)
</s> add str, ok = dhcp["range_end"].(string) </s> remove intVal, ok = dhcp["icmp_timeout_msec"].(int)
</s> add n, ok = dhcp["icmp_timeout_msec"].(int) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
var n int
n, ok = dhcp["lease_duration"].(int) | <mask> }
<mask> dhcpv4["range_end"] = val
<mask> delete(dhcp, "range_end")
<mask>
<mask> intVal, ok := dhcp["lease_duration"].(int)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be an integer", "lease_duration")
<mask> return nil
<mask> }
<mask> dhcpv4["lease_duration"] = intVal
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove dhcpv4["range_end"] = val
</s> add dhcpv4["range_end"] = str </s> remove dhcpv4["lease_duration"] = intVal
</s> add dhcpv4["lease_duration"] = n </s> remove intVal, ok = dhcp["icmp_timeout_msec"].(int)
</s> add n, ok = dhcp["icmp_timeout_msec"].(int) </s> remove val, ok = dhcp["range_end"].(string)
</s> add str, ok = dhcp["range_end"].(string) </s> remove dhcpv4["icmp_timeout_msec"] = intVal
</s> add dhcpv4["icmp_timeout_msec"] = n | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
dhcpv4["lease_duration"] = n | <mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be an integer", "lease_duration")
<mask> return nil
<mask> }
<mask> dhcpv4["lease_duration"] = intVal
<mask> delete(dhcp, "lease_duration")
<mask>
<mask> intVal, ok = dhcp["icmp_timeout_msec"].(int)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be an integer", "icmp_timeout_msec")
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove intVal, ok = dhcp["icmp_timeout_msec"].(int)
</s> add n, ok = dhcp["icmp_timeout_msec"].(int) </s> remove intVal, ok := dhcp["lease_duration"].(int)
</s> add var n int
n, ok = dhcp["lease_duration"].(int) </s> remove dhcpv4["range_end"] = val
</s> add dhcpv4["range_end"] = str </s> remove dhcpv4["icmp_timeout_msec"] = intVal
</s> add dhcpv4["icmp_timeout_msec"] = n </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
n, ok = dhcp["icmp_timeout_msec"].(int) | <mask> }
<mask> dhcpv4["lease_duration"] = intVal
<mask> delete(dhcp, "lease_duration")
<mask>
<mask> intVal, ok = dhcp["icmp_timeout_msec"].(int)
<mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be an integer", "icmp_timeout_msec")
<mask> return nil
<mask> }
<mask> dhcpv4["icmp_timeout_msec"] = intVal
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove dhcpv4["lease_duration"] = intVal
</s> add dhcpv4["lease_duration"] = n </s> remove dhcpv4["icmp_timeout_msec"] = intVal
</s> add dhcpv4["icmp_timeout_msec"] = n </s> remove intVal, ok := dhcp["lease_duration"].(int)
</s> add var n int
n, ok = dhcp["lease_duration"].(int) </s> remove dhcpv4["range_end"] = val
</s> add dhcpv4["range_end"] = str </s> remove dhcpv4["subnet_mask"] = val
</s> add dhcpv4["subnet_mask"] = str | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
dhcpv4["icmp_timeout_msec"] = n | <mask> if !ok {
<mask> log.Fatalf("expecting dhcp.%s to be an integer", "icmp_timeout_msec")
<mask> return nil
<mask> }
<mask> dhcpv4["icmp_timeout_msec"] = intVal
<mask> delete(dhcp, "icmp_timeout_msec")
<mask>
<mask> dhcp["dhcpv4"] = dhcpv4
<mask>
<mask> default:
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove intVal, ok = dhcp["icmp_timeout_msec"].(int)
</s> add n, ok = dhcp["icmp_timeout_msec"].(int) </s> remove dhcpv4["lease_duration"] = intVal
</s> add dhcpv4["lease_duration"] = n </s> remove intVal, ok := dhcp["lease_duration"].(int)
</s> add var n int
n, ok = dhcp["lease_duration"].(int) </s> remove dhcpv4["range_end"] = val
</s> add dhcpv4["range_end"] = str </s> remove dhcpv4["gateway_ip"] = val
</s> add dhcpv4 := map[string]interface{}{
"gateway_ip": str,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/upgrade.go |
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
shutdownSrv(ctx, cancel, web.httpsServer.server) | <mask> }
<mask>
<mask> web.httpsServer.cond.L.Lock()
<mask> if web.httpsServer.server != nil {
<mask> ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
<mask> err = web.httpsServer.server.Shutdown(ctx)
<mask> cancel()
<mask> if err != nil {
<mask> log.Debug("error while shutting down HTTP server: %s", err)
<mask> }
<mask> }
<mask> web.httpsServer.enabled = enabled
<mask> web.httpsServer.cert = cert
<mask> web.httpsServer.cond.Broadcast()
<mask> web.httpsServer.cond.L.Unlock()
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
</s> add var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout) </s> remove
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer)
if web.httpServerBeta != nil {
go shut(web.httpServerBeta)
}
</s> add go shutdownSrv(ctx, cancel, web.httpServer)
go shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove shut(web.httpsServer.server)
shut(web.httpServer)
shut(web.httpServerBeta)
</s> add shutdownSrv(ctx, cancel, web.httpsServer.server)
shutdownSrv(ctx, cancel, web.httpServer)
shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove log.Info("Stopping HTTP server...")
</s> add log.Info("stopping http server...")
</s> remove err := binary.Read(buf, binary.LittleEndian, &dateToken)
if err != nil {
log.Error("binary.Read: %s", err)
return 0
}
} else {
err := binary.Read(buf, binary.BigEndian, &dateToken)
if err != nil {
log.Error("binary.Read: %s", err)
return 0
}
</s> add order = binary.LittleEndian | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/web.go |
log.Info("stopping http server...")
| <mask> }
<mask>
<mask> // Close gracefully shuts down the HTTP servers.
<mask> func (web *Web) Close(ctx context.Context) {
<mask> log.Info("Stopping HTTP server...")
<mask> web.httpsServer.cond.L.Lock()
<mask> web.httpsServer.shutdown = true
<mask> web.httpsServer.cond.L.Unlock()
<mask>
<mask> shut := func(srv *http.Server) {
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
</s> add var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout) </s> remove log.Info("Stopped HTTP server")
</s> add log.Info("stopped http server") </s> remove
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer)
if web.httpServerBeta != nil {
go shut(web.httpServerBeta)
}
</s> add go shutdownSrv(ctx, cancel, web.httpServer)
go shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove shut(web.httpsServer.server)
shut(web.httpServer)
shut(web.httpServerBeta)
</s> add shutdownSrv(ctx, cancel, web.httpsServer.server)
shutdownSrv(ctx, cancel, web.httpServer)
shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
err = web.httpsServer.server.Shutdown(ctx)
cancel()
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
</s> add var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
shutdownSrv(ctx, cancel, web.httpsServer.server) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/web.go |
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout) | <mask> web.httpsServer.cond.L.Lock()
<mask> web.httpsServer.shutdown = true
<mask> web.httpsServer.cond.L.Unlock()
<mask>
<mask> shut := func(srv *http.Server) {
<mask> if srv == nil {
<mask> return
<mask> }
<mask> ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
<mask> defer cancel()
<mask> if err := srv.Shutdown(ctx); err != nil {
<mask> log.Debug("error while shutting down HTTP server: %s", err)
<mask> }
<mask> }
<mask>
<mask> shut(web.httpsServer.server)
<mask> shut(web.httpServer)
<mask> shut(web.httpServerBeta)
<mask>
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
err = web.httpsServer.server.Shutdown(ctx)
cancel()
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
</s> add var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
shutdownSrv(ctx, cancel, web.httpsServer.server) </s> remove
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer)
if web.httpServerBeta != nil {
go shut(web.httpServerBeta)
}
</s> add go shutdownSrv(ctx, cancel, web.httpServer)
go shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove log.Info("Stopping HTTP server...")
</s> add log.Info("stopping http server...")
</s> remove shut(web.httpsServer.server)
shut(web.httpServer)
shut(web.httpServerBeta)
</s> add shutdownSrv(ctx, cancel, web.httpsServer.server)
shutdownSrv(ctx, cancel, web.httpServer)
shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove log.Info("Stopped HTTP server")
</s> add log.Info("stopped http server") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/web.go |
shutdownSrv(ctx, cancel, web.httpsServer.server)
shutdownSrv(ctx, cancel, web.httpServer)
shutdownSrv(ctx, cancel, web.httpServerBeta) | <mask> log.Debug("error while shutting down HTTP server: %s", err)
<mask> }
<mask> }
<mask>
<mask> shut(web.httpsServer.server)
<mask> shut(web.httpServer)
<mask> shut(web.httpServerBeta)
<mask>
<mask> log.Info("Stopped HTTP server")
<mask> }
<mask>
<mask> func (web *Web) tlsServerLoop() {
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove log.Info("Stopped HTTP server")
</s> add log.Info("stopped http server") </s> remove shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
</s> add var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout) </s> remove
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer)
if web.httpServerBeta != nil {
go shut(web.httpServerBeta)
}
</s> add go shutdownSrv(ctx, cancel, web.httpServer)
go shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
err = web.httpsServer.server.Shutdown(ctx)
cancel()
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
</s> add var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
shutdownSrv(ctx, cancel, web.httpsServer.server) </s> remove log.Info("Stopping HTTP server...")
</s> add log.Info("stopping http server...")
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/web.go |
log.Info("stopped http server") | <mask> shut(web.httpsServer.server)
<mask> shut(web.httpServer)
<mask> shut(web.httpServerBeta)
<mask>
<mask> log.Info("Stopped HTTP server")
<mask> }
<mask>
<mask> func (web *Web) tlsServerLoop() {
<mask> for {
<mask> web.httpsServer.cond.L.Lock()
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove shut(web.httpsServer.server)
shut(web.httpServer)
shut(web.httpServerBeta)
</s> add shutdownSrv(ctx, cancel, web.httpsServer.server)
shutdownSrv(ctx, cancel, web.httpServer)
shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove log.Info("Stopping HTTP server...")
</s> add log.Info("stopping http server...")
</s> remove shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
</s> add var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout) </s> remove
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer)
if web.httpServerBeta != nil {
go shut(web.httpServerBeta)
}
</s> add go shutdownSrv(ctx, cancel, web.httpServer)
go shutdownSrv(ctx, cancel, web.httpServerBeta) </s> remove ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
err = web.httpsServer.server.Shutdown(ctx)
cancel()
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
</s> add var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
shutdownSrv(ctx, cancel, web.httpsServer.server) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/home/web.go |
if IsOpenWrt() {
// OpenWrt: "/tmp/hosts/dhcp.cfg01411c".
a.hostsDirs = append(a.hostsDirs, "/tmp/hosts") | <mask> if len(hostsFn) != 0 {
<mask> a.hostsFn = hostsFn
<mask> }
<mask>
<mask> if IsOpenWRT() {
<mask> a.hostsDirs = append(a.hostsDirs, "/tmp/hosts") // OpenWRT: "/tmp/hosts/dhcp.cfg01411c"
<mask> }
<mask>
<mask> // Load hosts initially
<mask> a.updateHosts()
<mask>
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove // IsOpenWRT returns true if host OS is OpenWRT.
func IsOpenWRT() bool {
</s> add // IsOpenWrt returns true if host OS is OpenWrt.
func IsOpenWrt() bool { </s> remove err := binary.Read(buf, binary.LittleEndian, &dateToken)
if err != nil {
log.Error("binary.Read: %s", err)
return 0
}
} else {
err := binary.Read(buf, binary.BigEndian, &dateToken)
if err != nil {
log.Error("binary.Read: %s", err)
return 0
}
</s> add order = binary.LittleEndian </s> remove // check Name index
</s> add // First, check the name index. </s> remove if util.IsOpenWRT() {
</s> add if util.IsOpenWrt() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/util/autohosts.go |
// IsOpenWrt returns true if host OS is OpenWrt.
func IsOpenWrt() bool { | <mask> }
<mask> return strings.TrimSpace(s)
<mask> }
<mask>
<mask> // IsOpenWRT returns true if host OS is OpenWRT.
<mask> func IsOpenWRT() bool {
<mask> if runtime.GOOS != "linux" {
<mask> return false
<mask> }
<mask>
<mask> const etcDir = "/etc"
</s> Pull request: home: rm var shadowing, vol. 4
Closes #2803.
Squashed commit of the following:
commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 14:21:46 2021 +0300
home: imp more
commit 9ea7ccec8bb293881cf724d7ad57e6744243d8b9
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:58:10 2021 +0300
all: imp naming, refactor http srv shutdown
commit f29221007c16fd3e7230bf2c1ac37b365f3e29aa
Merge: 2247c05b bfbf73f3
Author: Ainar Garipov <[email protected]>
Date: Fri Mar 12 13:35:17 2021 +0300
Merge branch 'master' into 2803-shadow-4
commit 2247c05b5521346aaf362d81ccdd64fee31f1e6d
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 29 20:53:21 2021 +0300
home: rm var shadowing, vol. 4 </s> remove return err
</s> add return ferr </s> remove if IsOpenWRT() {
a.hostsDirs = append(a.hostsDirs, "/tmp/hosts") // OpenWRT: "/tmp/hosts/dhcp.cfg01411c"
</s> add if IsOpenWrt() {
// OpenWrt: "/tmp/hosts/dhcp.cfg01411c".
a.hostsDirs = append(a.hostsDirs, "/tmp/hosts") </s> remove if dnsEncryption.quic != "" {
dnsAddresses = append(dnsAddresses, dnsEncryption.quic)
</s> add if de.quic != "" {
dnsAddresses = append(dnsAddresses, de.quic) </s> remove if util.IsOpenWRT() {
</s> add if util.IsOpenWrt() { </s> remove // check Name index
</s> add // First, check the name index. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4 | internal/util/helpers.go |
- ./build_release.sh | <mask> script:
<mask> - node -v
<mask> - npm -v
<mask> # Prepare releases
<mask> - ./release.sh
<mask> - ls -l dist
<mask>
<mask> deploy:
<mask> provider: releases
<mask> api_key: $GITHUB_TOKEN
</s> *: moved docker files to the packaging folder | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f224658e0b3b0fb4799ffa44a943792d08bce41 | .travis.yml |
DOCKER_IMAGE_DEV_NAME=adguardhome-dev
DOCKERFILE=packaging/docker/Dockerfile
DOCKERFILE_HUB=packaging/docker/Dockerfile.travis | <mask> JSFILES = $(shell find client -path client/node_modules -prune -o -type f -name '*.js')
<mask> STATIC = build/static/index.html
<mask> CHANNEL ?= release
<mask>
<mask> TARGET=AdGuardHome
<mask>
<mask> .PHONY: all build clean
<mask> all: build
<mask>
</s> *: moved docker files to the packaging folder </s> remove - ./release.sh
</s> add - ./build_release.sh | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f224658e0b3b0fb4799ffa44a943792d08bce41 | Makefile |
docker:
docker build -t "$(DOCKER_IMAGE_DEV_NAME)" -f "$(DOCKERFILE)" .
@echo Now you can run the docker image:
@echo docker run --name "$(DOCKER_IMAGE_DEV_NAME)" -p 53:53/tcp -p 53:53/udp -p 3000:3000/tcp $(DOCKER_IMAGE_DEV_NAME)
| <mask> CGO_ENABLED=0 go build -ldflags="-s -w -X main.version=$(GIT_VERSION) -X main.channel=$(CHANNEL) -X main.goarm=$(GOARM)" -asmflags="-trimpath=$(PWD)" -gcflags="-trimpath=$(PWD)"
<mask> PATH=$(GOPATH)/bin:$(PATH) packr clean
<mask>
<mask> clean:
<mask> $(MAKE) cleanfast
<mask> rm -rf build
<mask> rm -rf client/node_modules
<mask>
</s> *: moved docker files to the packaging folder </s> remove - ./release.sh
</s> add - ./build_release.sh | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f224658e0b3b0fb4799ffa44a943792d08bce41 | Makefile |
/filtering/tests/filtering.TestLotsOfRules*.pprof
/filtering/tests/top-1m.csv | <mask> /build/*
<mask> /build2/*
<mask> /data/
<mask> /dist/
<mask> /dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
<mask> /dnsfilter/tests/top-1m.csv
<mask> /launchpad_credentials
<mask> /querylog.json*
<mask> /snapcraft_login
<mask> AdGuardHome*
<mask> coverage.txt
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | .gitignore |
"filtering", | <mask> "scopes": [
<mask> "",
<mask> "ui",
<mask> "global",
<mask> "dnsfilter",
<mask> "home",
<mask> "dnsforward",
<mask> "dhcpd",
<mask> "querylog",
<mask> "documentation",
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredParental,
</s> add reason: filtering.FilteredParental, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | changelog.config.js |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "os"
<mask> "sort"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/ameshkov/dnscrypt/v2"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/config.go |
FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` | <mask> // Callbacks for other modules
<mask> // --
<mask>
<mask> // FilterHandler is an optional additional filtering callback.
<mask> FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
<mask>
<mask> // GetCustomUpstreamByClient - a callback function that returns upstreams configuration
<mask> // based on the client IP address. Returns nil if there are no custom upstreams for the client
<mask> //
<mask> // TODO(e.burkov): Replace argument type with net.IP.
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.FilteringSettings) {
</s> add func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *filtering.Settings) { </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/config.go |
ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features | <mask>
<mask> // Protection configuration
<mask> // --
<mask>
<mask> ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
<mask> BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
<mask> BlockingIPv4 net.IP `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
<mask> BlockingIPv6 net.IP `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
<mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ProtectionEnabled: true, // whether or not use any of dnsfilter features
</s> add ProtectionEnabled: true, // whether or not use any of filtering features </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove result *dnsfilter.Result
</s> add result *filtering.Result | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/config.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns.go |
setts *filtering.Settings | <mask> // *Server instead.
<mask> srv *Server
<mask> proxyCtx *proxy.DNSContext
<mask> // setts are the filtering settings for the client.
<mask> setts *dnsfilter.FilteringSettings
<mask> startTime time.Time
<mask> result *dnsfilter.Result
<mask> // origResp is the response received from upstream. It is set when the
<mask> // response is modified by filters.
<mask> origResp *dns.Msg
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns.go |
result *filtering.Result | <mask> proxyCtx *proxy.DNSContext
<mask> // setts are the filtering settings for the client.
<mask> setts *dnsfilter.FilteringSettings
<mask> startTime time.Time
<mask> result *dnsfilter.Result
<mask> // origResp is the response received from upstream. It is set when the
<mask> // response is modified by filters.
<mask> origResp *dns.Msg
<mask> // unreversedReqIP stores an IP address obtained from PTR request if it
<mask> // was successfully parsed.
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns.go |
result: &filtering.Result{}, | <mask> func (s *Server) handleDNSRequest(_ *proxy.Proxy, d *proxy.DNSContext) error {
<mask> ctx := &dnsContext{
<mask> srv: s,
<mask> proxyCtx: d,
<mask> result: &dnsfilter.Result{},
<mask> startTime: time.Now(),
<mask> }
<mask>
<mask> type modProcessFunc func(ctx *dnsContext) (rc resultCode)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove result: &dnsfilter.Result{
</s> add result: &filtering.Result{ </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns.go |
case filtering.Rewritten,
filtering.RewrittenRule: | <mask> res := ctx.result
<mask> var err error
<mask>
<mask> switch res.Reason {
<mask> case dnsfilter.Rewritten,
<mask> dnsfilter.RewrittenRule:
<mask>
<mask> if len(ctx.origQuestion.Name) == 0 {
<mask> // origQuestion is set in case we get only CNAME without IP from rewrites table
<mask> break
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return res.Reason == dnsfilter.NotFilteredAllowList
</s> add return res.Reason == filtering.NotFilteredAllowList </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns.go |
case filtering.NotFilteredAllowList: | <mask> answer = append(answer, d.Res.Answer...)
<mask> d.Res.Answer = answer
<mask> }
<mask>
<mask> case dnsfilter.NotFilteredAllowList:
<mask> // nothing
<mask>
<mask> default:
<mask> if !ctx.protectionEnabled || // filters are disabled: there's nothing to check for
<mask> !ctx.responseFromUpstream { // only check response if it's from an upstream server
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns.go |
ctx.result = &filtering.Result{} | <mask> }
<mask> if ctx.result != nil {
<mask> ctx.origResp = origResp2 // matched by response
<mask> } else {
<mask> ctx.result = &dnsfilter.Result{}
<mask> }
<mask> }
<mask>
<mask> return resultCodeSuccess
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove params.Result = &dnsfilter.Result{}
</s> add params.Result = &filtering.Result{} </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns_test.go |
s := createTestServer(t, &filtering.Config{}, ServerConfig{ | <mask> "251.252.253.254.in-addr.arpa.": {"host1.example.net."},
<mask> "1.1.168.192.in-addr.arpa.": {"some.local-client."},
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, ups)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{ups}
<mask> startDeferStop(t, s)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dns_test.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward.go |
dnsFilter *filtering.DNSFilter // DNS filter instance | <mask> //
<mask> // The zero Server is empty and ready for use.
<mask> type Server struct {
<mask> dnsProxy *proxy.Proxy // DNS proxy instance
<mask> dnsFilter *dnsfilter.DNSFilter // DNS filter instance
<mask> dhcpServer dhcpd.ServerInterface // DHCP server instance (optional)
<mask> queryLog querylog.QueryLog // Query log instance
<mask> stats stats.Stats
<mask> access *accessCtx
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filtering module
</s> add dnsFilter *filtering.DNSFilter // DNS filtering module </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove DNSFilter *dnsfilter.DNSFilter
</s> add DNSFilter *filtering.DNSFilter </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward.go |
DNSFilter *filtering.DNSFilter | <mask> const defaultLocalDomainSuffix = ".lan."
<mask>
<mask> // DNSCreateParams are parameters to create a new server.
<mask> type DNSCreateParams struct {
<mask> DNSFilter *dnsfilter.DNSFilter
<mask> Stats stats.Stats
<mask> QueryLog querylog.QueryLog
<mask> DHCPServer dhcpd.ServerInterface
<mask> SubnetDetector *aghnet.SubnetDetector
<mask> LocalDomain string
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filter instance
</s> add dnsFilter *filtering.DNSFilter // DNS filter instance </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
filterConf *filtering.Config, | <mask> }
<mask>
<mask> func createTestServer(
<mask> t *testing.T,
<mask> filterConf *dnsfilter.Config,
<mask> forwardConf ServerConfig,
<mask> localUps upstream.Upstream,
<mask> ) (s *Server) {
<mask> t.Helper()
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) {
</s> add func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) { </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
filters := []filtering.Filter{{ | <mask> ||null.example.org^
<mask> 127.0.0.1 host.example.org
<mask> @@||whitelist.example.org^
<mask> ||127.0.0.255`
<mask> filters := []dnsfilter.Filter{{
<mask> ID: 0, Data: []byte(rules),
<mask> }}
<mask>
<mask> f := dnsfilter.New(filterConf, filters)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
f := filtering.New(filterConf, filters) | <mask> filters := []dnsfilter.Filter{{
<mask> ID: 0, Data: []byte(rules),
<mask> }}
<mask>
<mask> f := dnsfilter.New(filterConf, filters)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s = createTestServer(t, &filtering.Config{}, ServerConfig{ | <mask>
<mask> var keyPem []byte
<mask> _, certPem, keyPem = createServerTLSConfig(t)
<mask>
<mask> s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask>
<mask> tlsConf.CertificateChainData, tlsConf.PrivateKeyData = certPem, keyPem
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, ServerConfig{ | <mask> }
<mask> }
<mask>
<mask> func TestServer(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, ServerConfig{ | <mask> }
<mask> }
<mask>
<mask> func TestServerWithProtectionDisabled(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
filterConf := &filtering.Config{ | <mask>
<mask> func TestServerRace(t *testing.T) {
<mask> t.Skip("TODO(e.burkov): inspect the golibs/cache package for locks")
<mask>
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
<mask> SafeBrowsingCacheSize: 1000,
<mask> SafeSearchEnabled: true,
<mask> SafeSearchCacheSize: 1000,
<mask> ParentalCacheSize: 1000,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
filterConf := &filtering.Config{ | <mask> }
<mask>
<mask> func TestSafeSearch(t *testing.T) {
<mask> resolver := &aghtest.TestResolver{}
<mask> filterConf := &dnsfilter.Config{
<mask> SafeSearchEnabled: true,
<mask> SafeSearchCacheSize: 1000,
<mask> CacheTime: 30,
<mask> CustomResolver: resolver,
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, ServerConfig{ | <mask> }
<mask> }
<mask>
<mask> func TestInvalidRequest(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask> startDeferStop(t, s)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Default blocking.
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> s.conf.GetCustomUpstreamByClient = func(_ string) *proxy.UpstreamConfig {
<mask> return &proxy.UpstreamConfig{
<mask> Upstreams: []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> IPv4: map[string][]net.IP{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, ServerConfig{ | <mask> "example.org.": {{127, 0, 0, 255}},
<mask> }
<mask>
<mask> func TestBlockCNAMEProtectionEnabled(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask> testUpstm := &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
<mask> IPv4: testIPv4,
<mask> },
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { | <mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
<mask> settings.FilteringEnabled = false
<mask> },
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | <mask> settings.FilteringEnabled = false
<mask> },
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
<mask> IPv4: testIPv4,
<mask> },
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | <mask> ProtectionEnabled: true,
<mask> BlockingMode: "null_ip",
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> startDeferStop(t, s)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Nil filter blocking.
<mask> req := dns.Msg{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
filters := []filtering.Filter{{ | <mask> }
<mask>
<mask> func TestBlockedCustomIP(t *testing.T) {
<mask> rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
<mask> filters := []dnsfilter.Filter{{
<mask> ID: 0,
<mask> Data: []byte(rules),
<mask> }}
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
DNSFilter: filtering.New(&filtering.Config{}, filters), | <mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> conf := &ServerConfig{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> startDeferStop(t, s)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Hosts blocking.
<mask> req := createTestMessage("host.example.org.")
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
filterConf := &filtering.Config{ | <mask> Block: true,
<mask> }
<mask> ans4, _ := (&aghtest.TestResolver{}).HostToIPs(hostname)
<mask>
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
<mask> }
<mask> forwardConf := ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ | <mask> assert.Equal(t, ans4, a.A, "dns server %s returned wrong answer: %v", addr, a.A)
<mask> }
<mask>
<mask> func TestRewrite(t *testing.T) {
<mask> c := &dnsfilter.Config{
<mask> Rewrites: []dnsfilter.RewriteEntry{{
<mask> Domain: "test.com",
<mask> Answer: "1.2.3.4",
<mask> Type: dns.TypeA,
<mask> }, {
<mask> Domain: "alias.test.com",
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove c := dnsfilter.Config{
</s> add c := filtering.Config{ </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
f := filtering.New(c, nil) | <mask> Answer: "example.org",
<mask> Type: dns.TypeCNAME,
<mask> }},
<mask> }
<mask> f := dnsfilter.New(c, nil)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
DNSFilter: filtering.New(&filtering.Config{}, nil), | <mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
<mask> DHCPServer: &testDHCP{},
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
c := filtering.Config{ | <mask> assert.Equal(t, "myhost.", ptr.Ptr)
<mask> }
<mask>
<mask> func TestPTRResponseFromHosts(t *testing.T) {
<mask> c := dnsfilter.Config{
<mask> EtcHosts: &aghnet.EtcHostsContainer{},
<mask> }
<mask>
<mask> // Prepare test hosts file.
<mask> hf, err := os.CreateTemp("", "")
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove c := dnsfilter.Config{}
</s> add c := filtering.Config{} </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
DNSFilter: filtering.New(&c, nil), | <mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: dnsfilter.New(&c, nil),
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> s.conf.UDPListenAddrs = []*net.UDPAddr{{}}
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "fmt"
<mask> "net"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite.go |
func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { | <mask> }
<mask>
<mask> // filterDNSRewrite handles dnsrewrite filters. It constructs a DNS
<mask> // response and sets it into d.Res.
<mask> func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
<mask> resp := s.makeResponse(req)
<mask> dnsrr := res.DNSRewriteResult
<mask> if dnsrr == nil {
<mask> return agherr.Error("no dns rewrite rule content")
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) {
</s> add func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) { </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> import (
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite_test.go |
makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res filtering.Result) {
resp := filtering.DNSRewriteResultResponse{ | <mask> Qtype: qtype,
<mask> }},
<mask> }
<mask> }
<mask> makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res dnsfilter.Result) {
<mask> resp := dnsfilter.DNSRewriteResultResponse{
<mask> rr: []rules.RRValue{v},
<mask> }
<mask> return dnsfilter.Result{
<mask> DNSRewriteResult: &dnsfilter.DNSRewriteResult{
<mask> RCode: rcode,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return dnsfilter.Result{
DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add return filtering.Result{
DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove Response: dnsfilter.DNSRewriteResultResponse{
</s> add Response: filtering.DNSRewriteResultResponse{ </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite_test.go |
return filtering.Result{
DNSRewriteResult: &filtering.DNSRewriteResult{ | <mask> makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res dnsfilter.Result) {
<mask> resp := dnsfilter.DNSRewriteResultResponse{
<mask> rr: []rules.RRValue{v},
<mask> }
<mask> return dnsfilter.Result{
<mask> DNSRewriteResult: &dnsfilter.DNSRewriteResult{
<mask> RCode: rcode,
<mask> Response: resp,
<mask> },
<mask> }
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res dnsfilter.Result) {
resp := dnsfilter.DNSRewriteResultResponse{
</s> add makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res filtering.Result) {
resp := filtering.DNSRewriteResultResponse{ </s> remove Response: dnsfilter.DNSRewriteResultResponse{
</s> add Response: filtering.DNSRewriteResultResponse{ </s> remove DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ </s> remove func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) {
</s> add func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite_test.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> import (
<mask> "fmt"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask>
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { | <mask> }
<mask>
<mask> // getClientRequestFilteringSettings looks up client filtering settings using
<mask> // the client's IP address and ID, if any, from ctx.
<mask> func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
<mask> setts := s.dnsFilter.GetConfig()
<mask> setts.FilteringEnabled = true
<mask> if s.conf.FilterHandler != nil {
<mask> s.conf.FilterHandler(IPFromAddr(ctx.proxyCtx.Addr), ctx.clientID, &setts)
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.FilteringSettings) {
</s> add func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *filtering.Settings) { </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { | <mask> }
<mask>
<mask> // filterDNSRequest applies the dnsFilter and sets d.Res if the request was
<mask> // filtered.
<mask> func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
<mask> d := ctx.proxyCtx
<mask> req := d.Req
<mask> host := strings.TrimSuffix(req.Question[0].Name, ".")
<mask> res, err := s.dnsFilter.CheckHost(host, req.Question[0].Qtype, ctx.setts)
<mask> if err != nil {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) | <mask> host := strings.TrimSuffix(req.Question[0].Name, ".")
<mask> res, err := s.dnsFilter.CheckHost(host, req.Question[0].Qtype, ctx.setts)
<mask> if err != nil {
<mask> // Return immediately if there's an error
<mask> return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
<mask> } else if res.IsFiltered {
<mask> log.Tracef("Host %s is filtered, reason - %q, matched rule: %q", host, res.Reason, res.Rules[0].Text)
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask> } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
<mask> res.CanonName != "" &&
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
} else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && | <mask> return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
<mask> } else if res.IsFiltered {
<mask> log.Tracef("Host %s is filtered, reason - %q, matched rule: %q", host, res.Reason, res.Rules[0].Text)
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask> } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
<mask> res.CanonName != "" &&
<mask> len(res.IPList) == 0 {
<mask> // Resolve the new canonical name, not the original host
<mask> // name. The original question is readded in
<mask> // processFilteringAfterResponse.
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
} else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { | <mask> // name. The original question is readded in
<mask> // processFilteringAfterResponse.
<mask> ctx.origQuestion = req.Question[0]
<mask> req.Question[0].Name = dns.Fqdn(res.CanonName)
<mask> } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
<mask> resp := s.makeResponse(req)
<mask> for _, h := range res.ReverseHosts {
<mask> hdr := dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypePTR,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove case dnsfilter.Rewritten,
dnsfilter.RewrittenRule:
</s> add case filtering.Rewritten,
filtering.RewrittenRule: </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
} else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { | <mask> resp.Answer = append(resp.Answer, ptr)
<mask> }
<mask>
<mask> d.Res = resp
<mask> } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
<mask> resp := s.makeResponse(req)
<mask>
<mask> name := host
<mask> if len(res.CanonName) != 0 {
<mask> resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName))
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && </s> remove ctx.result = &dnsfilter.Result{}
</s> add ctx.result = &filtering.Result{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
} else if res.Reason == filtering.RewrittenRule { | <mask> }
<mask> }
<mask>
<mask> d.Res = resp
<mask> } else if res.Reason == dnsfilter.RewrittenRule {
<mask> err = s.filterDNSRewrite(req, res, d)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { | <mask> }
<mask>
<mask> // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
<mask> // If this is a match, we set a new response in d.Res and return.
<mask> func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
<mask> d := ctx.proxyCtx
<mask> for _, a := range d.Res.Answer {
<mask> host := ""
<mask>
<mask> switch v := a.(type) {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "path/filepath"
<mask> "strings"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func loadTestData(t *testing.T, casesFileName string, cases interface{}) {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/http_test.go |
filterConf := &filtering.Config{ | <mask>
<mask> const jsonExt = ".json"
<mask>
<mask> func TestDNSForwardHTTTP_handleGetConfig(t *testing.T) {
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
<mask> SafeBrowsingCacheSize: 1000,
<mask> SafeSearchEnabled: true,
<mask> SafeSearchCacheSize: 1000,
<mask> ParentalCacheSize: 1000,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/http_test.go |
filterConf := &filtering.Config{ | <mask> }
<mask> }
<mask>
<mask> func TestDNSForwardHTTTP_handleSetConfig(t *testing.T) {
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
<mask> SafeBrowsingCacheSize: 1000,
<mask> SafeSearchEnabled: true,
<mask> SafeSearchCacheSize: 1000,
<mask> ParentalCacheSize: 1000,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/http_test.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> import (
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { | <mask> return resp
<mask> }
<mask>
<mask> // genDNSFilterMessage generates a DNS message corresponding to the filtering result
<mask> func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
<mask> m := d.Req
<mask>
<mask> if m.Question[0].Qtype != dns.TypeA && m.Question[0].Qtype != dns.TypeAAAA {
<mask> if s.conf.BlockingMode == "null_ip" {
<mask> return s.makeResponse(m)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove result *dnsfilter.Result
</s> add result *filtering.Result | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
case filtering.FilteredSafeBrowsing: | <mask> return s.genNXDomain(m)
<mask> }
<mask>
<mask> switch result.Reason {
<mask> case dnsfilter.FilteredSafeBrowsing:
<mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
<mask> case dnsfilter.FilteredParental:
<mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
<mask> default:
<mask> // If the query was filtered by "Safe search", dnsfilter also must return
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove dnsfilter.FilteredBlockList,
dnsfilter.FilteredBlockedService,
dnsfilter.NotFilteredAllowList,
</s> add filtering.FilteredBlockList,
filtering.FilteredBlockedService,
filtering.NotFilteredAllowList, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
case filtering.FilteredParental: | <mask>
<mask> switch result.Reason {
<mask> case dnsfilter.FilteredSafeBrowsing:
<mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
<mask> case dnsfilter.FilteredParental:
<mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
<mask> default:
<mask> // If the query was filtered by "Safe search", dnsfilter also must return
<mask> // the IP address that must be used in response.
<mask> // In this case regardless of the filtering method, we should return it
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove result *dnsfilter.Result
</s> add result *filtering.Result | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
// If the query was filtered by "Safe search", filtering also must return | <mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
<mask> case dnsfilter.FilteredParental:
<mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
<mask> default:
<mask> // If the query was filtered by "Safe search", dnsfilter also must return
<mask> // the IP address that must be used in response.
<mask> // In this case regardless of the filtering method, we should return it
<mask> if result.Reason == dnsfilter.FilteredSafeSearch &&
<mask> len(result.Rules) > 0 &&
<mask> result.Rules[0].IP != nil {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
if result.Reason == filtering.FilteredSafeSearch && | <mask> default:
<mask> // If the query was filtered by "Safe search", dnsfilter also must return
<mask> // the IP address that must be used in response.
<mask> // In this case regardless of the filtering method, we should return it
<mask> if result.Reason == dnsfilter.FilteredSafeSearch &&
<mask> len(result.Rules) > 0 &&
<mask> result.Rules[0].IP != nil {
<mask> return s.genResponseWithIP(m, result.Rules[0].IP)
<mask> }
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove result *dnsfilter.Result
</s> add result *filtering.Result | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> import (
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) { | <mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) {
<mask> if s.stats == nil {
<mask> return
<mask> }
<mask>
<mask> pctx := ctx.proxyCtx
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove ctx.result = &dnsfilter.Result{}
</s> add ctx.result = &filtering.Result{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.