docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
require.NoError(t, err) | <mask> }}
<mask>
<mask> for i := range dynLeases {
<mask> err = s.addLease(&dynLeases[i])
<mask> require.Nil(t, err)
<mask> }
<mask>
<mask> stLeases := []Lease{{
<mask> IP: net.IP{192, 168, 10, 150},
<mask> HWAddr: net.HardwareAddr{0x33, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ </s> remove }))
</s> add })
assert.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
err = s.AddStaticLease(l)
require.NoError(t, err) | <mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }}
<mask>
<mask> for _, l := range stLeases {
<mask> require.Nil(t, s.AddStaticLease(l))
<mask> }
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> require.Len(t, ls, 2)
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) </s> remove }))
</s> add })
assert.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.NoError(t, err) | <mask> GatewayIP: net.IP{192, 168, 10, 1},
<mask> SubnetMask: net.IP{255, 255, 255, 0},
<mask> notify: notify4,
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> s, ok := sIface.(*v4Server)
<mask> require.True(t, ok)
<mask> s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}}
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Len(t, ls, 1)
</s> add require.Len(t, ls, 1)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
err = s.AddStaticLease(l)
require.NoError(t, err) | <mask> l := Lease{
<mask> IP: net.IP{192, 168, 10, 150},
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask> require.Nil(t, s.AddStaticLease(l))
<mask>
<mask> var req, resp *dhcpv4.DHCPv4
<mask> mac := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
<mask>
<mask> t.Run("discover", func(t *testing.T) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) | <mask> var req, resp *dhcpv4.DHCPv4
<mask> mac := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
<mask>
<mask> t.Run("discover", func(t *testing.T) {
<mask> var terr error
<mask>
<mask> req, terr = dhcpv4.NewDiscovery(mac)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) | <mask>
<mask> t.Run("discover", func(t *testing.T) {
<mask> var terr error
<mask>
<mask> req, terr = dhcpv4.NewDiscovery(mac)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
<mask>
<mask> req, terr = dhcpv4.NewDiscovery(mac)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("offer", func(t *testing.T) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go | |
// Don't continue if we got any errors in the previous subtest.
require.NoError(t, err) | <mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("offer", func(t *testing.T) {
<mask> assert.Equal(t, dhcpv4.MessageTypeOffer, resp.MessageType())
<mask> assert.Equal(t, mac, resp.ClientHWAddr)
<mask> assert.True(t, l.IP.Equal(resp.YourIPAddr))
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.NoError(t, err) | <mask> })
<mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> req, err = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.NoError(t, err)
| <mask> req, err = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("ack", func(t *testing.T) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.NoError(t, err) | <mask> resp, err = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("ack", func(t *testing.T) {
<mask> assert.Equal(t, dhcpv4.MessageTypeAck, resp.MessageType())
<mask> assert.Equal(t, mac, resp.ClientHWAddr)
<mask> assert.True(t, l.IP.Equal(resp.YourIPAddr))
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add // Don't continue if we got any errors in the previous subtest.
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.NoError(t, err) | <mask> "81 hex 303132",
<mask> "82 ip 1.2.3.4",
<mask> },
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> s, ok := sIface.(*v4Server)
<mask> require.True(t, ok)
<mask> s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}}
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} </s> remove m[l.IP.String()] = lowhost
</s> add lowhost := strings.ToLower(l.Hostname) </s> remove ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
}
</s> add ipToHost[l.IP.String()] = lowhost | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.NoError(t, err) | <mask> mac := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
<mask>
<mask> t.Run("discover", func(t *testing.T) {
<mask> req, err = dhcpv4.NewDiscovery(mac)
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.NoError(t, err)
| <mask> req, err = dhcpv4.NewDiscovery(mac)
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask>
<mask> // Don't continue if we got any errors in the previous subtest.
<mask> require.Nil(t, err)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add // Don't continue if we got any errors in the previous subtest.
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.NoError(t, err) | <mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask>
<mask> // Don't continue if we got any errors in the previous subtest.
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("offer", func(t *testing.T) {
<mask> assert.Equal(t, dhcpv4.MessageTypeOffer, resp.MessageType())
<mask> assert.Equal(t, mac, resp.ClientHWAddr)
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add // Don't continue if we got any errors in the previous subtest.
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) | <mask> assert.Equal(t, net.IP{1, 2, 3, 4}, net.IP(resp.RelayAgentInfo().ToBytes()))
<mask> })
<mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> var terr error
<mask>
<mask> req, terr = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) | <mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> var terr error
<mask>
<mask> req, terr = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
<mask>
<mask> req, terr = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("ack", func(t *testing.T) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go | |
require.NoError(t, err) | <mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("ack", func(t *testing.T) {
<mask> assert.Equal(t, dhcpv4.MessageTypeAck, resp.MessageType())
<mask> assert.Equal(t, mac, resp.ClientHWAddr)
<mask> assert.True(t, s.conf.RangeStart.Equal(resp.YourIPAddr))
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add // Don't continue if we got any errors in the previous subtest.
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
require.Len(t, ls, 1)
| <mask>
<mask> // check lease
<mask> t.Run("check_lease", func(t *testing.T) {
<mask> ls := s.GetLeases(LeasesDynamic)
<mask> assert.Len(t, ls, 1)
<mask> assert.True(t, net.IP{192, 168, 10, 100}.Equal(ls[0].IP))
<mask> assert.Equal(t, mac, ls[0].HWAddr)
<mask> })
<mask> }
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
func (s *Server) setTableHostToIP(t hostToIPTable) {
s.tableHostToIPLock.Lock()
defer s.tableHostToIPLock.Unlock()
s.tableHostToIP = t
}
func (s *Server) setTableIPToHost(t ipToHostTable) {
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock()
s.tableIPToHost = t
}
| <mask> }
<mask> return true
<mask> }
<mask>
<mask> func (s *Server) onDHCPLeaseChanged(flags int) {
<mask> add := true
<mask> switch flags {
<mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove //
</s> add // Go on.
case dhcpd.LeaseChangedRemovedAll:
add = false </s> remove clients.addFromDHCP()
</s> add clients.updateFromDHCP(true)
case dhcpd.LeaseChangedRemovedAll:
clients.updateFromDHCP(false) </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
add := true | <mask>
<mask> func (s *Server) onDHCPLeaseChanged(flags int) {
<mask> switch flags {
<mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
<mask> // Go on.
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove //
</s> add // Go on.
case dhcpd.LeaseChangedRemovedAll:
add = false </s> remove clients.addFromDHCP()
</s> add clients.updateFromDHCP(true)
case dhcpd.LeaseChangedRemovedAll:
clients.updateFromDHCP(false) </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
// Go on.
case dhcpd.LeaseChangedRemovedAll:
add = false | <mask> switch flags {
<mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
<mask> //
<mask> default:
<mask> return
<mask> }
<mask>
<mask> hostToIP := make(map[string]net.IP)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove clients.addFromDHCP()
</s> add clients.updateFromDHCP(true)
case dhcpd.LeaseChangedRemovedAll:
clients.updateFromDHCP(false) </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) | <mask> default:
<mask> return
<mask> }
<mask>
<mask> hostToIP := make(map[string]net.IP)
<mask> m := make(map[string]string)
<mask>
<mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
<mask>
<mask> for _, l := range ll {
<mask> if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
<mask> continue
<mask> }
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove //
</s> add // Go on.
case dhcpd.LeaseChangedRemovedAll:
add = false </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
ll := s.dhcpServer.Leases(dhcpd.LeasesAll) | <mask> m := make(map[string]string)
<mask>
<mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
<mask>
<mask> for _, l := range ll {
<mask> if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
<mask> continue
<mask> }
<mask>
<mask> lowhost := strings.ToLower(l.Hostname)
<mask>
<mask> m[l.IP.String()] = lowhost
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) </s> remove m[l.IP.String()] = lowhost
</s> add lowhost := strings.ToLower(l.Hostname) </s> remove ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
}
</s> add ipToHost[l.IP.String()] = lowhost | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} | <mask> if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
<mask> continue
<mask> }
<mask>
<mask> lowhost := strings.ToLower(l.Hostname)
<mask>
<mask> m[l.IP.String()] = lowhost
<mask>
<mask> ip := make(net.IP, 4)
<mask> copy(ip, l.IP.To4())
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove m[l.IP.String()] = lowhost
</s> add lowhost := strings.ToLower(l.Hostname) </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
}
</s> add ipToHost[l.IP.String()] = lowhost </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
lowhost := strings.ToLower(l.Hostname) | <mask> }
<mask>
<mask> lowhost := strings.ToLower(l.Hostname)
<mask>
<mask> m[l.IP.String()] = lowhost
<mask>
<mask> ip := make(net.IP, 4)
<mask> copy(ip, l.IP.To4())
<mask> hostToIP[lowhost] = ip
<mask> }
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
}
</s> add ipToHost[l.IP.String()] = lowhost </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
ipToHost[l.IP.String()] = lowhost | <mask> lowhost := strings.ToLower(l.Hostname)
<mask>
<mask> m[l.IP.String()] = lowhost
<mask>
<mask> ip := make(net.IP, 4)
<mask> copy(ip, l.IP.To4())
<mask> hostToIP[lowhost] = ip
<mask> }
<mask>
<mask> log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
<mask>
<mask> s.tableHostToIPLock.Lock()
<mask> s.tableHostToIP = hostToIP
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} </s> remove m[l.IP.String()] = lowhost
</s> add lowhost := strings.ToLower(l.Hostname) </s> remove s.tableHostToIPLock.Lock()
s.tableHostToIP = hostToIP
s.tableHostToIPLock.Unlock()
</s> add log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost))
} </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} | <mask> copy(ip, l.IP.To4())
<mask> hostToIP[lowhost] = ip
<mask> }
<mask>
<mask> log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
<mask>
<mask> s.tableHostToIPLock.Lock()
<mask> s.tableHostToIP = hostToIP
<mask> s.tableHostToIPLock.Unlock()
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
}
</s> add ipToHost[l.IP.String()] = lowhost </s> remove s.tableHostToIPLock.Lock()
s.tableHostToIP = hostToIP
s.tableHostToIPLock.Unlock()
</s> add log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost))
} </s> remove m[l.IP.String()] = lowhost
</s> add lowhost := strings.ToLower(l.Hostname) </s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost))
} | <mask> }
<mask>
<mask> log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
<mask>
<mask> s.tableHostToIPLock.Lock()
<mask> s.tableHostToIP = hostToIP
<mask> s.tableHostToIPLock.Unlock()
<mask>
<mask> s.tablePTRLock.Lock()
<mask> s.tablePTR = m
<mask> s.tablePTRLock.Unlock()
<mask> }
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} </s> remove ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
}
</s> add ipToHost[l.IP.String()] = lowhost </s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) | <mask> s.tableHostToIPLock.Lock()
<mask> s.tableHostToIP = hostToIP
<mask> s.tableHostToIPLock.Unlock()
<mask>
<mask> s.tablePTRLock.Lock()
<mask> s.tablePTR = m
<mask> s.tablePTRLock.Unlock()
<mask> }
<mask>
<mask> // processDetermineLocal determines if the client's IP address is from
<mask> // locally-served network and saves the result into the context.
<mask> func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove s.tableHostToIPLock.Lock()
s.tableHostToIP = hostToIP
s.tableHostToIPLock.Unlock()
</s> add log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost))
} </s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() | <mask>
<mask> // ipToHost tries to get a hostname leased by DHCP. It's safe for concurrent
<mask> // use.
<mask> func (s *Server) ipToHost(ip net.IP) (host string, ok bool) {
<mask> s.tablePTRLock.Lock()
<mask> defer s.tablePTRLock.Unlock()
<mask>
<mask> if s.tablePTR == nil {
<mask> return "", false
<mask> }
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
if s.tableIPToHost == nil { | <mask> func (s *Server) ipToHost(ip net.IP) (host string, ok bool) {
<mask> s.tablePTRLock.Lock()
<mask> defer s.tablePTRLock.Unlock()
<mask>
<mask> if s.tablePTR == nil {
<mask> return "", false
<mask> }
<mask>
<mask> host, ok = s.tablePTR[ip.String()]
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() </s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
host, ok = s.tableIPToHost[ip.String()] | <mask> if s.tablePTR == nil {
<mask> return "", false
<mask> }
<mask>
<mask> host, ok = s.tablePTR[ip.String()]
<mask>
<mask> return host, ok
<mask> }
<mask>
<mask> // Respond to PTR requests if the target IP is leased by our DHCP server and the
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() </s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
tableHostToIP: hostToIPTable{ | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s := &Server{
<mask> autohostSuffix: defaultAutohostSuffix,
<mask> tableHostToIP: map[string]net.IP{
<mask> "example": knownIP,
<mask> },
<mask> }
<mask>
<mask> req := &dns.Msg{
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns_test.go |
tableHostToIP: hostToIPTable{ | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s := &Server{
<mask> autohostSuffix: tc.suffix,
<mask> tableHostToIP: map[string]net.IP{
<mask> "example": knownIP,
<mask> },
<mask> }
<mask>
<mask> req := &dns.Msg{
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns_test.go |
// hostToIPTable is an alias for the type of Server.tableHostToIP.
type hostToIPTable = map[string]net.IP
// ipToHostTable is an alias for the type of Server.tableIPToHost.
//
// TODO(a.garipov): Define an IPMap type in aghnet and use here and in other
// places?
type ipToHostTable = map[string]string
| <mask> var defaultBlockedHosts = []string{"version.bind", "id.server", "hostname.bind"}
<mask>
<mask> var webRegistered bool
<mask>
<mask> // Server is the main way to start a DNS server.
<mask> //
<mask> // Example:
<mask> // s := dnsforward.Server{}
<mask> // err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
<mask> // err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove tablePTR map[string]string // "IP -> hostname" table for reverse lookup
tablePTRLock sync.Mutex
</s> add tableIPToHost ipToHostTable
tableIPToHostLock sync.Mutex </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dnsforward.go |
tableHostToIP hostToIPTable | <mask> ipset ipsetCtx
<mask> subnetDetector *aghnet.SubnetDetector
<mask> localResolvers *proxy.Proxy
<mask>
<mask> tableHostToIP map[string]net.IP // "hostname -> IP" table for internal addresses (DHCP)
<mask> tableHostToIPLock sync.Mutex
<mask>
<mask> tablePTR map[string]string // "IP -> hostname" table for reverse lookup
<mask> tablePTRLock sync.Mutex
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove tablePTR map[string]string // "IP -> hostname" table for reverse lookup
tablePTRLock sync.Mutex
</s> add tableIPToHost ipToHostTable
tableIPToHostLock sync.Mutex </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dnsforward.go |
tableIPToHost ipToHostTable
tableIPToHostLock sync.Mutex | <mask>
<mask> tableHostToIP map[string]net.IP // "hostname -> IP" table for internal addresses (DHCP)
<mask> tableHostToIPLock sync.Mutex
<mask>
<mask> tablePTR map[string]string // "IP -> hostname" table for reverse lookup
<mask> tablePTRLock sync.Mutex
<mask>
<mask> // DNS proxy instance for internal usage
<mask> // We don't Start() it and so no listen port is required.
<mask> internalProxy *proxy.Proxy
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove tableHostToIP map[string]net.IP // "hostname -> IP" table for internal addresses (DHCP)
</s> add tableHostToIP hostToIPTable </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dnsforward.go |
clients.updateFromDHCP(true) | <mask> clients.etcHosts = etcHosts
<mask> clients.addFromConfig(objects)
<mask>
<mask> if !clients.testing {
<mask> clients.addFromDHCP()
<mask> if clients.dhcpServer != nil {
<mask> clients.dhcpServer.SetOnLeaseChanged(clients.onDHCPLeaseChanged)
<mask> }
<mask> if clients.etcHosts != nil {
<mask> clients.etcHosts.SetOnChanged(clients.onHostsChanged)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
clients.updateFromDHCP(true)
case dhcpd.LeaseChangedRemovedAll:
clients.updateFromDHCP(false) | <mask> switch flags {
<mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
<mask> clients.addFromDHCP()
<mask> }
<mask> }
<mask>
<mask> func (clients *clientsContainer) onHostsChanged() {
<mask> clients.addFromHostsFile()
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove //
</s> add // Go on.
case dhcpd.LeaseChangedRemovedAll:
add = false </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
// updateFromDHCP adds the clients that have a non-empty hostname from the DHCP | <mask>
<mask> log.Debug("clients: added %d client aliases from 'arp -a' command output", n)
<mask> }
<mask>
<mask> // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
<mask> // server.
<mask> func (clients *clientsContainer) addFromDHCP() {
<mask> if clients.dhcpServer == nil {
<mask> return
<mask> }
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove s.tableHostToIPLock.Lock()
s.tableHostToIP = hostToIP
s.tableHostToIPLock.Unlock()
</s> add log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
func (clients *clientsContainer) updateFromDHCP(add bool) { | <mask> }
<mask>
<mask> // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
<mask> // server.
<mask> func (clients *clientsContainer) addFromDHCP() {
<mask> if clients.dhcpServer == nil {
<mask> return
<mask> }
<mask>
<mask> clients.lock.Lock()
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
if !add {
return
}
| <mask> clients.rmHostsBySrc(ClientSourceDHCP)
<mask>
<mask> leases := clients.dhcpServer.Leases(dhcpd.LeasesAll)
<mask> n := 0
<mask> for _, l := range leases {
<mask> if l.Hostname == "" {
<mask> continue
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
// errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" | <mask> return filepath.Join(dataDir, filterDir, strconv.FormatInt(filter.ID, 10)+".txt")
<mask> }
<mask>
<mask> const (
<mask> statusFound = 1 << iota
<mask> statusEnabledChanged
<mask> statusURLChanged
<mask> statusURLExists
<mask> statusUpdateRequired
<mask> )
<mask>
<mask> // Update properties for a filter specified by its URL
<mask> // Return status* flags.
<mask> func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove // refreshFilters updates the lists and returns the number of updated ones.
// It's safe for concurrent use, but blocks at least until the previous
// refreshing is finished.
func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
d.refreshLock.Lock()
defer d.refreshLock.Unlock()
updated, _ = d.refreshFiltersIntl(block, allow, force)
return updated
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
// filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { | <mask> statusURLExists
<mask> statusUpdateRequired
<mask> )
<mask>
<mask> // Update properties for a filter specified by its URL
<mask> // Return status* flags.
<mask> func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
<mask> r := 0
<mask> d.filtersMu.Lock()
<mask> defer d.filtersMu.Unlock()
<mask>
<mask> filters := d.Filters
<mask> if whitelist {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" </s> remove if whitelist {
</s> add if isAllowlist { </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove return r | statusFound
</s> add return shouldRestart, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
if isAllowlist { | <mask> d.filtersMu.Lock()
<mask> defer d.filtersMu.Unlock()
<mask>
<mask> filters := d.Filters
<mask> if whitelist {
<mask> filters = d.WhitelistFilters
<mask> }
<mask>
<mask> i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
<mask> return filt.URL == url
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove return 0
</s> add return false, errFilterNotExist </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | <mask> if whitelist {
<mask> filters = d.WhitelistFilters
<mask> }
<mask>
<mask> i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
<mask> return filt.URL == url
<mask> })
<mask> if i == -1 {
<mask> return 0
<mask> }
<mask>
<mask> filt := &filters[i]
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove return 0
</s> add return false, errFilterNotExist </s> remove if whitelist {
</s> add if isAllowlist { </s> remove log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name
</s> add filt.Name = newList.Name </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
return false, errFilterNotExist | <mask> i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
<mask> return filt.URL == url
<mask> })
<mask> if i == -1 {
<mask> return 0
<mask> }
<mask>
<mask> filt := &filters[i]
<mask>
<mask> log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name
</s> add filt.Name = newList.Name </s> remove if filt.URL != newf.URL {
r |= statusURLChanged | statusUpdateRequired
if d.filterExistsNoLock(newf.URL) {
return statusURLExists
</s> add if filt.URL != newList.URL {
if d.filterExistsLocked(newList.URL) {
return false, errFilterExists </s> remove if whitelist {
</s> add if isAllowlist { </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
filt.Name = newList.Name | <mask> }
<mask>
<mask> filt := &filters[i]
<mask>
<mask> log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
<mask> filt.Name = newf.Name
<mask>
<mask> if filt.URL != newf.URL {
<mask> r |= statusURLChanged | statusUpdateRequired
<mask> if d.filterExistsNoLock(newf.URL) {
<mask> return statusURLExists
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove if filt.URL != newf.URL {
r |= statusURLChanged | statusUpdateRequired
if d.filterExistsNoLock(newf.URL) {
return statusURLExists
</s> add if filt.URL != newList.URL {
if d.filterExistsLocked(newList.URL) {
return false, errFilterExists </s> remove return 0
</s> add return false, errFilterNotExist </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
if filt.URL != newList.URL {
if d.filterExistsLocked(newList.URL) {
return false, errFilterExists | <mask>
<mask> log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
<mask> filt.Name = newf.Name
<mask>
<mask> if filt.URL != newf.URL {
<mask> r |= statusURLChanged | statusUpdateRequired
<mask> if d.filterExistsNoLock(newf.URL) {
<mask> return statusURLExists
<mask> }
<mask>
<mask> filt.URL = newf.URL
<mask> filt.unload()
<mask> filt.LastUpdated = time.Time{}
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name
</s> add filt.Name = newList.Name </s> remove return 0
</s> add return false, errFilterNotExist </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
shouldRestart = true
filt.URL = newList.URL | <mask> if d.filterExistsNoLock(newf.URL) {
<mask> return statusURLExists
<mask> }
<mask>
<mask> filt.URL = newf.URL
<mask> filt.unload()
<mask> filt.LastUpdated = time.Time{}
<mask> filt.checksum = 0
<mask> filt.RulesCount = 0
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove if filt.URL != newf.URL {
r |= statusURLChanged | statusUpdateRequired
if d.filterExistsNoLock(newf.URL) {
return statusURLExists
</s> add if filt.URL != newList.URL {
if d.filterExistsLocked(newList.URL) {
return false, errFilterExists </s> remove log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name
</s> add filt.Name = newList.Name </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) | <mask>
<mask> filt.URL = newf.URL
<mask> filt.unload()
<mask> filt.LastUpdated = time.Time{}
<mask> filt.checksum = 0
<mask> filt.RulesCount = 0
<mask> }
<mask>
<mask> if filt.Enabled != newf.Enabled {
<mask> r |= statusEnabledChanged
<mask> filt.Enabled = newf.Enabled
<mask> if filt.Enabled {
<mask> if (r & statusURLChanged) == 0 {
<mask> err := d.load(filt)
<mask> if err != nil {
<mask> // TODO(e.burkov): It seems the error is only returned when
<mask> // the file exists and couldn't be open. Investigate and
<mask> // improve.
<mask> log.Error("loading filter %d: %s", filt.ID, err)
<mask>
<mask> filt.LastUpdated = time.Time{}
<mask> filt.checksum = 0
<mask> filt.RulesCount = 0
<mask> r |= statusUpdateRequired
<mask> }
<mask> }
<mask> } else {
<mask> filt.unload()
<mask> }
<mask> }
<mask>
<mask> return r | statusFound
<mask> }
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL </s> remove if filt.URL != newf.URL {
r |= statusURLChanged | statusUpdateRequired
if d.filterExistsNoLock(newf.URL) {
return statusURLExists
</s> add if filt.URL != newList.URL {
if d.filterExistsLocked(newList.URL) {
return false, errFilterExists </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add </s> remove log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name
</s> add filt.Name = newList.Name </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
} else {
// TODO(e.burkov): The validation of the contents of the new URL is
// currently skipped if the rule list is disabled. This makes it
// possible to set a bad rules source, but the validation should still
// kick in when the filter is enabled. Consider making changing this
// behavior to be stricter.
filt.unload() | <mask> // Download the filter contents.
<mask> shouldRestart, err = d.update(filt)
<mask> }
<mask> }
<mask>
<mask> return shouldRestart, err
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove filt.ID = assignUniqueFilterID()
</s> add </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
return shouldRestart, err | <mask> filt.unload()
<mask> }
<mask> }
<mask>
<mask> return r | statusFound
<mask> }
<mask>
<mask> // Return TRUE if a filter with this URL exists
<mask> func (d *DNSFilter) filterExists(url string) bool {
<mask> d.filtersMu.RLock()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
// filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { | <mask>
<mask> return r | statusFound
<mask> }
<mask>
<mask> // Return TRUE if a filter with this URL exists
<mask> func (d *DNSFilter) filterExists(url string) bool {
<mask> d.filtersMu.RLock()
<mask> defer d.filtersMu.RUnlock()
<mask>
<mask> r := d.filterExistsNoLock(url)
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
r := d.filterExistsLocked(url) | <mask> func (d *DNSFilter) filterExists(url string) bool {
<mask> d.filtersMu.RLock()
<mask> defer d.filtersMu.RUnlock()
<mask>
<mask> r := d.filterExistsNoLock(url)
<mask>
<mask> return r
<mask> }
<mask>
<mask> func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove // refreshFilters updates the lists and returns the number of updated ones.
// It's safe for concurrent use, but blocks at least until the previous
// refreshing is finished.
func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
d.refreshLock.Lock()
defer d.refreshLock.Unlock()
updated, _ = d.refreshFiltersIntl(block, allow, force)
return updated
}
</s> add </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
// filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { | <mask>
<mask> return r
<mask> }
<mask>
<mask> func (d *DNSFilter) filterExistsNoLock(url string) bool {
<mask> for _, f := range d.Filters {
<mask> if f.URL == url {
<mask> return true
<mask> }
<mask> }
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove if whitelist {
</s> add if isAllowlist { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
if d.filterExistsLocked(flt.URL) { | <mask> d.filtersMu.Lock()
<mask> defer d.filtersMu.Unlock()
<mask>
<mask> // Check for duplicates
<mask> if d.filterExistsNoLock(flt.URL) {
<mask> return false
<mask> }
<mask>
<mask> if flt.white {
<mask> d.WhitelistFilters = append(d.WhitelistFilters, flt)
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove if whitelist {
</s> add if isAllowlist { </s> remove log.Debug("checking list at index %d: %v", i, flt)
</s> add </s> remove //
</s> add // Continue removing. </s> remove // remove all pending tasks
stop := false
for !stop {
</s> add // Remove all pending tasks.
removeLoop:
for { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
<mask>
<mask> return updated, isNetworkErr, ok
<mask> }
<mask>
<mask> // refreshFilters updates the lists and returns the number of updated ones.
<mask> // It's safe for concurrent use, but blocks at least until the previous
<mask> // refreshing is finished.
<mask> func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
<mask> d.refreshLock.Lock()
<mask> defer d.refreshLock.Unlock()
<mask>
<mask> updated, _ = d.refreshFiltersIntl(block, allow, force)
<mask>
<mask> return updated
<mask> }
<mask>
<mask> // listsToUpdate returns the slice of filter lists that could be updated.
<mask> func (d *DNSFilter) listsToUpdate(filters *[]FilterYAML, force bool) (toUpd []FilterYAML) {
<mask> now := time.Now()
<mask>
<mask> d.filtersMu.RLock()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go | |
<mask> defer d.filtersMu.RUnlock()
<mask>
<mask> for i := range *filters {
<mask> flt := &(*filters)[i] // otherwise we will be operating on a copy
<mask> log.Debug("checking list at index %d: %v", i, flt)
<mask>
<mask> if !flt.Enabled {
<mask> continue
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove if whitelist {
</s> add if isAllowlist { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go | |
"net/netip" | <mask> import (
<mask> "io/fs"
<mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "path/filepath"
<mask> "testing"
<mask> "time"
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove "path"
</s> add </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
<mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/netutil"
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove log.Debug("checking list at index %d: %v", i, flt)
</s> add </s> remove // refreshFilters updates the lists and returns the number of updated ones.
// It's safe for concurrent use, but blocks at least until the previous
// refreshing is finished.
func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
d.refreshLock.Lock()
defer d.refreshLock.Unlock()
updated, _ = d.refreshFiltersIntl(block, allow, force)
return updated
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go | |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "path/filepath"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove "path"
</s> add </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
// serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { | <mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> const testFltsFileName = "1.txt"
<mask>
<mask> func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
<mask> t.Helper()
<mask>
<mask> h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
<mask> n, werr := w.Write(*fltContent)
<mask> require.NoError(t, werr)
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove var err error
l, err = net.Listen("tcp", ":0")
</s> add l, err := net.Listen("tcp", ":0") </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) | <mask> func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
<mask> t.Helper()
<mask>
<mask> h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
<mask> n, werr := w.Write(*fltContent)
<mask> require.NoError(t, werr)
<mask> require.Equal(t, len(*fltContent), n)
<mask> })
<mask>
<mask> var err error
<mask> l, err = net.Listen("tcp", ":0")
<mask> require.NoError(t, err)
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove var err error
l, err = net.Listen("tcp", ":0")
</s> add l, err := net.Listen("tcp", ":0") </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove go func() {
_ = http.Serve(l, h)
}()
</s> add go func() { _ = http.Serve(l, h) }() </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) </s> remove Host: (&netutil.IPPort{
IP: net.IP{127, 0, 0, 1},
Port: l.Addr().(*net.TCPAddr).Port,
}).String(),
Path: path.Join(filterDir, testFltsFileName),
</s> add Host: addr.String(), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
l, err := net.Listen("tcp", ":0") | <mask> require.NoError(t, werr)
<mask> require.Equal(t, len(*fltContent), n)
<mask> })
<mask>
<mask> var err error
<mask> l, err = net.Listen("tcp", ":0")
<mask> require.NoError(t, err)
<mask>
<mask> go func() {
<mask> _ = http.Serve(l, h)
<mask> }()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove go func() {
_ = http.Serve(l, h)
}()
</s> add go func() { _ = http.Serve(l, h) }() </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
go func() { _ = http.Serve(l, h) }() | <mask> var err error
<mask> l, err = net.Listen("tcp", ":0")
<mask> require.NoError(t, err)
<mask>
<mask> go func() {
<mask> _ = http.Serve(l, h)
<mask> }()
<mask> testutil.CleanupAndRequireSuccess(t, l.Close)
<mask>
<mask> return l
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove var err error
l, err = net.Listen("tcp", ":0")
</s> add l, err := net.Listen("tcp", ":0") </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) | <mask> _ = http.Serve(l, h)
<mask> }()
<mask> testutil.CleanupAndRequireSuccess(t, l.Close)
<mask>
<mask> return l
<mask> }
<mask>
<mask> func TestFilters(t *testing.T) {
<mask> const content = `||example.org^$third-party
<mask> # Inline comment example
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove go func() {
_ = http.Serve(l, h)
}()
</s> add go func() { _ = http.Serve(l, h) }() </s> remove var err error
l, err = net.Listen("tcp", ":0")
</s> add l, err := net.Listen("tcp", ":0") </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
addr := serveFiltersLocally(t, fltContent) | <mask> `
<mask>
<mask> fltContent := []byte(content)
<mask>
<mask> l := testStartFilterListener(t, &fltContent)
<mask>
<mask> tempDir := t.TempDir()
<mask>
<mask> filters, err := New(&Config{
<mask> DataDir: tempDir,
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
Host: addr.String(), | <mask>
<mask> f := &FilterYAML{
<mask> URL: (&url.URL{
<mask> Scheme: "http",
<mask> Host: (&netutil.IPPort{
<mask> IP: net.IP{127, 0, 0, 1},
<mask> Port: l.Addr().(*net.TCPAddr).Port,
<mask> }).String(),
<mask> Path: path.Join(filterDir, testFltsFileName),
<mask> }).String(),
<mask> }
<mask>
<mask> updateAndAssert := func(t *testing.T, want require.BoolAssertionFunc, wantRulesCount int) {
<mask> var ok bool
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) | <mask> updateAndAssert(t, require.False, 3)
<mask> })
<mask>
<mask> t.Run("refresh_actually", func(t *testing.T) {
<mask> fltContent = []byte(`||example.com^`)
<mask> t.Cleanup(func() { fltContent = []byte(content) })
<mask>
<mask> updateAndAssert(t, require.True, 1)
<mask> })
<mask>
<mask> t.Run("load_unload", func(t *testing.T) {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove var err error
l, err = net.Listen("tcp", ":0")
</s> add l, err := net.Listen("tcp", ":0") </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
d.filtersInitializerLock.Lock() | <mask> allowFilters: allowFilters,
<mask> blockFilters: blockFilters,
<mask> }
<mask>
<mask> d.filtersInitializerLock.Lock() // prevent multiple writers from adding more than 1 task
<mask> defer d.filtersInitializerLock.Unlock()
<mask>
<mask> // remove all pending tasks
<mask> stop := false
<mask> for !stop {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // remove all pending tasks
stop := false
for !stop {
</s> add // Remove all pending tasks.
removeLoop:
for { </s> remove //
</s> add // Continue removing. </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove // Close gracefully closes all the client-specific upstream configurations of
</s> add // close gracefully closes all the client-specific upstream configurations of </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
// Remove all pending tasks.
removeLoop:
for { | <mask>
<mask> d.filtersInitializerLock.Lock() // prevent multiple writers from adding more than 1 task
<mask> defer d.filtersInitializerLock.Unlock()
<mask>
<mask> // remove all pending tasks
<mask> stop := false
<mask> for !stop {
<mask> select {
<mask> case <-d.filtersInitializerChan:
<mask> //
<mask> default:
<mask> stop = true
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove d.filtersInitializerLock.Lock() // prevent multiple writers from adding more than 1 task
</s> add d.filtersInitializerLock.Lock() </s> remove //
</s> add // Continue removing. </s> remove stop = true
</s> add break removeLoop </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
// Continue removing. | <mask> stop := false
<mask> for !stop {
<mask> select {
<mask> case <-d.filtersInitializerChan:
<mask> //
<mask> default:
<mask> stop = true
<mask> }
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // remove all pending tasks
stop := false
for !stop {
</s> add // Remove all pending tasks.
removeLoop:
for { </s> remove stop = true
</s> add break removeLoop </s> remove d.filtersInitializerLock.Lock() // prevent multiple writers from adding more than 1 task
</s> add d.filtersInitializerLock.Lock() </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
break removeLoop | <mask> select {
<mask> case <-d.filtersInitializerChan:
<mask> //
<mask> default:
<mask> stop = true
<mask> }
<mask> }
<mask>
<mask> d.filtersInitializerChan <- params
<mask> return nil
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove //
</s> add // Continue removing. </s> remove // remove all pending tasks
stop := false
for !stop {
</s> add // Remove all pending tasks.
removeLoop:
for { </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
log.Error("filtering: can't initialize filtering subsystem: %s", err)
| <mask> }
<mask>
<mask> err := d.initFiltering(allowFilters, blockFilters)
<mask> if err != nil {
<mask> log.Error("Can't initialize filtering subsystem: %s", err)
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove filt.ID = assignUniqueFilterID()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
<mask> }
<mask>
<mask> err = validateFilterURL(fj.URL)
<mask> if err != nil {
<mask> err = fmt.Errorf("invalid url: %s", err)
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
<mask>
<mask> return
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove log.Error("Can't initialize filtering subsystem: %s", err)
</s> add log.Error("filtering: can't initialize filtering subsystem: %s", err)
</s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> remove status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if (status & statusFound) == 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
</s> add </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go | |
Filter: Filter{
ID: assignUniqueFilterID(),
}, | <mask> URL: fj.URL,
<mask> Name: fj.Name,
<mask> white: fj.Whitelist,
<mask> }
<mask>
<mask> // Download the filter contents
<mask> ok, err := d.update(&filt)
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.ID = assignUniqueFilterID()
</s> add </s> remove status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if (status & statusFound) == 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
</s> add </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go |
<mask> URL: fj.URL,
<mask> Name: fj.Name,
<mask> white: fj.Whitelist,
<mask> }
<mask> filt.ID = assignUniqueFilterID()
<mask>
<mask> // Download the filter contents
<mask> ok, err := d.update(&filt)
<mask> if err != nil {
<mask> aghhttp.Error(
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go | |
<mask> Enabled: fj.Data.Enabled,
<mask> Name: fj.Data.Name,
<mask> URL: fj.Data.URL,
<mask> }
<mask> status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
<mask> if (status & statusFound) == 0 {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
<mask>
<mask> return
<mask> }
<mask> if (status & statusURLExists) != 0 {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go | |
restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) | <mask> status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
<mask> if (status & statusFound) == 0 {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
<mask>
<mask> return
<mask> }
<mask> if (status & statusURLExists) != 0 {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
<mask>
<mask> return
<mask> }
<mask>
<mask> d.ConfigModified()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if (status & statusFound) == 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
</s> add </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go |
<mask> return
<mask> }
<mask>
<mask> d.ConfigModified()
<mask>
<mask> restart := (status & statusEnabledChanged) != 0
<mask> if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
<mask> // download new filter and apply its rules.
<mask> nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
<mask> // if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
<mask> // if not - we restart the filtering ourselves
<mask> restart = false
<mask> if nUpdated == 0 {
<mask> restart = true
<mask> }
<mask> }
<mask>
<mask> if restart {
<mask> d.EnableFilters(true)
<mask> }
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if (status & statusFound) == 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
</s> add </s> remove log.Error("Can't initialize filtering subsystem: %s", err)
</s> add log.Error("filtering: can't initialize filtering subsystem: %s", err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go | |
// close gracefully closes all the client-specific upstream configurations of | <mask>
<mask> log.Debug("clients: added %d client aliases from dhcp", n)
<mask> }
<mask>
<mask> // Close gracefully closes all the client-specific upstream configurations of
<mask> // the persistent clients.
<mask> func (clients *clientsContainer) Close() (err error) {
<mask> persistent := maps.Values(clients.list)
<mask> slices.SortFunc(persistent, func(a, b *Client) (less bool) { return a.Name < b.Name })
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove func (clients *clientsContainer) Close() (err error) {
</s> add func (clients *clientsContainer) close() (err error) { </s> remove // refreshFilters updates the lists and returns the number of updated ones.
// It's safe for concurrent use, but blocks at least until the previous
// refreshing is finished.
func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
d.refreshLock.Lock()
defer d.refreshLock.Unlock()
updated, _ = d.refreshFiltersIntl(block, allow, force)
return updated
}
</s> add </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/home/clients.go |
func (clients *clientsContainer) close() (err error) { | <mask> }
<mask>
<mask> // Close gracefully closes all the client-specific upstream configurations of
<mask> // the persistent clients.
<mask> func (clients *clientsContainer) Close() (err error) {
<mask> persistent := maps.Values(clients.list)
<mask> slices.SortFunc(persistent, func(a, b *Client) (less bool) { return a.Name < b.Name })
<mask>
<mask> var errs []error
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // Close gracefully closes all the client-specific upstream configurations of
</s> add // close gracefully closes all the client-specific upstream configurations of </s> remove // refreshFilters updates the lists and returns the number of updated ones.
// It's safe for concurrent use, but blocks at least until the previous
// refreshing is finished.
func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
d.refreshLock.Lock()
defer d.refreshLock.Unlock()
updated, _ = d.refreshFiltersIntl(block, allow, force)
return updated
}
</s> add </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/home/clients.go |
err = Context.clients.close() | <mask> if err != nil {
<mask> return fmt.Errorf("stopping forwarding dns server: %w", err)
<mask> }
<mask>
<mask> err = Context.clients.Close()
<mask> if err != nil {
<mask> return fmt.Errorf("closing clients container: %w", err)
<mask> }
<mask>
<mask> closeDNSServer()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove log.Error("Can't initialize filtering subsystem: %s", err)
</s> add log.Error("filtering: can't initialize filtering subsystem: %s", err)
</s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove filt.ID = assignUniqueFilterID()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/home/dns.go |
"net" | <mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "log"
<mask> "net/http"
<mask> "os"
<mask> "path"
<mask> "runtime"
</s> code review -- move constants into named constants </s> remove const (
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
)
</s> add </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove */
</s> add } </s> remove /*
</s> add if false { // not commented out to make code checked during compilation | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed | <mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
<mask> logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
<mask> queryLogCacheSize = 1000 // maximum API response for /querylog
<mask> queryLogCacheTime = time.Minute
<mask> )
<mask>
<mask> var (
<mask> logBufferLock sync.RWMutex
<mask> logBuffer []logEntry
</s> code review -- move constants into named constants </s> remove const (
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
)
</s> add </s> remove values = appendFromLogFile(values, queryLogCacheSize, time.Hour*24)
</s> add values = appendFromLogFile(values, queryLogCacheSize, queryLogTimeLimit) </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
values = appendFromLogFile(values, queryLogCacheSize, queryLogTimeLimit) | <mask> values := logBuffer
<mask> logBufferLock.RUnlock()
<mask>
<mask> if len(values) < queryLogCacheSize {
<mask> values = appendFromLogFile(values, queryLogCacheSize, time.Hour*24)
<mask> }
<mask> queryLogLock.Lock()
<mask> queryLogCache = values
<mask> queryLogTime = now
<mask> queryLogLock.Unlock()
</s> code review -- move constants into named constants </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove const (
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
http.Error(w, errortext, http.StatusInternalServerError) | <mask> _, err = w.Write(json)
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Unable to write response json: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, 500)
<mask> }
<mask> }
<mask>
<mask> func startQueryLogServer() {
<mask> listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> code review -- move constants into named constants </s> remove go periodicQueryLogRotate(queryLogRotationPeriod)
</s> add go periodicQueryLogRotate() </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) | <mask> }
<mask> }
<mask>
<mask> func startQueryLogServer() {
<mask> listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
<mask>
<mask> go periodicQueryLogRotate(queryLogRotationPeriod)
<mask> go periodicHourlyTopRotate()
<mask>
<mask> http.HandleFunc("/querylog", handleQueryLog)
</s> code review -- move constants into named constants </s> remove go periodicQueryLogRotate(queryLogRotationPeriod)
</s> add go periodicQueryLogRotate() </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove /*
</s> add if false { // not commented out to make code checked during compilation | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
go periodicQueryLogRotate() | <mask>
<mask> func startQueryLogServer() {
<mask> listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
<mask>
<mask> go periodicQueryLogRotate(queryLogRotationPeriod)
<mask> go periodicHourlyTopRotate()
<mask>
<mask> http.HandleFunc("/querylog", handleQueryLog)
<mask> http.HandleFunc("/stats_top", handleStatsTop)
<mask> if err := http.ListenAndServe(listenAddr, nil); err != nil {
</s> code review -- move constants into named constants </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
<mask>
<mask> "github.com/go-test/deep"
<mask> )
<mask>
<mask> const (
<mask> queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
<mask> queryLogFileName = "querylog.json" // .gz added during compression
<mask> )
<mask>
<mask> var (
<mask> fileWriteLock sync.Mutex
<mask> )
<mask>
<mask> func flushToFile(buffer []logEntry) error {
</s> code review -- move constants into named constants </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove /*
</s> add if false { // not commented out to make code checked during compilation | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_file.go | |
func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { | <mask>
<mask> return nil
<mask> }
<mask>
<mask> func periodicQueryLogRotate(t time.Duration) {
<mask> for range time.Tick(t) {
<mask> err := rotateQueryLog()
<mask> if err != nil {
<mask> log.Printf("Failed to rotate querylog: %s", err)
<mask> // do nothing, continue rotating
<mask> }
</s> code review -- move constants into named constants </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove go periodicQueryLogRotate(queryLogRotationPeriod)
</s> add go periodicQueryLogRotate() </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_file.go |
"os"
"path"
"runtime" | <mask> "bytes"
<mask> "fmt"
<mask> "log"
<mask> "net/http"
<mask> "sort"
<mask> "strconv"
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
</s> code review -- move constants into named constants </s> remove */
</s> add } </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() | <mask> mutex sync.RWMutex
<mask> }
<mask>
<mask> func (top *hourTop) init() {
<mask> top.domains = gcache.New(500).LRU().Build()
<mask> top.blocked = gcache.New(500).LRU().Build()
<mask> top.clients = gcache.New(500).LRU().Build()
<mask> }
<mask>
<mask> type dayTop struct {
<mask> hours []*hourTop
<mask> hoursLock sync.RWMutex // writelock this lock ONLY WHEN rotating or intializing hours!
</s> code review -- move constants into named constants </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove const (
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
)
</s> add </s> remove /*
</s> add if false { // not commented out to make code checked during compilation | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
err := genericLoader(onEntry, needMore, queryLogTimeLimit) | <mask> return nil
<mask> }
<mask>
<mask> needMore := func() bool { return true }
<mask> err := genericLoader(onEntry, needMore, time.Hour*24)
<mask> if err != nil {
<mask> log.Printf("Failed to load entries from querylog: %s", err)
<mask> return err
<mask> }
<mask>
</s> code review -- move constants into named constants </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove go periodicQueryLogRotate(queryLogRotationPeriod)
</s> add go periodicQueryLogRotate() </s> remove values = appendFromLogFile(values, queryLogCacheSize, time.Hour*24)
</s> add values = appendFromLogFile(values, queryLogCacheSize, queryLogTimeLimit) </s> remove /*
</s> add if false { // not commented out to make code checked during compilation | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
<mask> func (d *dayTop) hoursReadUnlock() { tracelock(); d.hoursLock.RUnlock() }
<mask> func (d *dayTop) loadedWriteLock() { tracelock(); d.loadedLock.Lock() }
<mask> func (d *dayTop) loadedWriteUnlock() { tracelock(); d.loadedLock.Unlock() }
<mask>
<mask> // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
<mask> // func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
<mask>
<mask> func (h *hourTop) Lock() { tracelock(); h.mutex.Lock() }
<mask> func (h *hourTop) RLock() { tracelock(); h.mutex.RLock() }
<mask> func (h *hourTop) RUnlock() { tracelock(); h.mutex.RUnlock() }
<mask> func (h *hourTop) Unlock() { tracelock(); h.mutex.Unlock() }
<mask>
</s> code review -- move constants into named constants </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go | |
if false { // not commented out to make code checked during compilation | <mask> func (h *hourTop) RUnlock() { tracelock(); h.mutex.RUnlock() }
<mask> func (h *hourTop) Unlock() { tracelock(); h.mutex.Unlock() }
<mask>
<mask> func tracelock() {
<mask> /*
<mask> pc := make([]uintptr, 10) // at least 1 entry needed
<mask> runtime.Callers(2, pc)
<mask> f := path.Base(runtime.FuncForPC(pc[1]).Name())
<mask> lockf := path.Base(runtime.FuncForPC(pc[0]).Name())
<mask> fmt.Fprintf(os.Stderr, "%s(): %s\n", f, lockf)
</s> code review -- move constants into named constants </s> remove */
</s> add } </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
} | <mask> runtime.Callers(2, pc)
<mask> f := path.Base(runtime.FuncForPC(pc[1]).Name())
<mask> lockf := path.Base(runtime.FuncForPC(pc[0]).Name())
<mask> fmt.Fprintf(os.Stderr, "%s(): %s\n", f, lockf)
<mask> */
<mask> }
</s> code review -- move constants into named constants </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.