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 |
|---|---|---|---|---|
func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { | <mask> addrs []string
<mask> addrsLock sync.RWMutex
<mask> }
<mask>
<mask> func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
<mask> return &systemResolvers{}
<mask> }
<mask>
<mask> func (sr *systemResolvers) Get() (rs []string) {
<mask> sr.addrsLock.RLock()
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove refreshDur time.Duration,
</s> add </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> remove sr, err = NewSystemResolvers(refreshDur, hostGenFunc)
</s> add sr, err = NewSystemResolvers(hostGenFunc) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_windows.go |
<mask> IP address HW type Flags HW address Mask Device
<mask> 192.168.1.2 0x1 0x2 ab:cd:ef:ab:cd:ef * wan
<mask> ::ffff:ffff 0x1 0x0 ef:cd:ab:ef:cd:ab * br-lan
<mask> 0.0.0.0 0x0 0x0 00:00:00:00:00:00 * unspec </s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove ipStr = parts[0]
</s> add host = parts[0] | [
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/testdata/proc_net_arp | |
s.sysResolvers, err = aghnet.NewSystemResolvers(nil) | <mask> }
<mask>
<mask> // TODO(e.burkov): Enable the refresher after the actual implementation
<mask> // passes the public testing.
<mask> s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("initializing system resolvers: %w", err)
<mask> }
<mask>
<mask> if p.DHCPServer != nil {
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove // writeRules writes the actual rule for the qtype and the PTR for the
// host-ip pair into internal builders.
</s> add // writeRules writes the actual rule for the qtype and the PTR for the host-ip
// pair into internal builders. </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/dnsforward/dnsforward.go |
defer log.OnPanic("clients container")
| <mask> return objs
<mask> }
<mask>
<mask> func (clients *clientsContainer) periodicUpdate() {
<mask> for {
<mask> clients.Reload()
<mask> time.Sleep(clientsUpdatePeriod)
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove // writeRules writes the actual rule for the qtype and the PTR for the
// host-ip pair into internal builders.
</s> add // writeRules writes the actual rule for the qtype and the PTR for the host-ip
// pair into internal builders. </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/home/clients.go |
arpdb := aghnet.NewARPDB() | <mask> return err
<mask> }
<mask> }
<mask>
<mask> var arpdb aghnet.ARPDB
<mask> arpdb, err = aghnet.NewARPDB()
<mask> if err != nil {
<mask> log.Info("warning: creating arpdb: %s; using stub", err)
<mask>
<mask> arpdb = aghnet.EmptyARPDB{}
<mask> }
<mask>
<mask> Context.clients.Init(config.Clients, Context.dhcpServer, Context.etcHosts, arpdb)
<mask>
<mask> if args.bindPort != 0 {
<mask> uc := aghalg.UniqChecker{}
<mask> addPorts(
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/home/home.go |
<mask> "version": "3.2.0",
<mask> "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
<mask> "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo="
<mask> },
<mask> "alertifyjs": {
<mask> "version": "1.11.1",
<mask> "resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
<mask> "integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
<mask> },
<mask> "align-text": {
<mask> "version": "0.1.4",
<mask> "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
<mask> "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
<mask> "dev": true,
</s> Show toast on failed request </s> remove "alertifyjs": "^1.11.1",
</s> add </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package-lock.json | |
"dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, | <mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "dom-serializer": {
<mask> "version": "0.1.0",
<mask> "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
<mask> "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
<mask> "dev": true,
</s> Show toast on failed request </s> remove "alertifyjs": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
"integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
},
</s> add </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package-lock.json |
"nanoid": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.2.3.tgz",
"integrity": "sha512-BAnxAdaihzMoszwhqRy8FPOX+dijs7esUEUYTIQ1KsOSKmCVNYnitAMmBDFxYzA6VQYvuUKw7o2K1AcMBTGzIg=="
}, | <mask> "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "nanomatch": {
<mask> "version": "1.2.13",
<mask> "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
<mask> "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
</s> Show toast on failed request </s> remove "alertifyjs": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
"integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
},
</s> add </s> remove "alertifyjs": "^1.11.1",
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package-lock.json |
"react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, | <mask> }
<mask> },
<mask> "read-cache": {
<mask> "version": "1.0.0",
<mask> "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
<mask> "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
<mask> "dev": true,
<mask> "requires": {
</s> Show toast on failed request </s> remove "alertifyjs": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
"integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
},
</s> add </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package-lock.json |
<mask> "lint": "eslint frontend/"
<mask> },
<mask> "dependencies": {
<mask> "@nivo/line": "^0.42.1",
<mask> "alertifyjs": "^1.11.1",
<mask> "axios": "^0.18.0",
<mask> "classnames": "^2.2.6",
<mask> "date-fns": "^1.29.0",
<mask> "file-saver": "^1.3.8",
<mask> "lodash": "^4.17.10",
</s> Show toast on failed request </s> remove "alertifyjs": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
"integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
},
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package.json | |
"nanoid": "^1.2.3", | <mask> "file-saver": "^1.3.8",
<mask> "lodash": "^4.17.10",
<mask> "prop-types": "^15.6.1",
<mask> "react": "^16.4.0",
<mask> "react-click-outside": "^3.0.1",
<mask> "react-dom": "^16.4.0",
<mask> "react-modal": "^3.4.5",
</s> Show toast on failed request </s> remove "alertifyjs": "^1.11.1",
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package.json |
"react-transition-group": "^2.4.0", | <mask> "react-modal": "^3.4.5",
<mask> "react-redux": "^5.0.7",
<mask> "react-router-dom": "^4.2.2",
<mask> "react-table": "^6.8.6",
<mask> "redux": "^4.0.0",
<mask> "redux-actions": "^2.4.0",
<mask> "redux-thunk": "^2.3.0",
<mask> "svg-url-loader": "^2.3.2",
<mask> "tabler-react": "^1.10.0",
</s> Show toast on failed request </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package.json |
<mask> import { createAction } from 'redux-actions';
<mask> import round from 'lodash/round';
<mask> import alertify from 'alertifyjs';
<mask>
<mask> import { normalizeHistory, normalizeFilteringStatus, normalizeLogs } from '../helpers/helpers';
<mask> import Api from '../api/Api';
<mask>
<mask> const apiClient = new Api();
</s> Show toast on failed request </s> remove import 'alertifyjs/build/css/alertify.min.css';
</s> add </s> remove import '../ui/Alertify.css';
</s> add | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js | |
export const addErrorToast = createAction('ADD_ERROR_TOAST');
export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
export const removeToast = createAction('REMOVE_TOAST');
| <mask> const apiClient = new Api();
<mask>
<mask> export const toggleSettingStatus = createAction('SETTING_STATUS_TOGGLE');
<mask> export const showSettingsFailure = createAction('SETTINGS_FAILURE_SHOW');
<mask>
<mask> export const toggleSetting = (settingKey, status) => async (dispatch) => {
<mask> switch (settingKey) {
</s> Show toast on failed request </s> remove import alertify from 'alertifyjs';
</s> add </s> remove const disableButton = <button type="button" className="btn btn-outline-secondary btn-sm mr-2" onClick={() => this.props.disableDns()}>Disable DNS</button>;
</s> add </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> };
<mask> dispatch(initSettingsSuccess({ settingsList: newSettingsList }));
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(initSettingsFailure());
<mask> }
<mask> };
<mask>
<mask> export const dnsStatusRequest = createAction('DNS_STATUS_REQUEST');
<mask> export const dnsStatusFailure = createAction('DNS_STATUS_FAILURE');
</s> Show toast on failed request | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> const dnsStatus = await apiClient.getGlobalStatus();
<mask> dispatch(dnsStatusSuccess(dnsStatus));
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(initSettingsFailure());
<mask> }
<mask> };
<mask>
<mask> export const enableDnsRequest = createAction('ENABLE_DNS_REQUEST');
<mask> export const enableDnsFailure = createAction('ENABLE_DNS_FAILURE');
</s> Show toast on failed request </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> await apiClient.startGlobalFiltering();
<mask> dispatch(enableDnsSuccess());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(enableDnsFailure());
<mask> }
<mask> };
<mask>
<mask> export const disableDnsRequest = createAction('DISABLE_DNS_REQUEST');
<mask> export const disableDnsFailure = createAction('DISABLE_DNS_FAILURE');
</s> Show toast on failed request </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); | <mask> await apiClient.stopGlobalFiltering();
<mask> dispatch(disableDnsSuccess());
<mask> } catch (error) {
<mask> console.error(error);
<mask> alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
<mask> dispatch(disableDnsFailure());
<mask> }
<mask> };
<mask>
<mask> export const getStatsRequest = createAction('GET_STATS_REQUEST');
<mask> export const getStatsFailure = createAction('GET_STATS_FAILURE');
</s> Show toast on failed request </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask>
<mask> dispatch(getStatsSuccess(processedStats));
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(getStatsFailure());
<mask> }
<mask> };
<mask>
<mask> export const getTopStatsRequest = createAction('GET_TOP_STATS_REQUEST');
</s> Show toast on failed request | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); | <mask> try {
<mask> const stats = await apiClient.getGlobalStatsTop();
<mask> dispatch(getTopStatsSuccess(stats));
<mask> } catch (error) {
<mask> alertify.error(`Failed to load statistics with status code ${error.response.status}`);
<mask> dispatch(getTopStatsFailure());
<mask> }
<mask> }
<mask> }, 100);
<mask> };
<mask>
</s> Show toast on failed request </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); | <mask> try {
<mask> const logs = normalizeLogs(await apiClient.getQueryLog());
<mask> dispatch(getLogsSuccess(logs));
<mask> } catch (error) {
<mask> alertify.error(`Failed to load query log with status code ${error.response.status}`);
<mask> dispatch(getLogsFailure());
<mask> }
<mask> }
<mask> }, 100);
<mask> };
<mask>
</s> Show toast on failed request </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> dispatch(toggleLogStatusSuccess());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(toggleLogStatusFailure());
<mask> }
<mask> };
<mask>
<mask> export const setRulesRequest = createAction('SET_RULES_REQUEST');
</s> Show toast on failed request | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(setRulesFailure());
<mask> }
<mask> };
<mask>
<mask> export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
</s> Show toast on failed request | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(getFilteringStatusFailure());
<mask> }
<mask> };
<mask>
</s> Show toast on failed request | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(toggleFilterFailure());
<mask> }
<mask> };
<mask>
<mask> export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
</s> Show toast on failed request | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(refreshFiltersFailure());
<mask> }
<mask> };
<mask>
</s> Show toast on failed request | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> const normalizedHistory = normalizeHistory(statsHistory);
<mask> dispatch(getStatsHistorySuccess(normalizedHistory));
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(getStatsHistoryFailure());
<mask> }
<mask> };
<mask>
<mask> export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
</s> Show toast on failed request | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> dispatch(addFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(addFilterFailure());
<mask> }
<mask> };
<mask>
</s> Show toast on failed request | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> dispatch(removeFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(removeFilterFailure());
<mask> }
<mask> };
<mask>
</s> Show toast on failed request | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> data = await apiClient.downloadQueryLog();
<mask> dispatch(downloadQueryLogSuccess());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(downloadQueryLogFailure());
<mask> }
<mask> return data;
<mask> };
<mask>
<mask> export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
</s> Show toast on failed request </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
dispatch(addErrorToast({ error })); | <mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(setUpstreamFailure());
<mask> }
<mask> };
</s> Show toast on failed request | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | <mask> export default class Api {
<mask> baseUrl = 'control';
<mask>
<mask> async makeRequest(path, method = 'POST', config) {
<mask> const response = await axios({
<mask> url: `${this.baseUrl}/${path}`,
<mask> method,
<mask> ...config,
<mask> });
<mask> return response.data;
<mask> }
<mask>
<mask> // Global methods
<mask> GLOBAL_RESTART = { path: 'restart', method: 'POST' };
<mask> GLOBAL_START = { path: 'start', method: 'POST' };
</s> Show toast on failed request </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/api/Api.js |
<mask> import { HashRouter, Route } from 'react-router-dom';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import 'react-table/react-table.css';
<mask> import 'alertifyjs/build/css/alertify.min.css';
<mask> import '../ui/Tabler.css';
<mask> import '../ui/ReactTable.css';
<mask> import '../ui/Alertify.css';
<mask> import './index.css';
<mask>
</s> Show toast on failed request </s> remove import '../ui/Alertify.css';
</s> add </s> remove import alertify from 'alertifyjs';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js | |
<mask> import 'react-table/react-table.css';
<mask> import 'alertifyjs/build/css/alertify.min.css';
<mask> import '../ui/Tabler.css';
<mask> import '../ui/ReactTable.css';
<mask> import '../ui/Alertify.css';
<mask> import './index.css';
<mask>
<mask> import Header from '../../containers/Header';
<mask> import Dashboard from '../../containers/Dashboard';
<mask> import Settings from '../../containers/Settings';
</s> Show toast on failed request </s> remove import 'alertifyjs/build/css/alertify.min.css';
</s> add </s> remove import alertify from 'alertifyjs';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js | |
import Toasts from '../Toasts'; | <mask> import Settings from '../../containers/Settings';
<mask> import Filters from '../../containers/Filters';
<mask> import Logs from '../../containers/Logs';
<mask> import Footer from '../ui/Footer';
<mask>
<mask> import Status from '../ui/Status';
<mask>
<mask> class App extends Component {
<mask> componentDidMount() {
<mask> this.props.getDnsStatus();
</s> Show toast on failed request </s> remove import '../ui/Alertify.css';
</s> add </s> remove import alertify from 'alertifyjs';
</s> add </s> remove import 'alertifyjs/build/css/alertify.min.css';
</s> add </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js |
<Toasts /> | <mask> </div>
<mask> <Footer />
<mask> </Fragment>
<mask> </HashRouter>
<mask> );
<mask> }
<mask> }
</s> Show toast on failed request </s> remove {disableButton}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js |
error: PropTypes.string, | <mask> dashboard: PropTypes.object,
<mask> isCoreRunning: PropTypes.bool,
<mask> };
<mask>
<mask> export default App;
</s> Show toast on failed request </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js |
<mask> dashboard.processingStats ||
<mask> dashboard.processingStatsHistory ||
<mask> dashboard.processingTopStats;
<mask>
<mask> const disableButton = <button type="button" className="btn btn-outline-secondary btn-sm mr-2" onClick={() => this.props.disableDns()}>Disable DNS</button>;
<mask> const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
<mask> const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
<mask>
<mask> return (
<mask> <Fragment>
</s> Show toast on failed request </s> remove {disableButton}
</s> add </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/Dashboard/index.js | |
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title="Dashboard">
<mask> <div className="page-title__actions">
<mask> {disableButton}
<mask> {refreshFullButton}
<mask> </div>
<mask> </PageTitle>
<mask> {dashboardProcessing && <Loading />}
<mask> {!dashboardProcessing &&
</s> Show toast on failed request </s> remove const disableButton = <button type="button" className="btn btn-outline-secondary btn-sm mr-2" onClick={() => this.props.disableDns()}>Disable DNS</button>;
</s> add </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/Dashboard/index.js | |
import nanoid from 'nanoid'; | <mask> import { combineReducers } from 'redux';
<mask> import { handleActions } from 'redux-actions';
<mask>
<mask> import * as actions from '../actions';
<mask>
<mask> const settings = handleActions({
<mask> [actions.initSettingsRequest]: state => ({ ...state, processing: true }),
</s> Show toast on failed request </s> remove import alertify from 'alertifyjs';
</s> add </s> remove import 'alertifyjs/build/css/alertify.min.css';
</s> add </s> remove import '../ui/Alertify.css';
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/reducers/index.js |
toasts, | <mask> settings,
<mask> dashboard,
<mask> queryLogs,
<mask> filtering,
<mask> });
</s> Show toast on failed request </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> remove "alertifyjs": "^1.11.1",
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/reducers/index.js |
"github.com/AdguardTeam/urlfilter" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/bluele/gcache"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | <mask> const enableDelayedCompilation = true // flag for debugging, must be true in production for faster performance
<mask>
<mask> // Config allows you to configure DNS filtering with New() or just change variables directly.
<mask> type Config struct {
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> ResolverAddress string // DNS server address
<mask> }
<mask>
<mask> type privateConfig struct {
<mask> parentalServer string // access via methods
<mask> safeBrowsingServer string // access via methods
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
rulesStorage *urlfilter.RulesStorage
filteringEngine *urlfilter.DNSEngine
| <mask>
<mask> // Dnsfilter holds added rules and performs hostname matches against the rules
<mask> type Dnsfilter struct {
<mask> // HTTP lookups for safebrowsing and parental
<mask> client http.Client // handle for http client -- single instance as recommended by docs
<mask> transport *http.Transport // handle for http transport used by http client
<mask>
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
// Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) | <mask> //
<mask> // Adding rule and matching against the rules
<mask> //
<mask>
<mask> // AddRules is a convinience function to add an array of filters in one call
<mask> func (d *Dnsfilter) AddRules(filters []Filter) error {
<mask> return nil
<mask> }
<mask>
<mask> // matchHost is a low-level way to check only if hostname is filtered by rules, skipping expensive safebrowsing and parental lookups
<mask> func (d *Dnsfilter) matchHost(host string) (Result, error) {
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
func New(c *Config, filters map[int]string) *Dnsfilter { | <mask> }
<mask> }
<mask>
<mask> // New creates properly initialized DNS Filter that is ready to be used
<mask> func New(c *Config) *Dnsfilter {
<mask> d := new(Dnsfilter)
<mask>
<mask> // Customize the Transport to have larger connection pool,
<mask> // We are not (re)using http.DefaultTransport because of race conditions found by tests
<mask> d.transport = &http.Transport{
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
if filters != nil {
err := d.initFiltering(filters)
if err != nil {
log.Error("Can't initialize filtering subsystem: %s", err)
d.Destroy()
return nil
}
}
| <mask> if c != nil {
<mask> d.Config = *c
<mask> }
<mask>
<mask> return d
<mask> }
<mask>
<mask> // Destroy is optional if you want to tidy up goroutines without waiting for them to die off
<mask> // right now it closes idle HTTP connections if there are any
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
if d.rulesStorage != nil {
d.rulesStorage.Close()
d.rulesStorage = nil
} | <mask> d.transport.CloseIdleConnections()
<mask> }
<mask> }
<mask>
<mask> //
<mask> // config manipulation helpers
<mask> //
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
import whotracksmeWebsites from './whotracksme_web.json'; | <mask> import whotracksmeDb from './whotracksme.json';
<mask> import adguardDb from './adguard.json';
<mask> import { REPOSITORY } from '../constants';
<mask>
<mask> /**
<mask> @typedef TrackerData
</s> Pull request: whotracksme tracker links
Merge in DNS/adguard-home from 4416-ui-tracker-href to master
Squashed commit of the following:
commit 979ea82a3b4d2c2a895b81aacd613fb7e5bec586
Merge: 4fe6328b 12ee287d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 15:03:13 2022 +0200
Merge remote-tracking branch 'origin/master' into 4416-ui-tracker-href
commit 4fe6328b276e697a2aa351c6543d2efe6d2dc2e1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 14:08:10 2022 +0200
whotracksme tracker links </s> remove url: `https://whotracks.me/trackers/${trackerData.id}.html`,
</s> add url: getWhotracksmeUrl(trackerData.id), | [
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82af43039c78b49908151c09175a5161dd911601 | client/src/helpers/trackers/trackers.js |
/**
* Gets link to tracker page on whotracks.me.
*
* @param trackerId
* @return {string}
*/
const getWhotracksmeUrl = (trackerId) => {
const websiteId = whotracksmeWebsites.websites[trackerId];
if (websiteId) {
// Overrides links to websites.
return `https://whotracks.me/websites/${websiteId}.html`;
}
return `https://whotracks.me/trackers/${trackerId}.html`;
};
| <mask> ADGUARD: 2,
<mask> };
<mask>
<mask> /**
<mask> * Gets the source metadata for the specified tracker
<mask> * @param {TrackerData} trackerData tracker data
<mask> * @returns {source} source metadata or null if no matching tracker found
<mask> */
<mask> export const getSourceData = (trackerData) => {
</s> Pull request: whotracksme tracker links
Merge in DNS/adguard-home from 4416-ui-tracker-href to master
Squashed commit of the following:
commit 979ea82a3b4d2c2a895b81aacd613fb7e5bec586
Merge: 4fe6328b 12ee287d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 15:03:13 2022 +0200
Merge remote-tracking branch 'origin/master' into 4416-ui-tracker-href
commit 4fe6328b276e697a2aa351c6543d2efe6d2dc2e1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 14:08:10 2022 +0200
whotracksme tracker links </s> remove url: `https://whotracks.me/trackers/${trackerData.id}.html`,
</s> add url: getWhotracksmeUrl(trackerData.id), | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82af43039c78b49908151c09175a5161dd911601 | client/src/helpers/trackers/trackers.js |
url: getWhotracksmeUrl(trackerData.id), | <mask>
<mask> if (trackerData.source === sources.WHOTRACKSME) {
<mask> return {
<mask> name: 'Whotracks.me',
<mask> url: `https://whotracks.me/trackers/${trackerData.id}.html`,
<mask> };
<mask> }
<mask> if (trackerData.source === sources.ADGUARD) {
<mask> return {
<mask> name: 'AdGuard',
</s> Pull request: whotracksme tracker links
Merge in DNS/adguard-home from 4416-ui-tracker-href to master
Squashed commit of the following:
commit 979ea82a3b4d2c2a895b81aacd613fb7e5bec586
Merge: 4fe6328b 12ee287d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 15:03:13 2022 +0200
Merge remote-tracking branch 'origin/master' into 4416-ui-tracker-href
commit 4fe6328b276e697a2aa351c6543d2efe6d2dc2e1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 14:08:10 2022 +0200
whotracksme tracker links | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82af43039c78b49908151c09175a5161dd911601 | client/src/helpers/trackers/trackers.js |
binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
dnsforward.FilteringConfig `yaml:",inline"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` | <mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type coreDNSConfig struct {
<mask> binaryFile string
<mask> coreFile string
<mask> Filters []filter `yaml:"-"`
<mask> Port int `yaml:"port"`
<mask> ProtectionEnabled bool `yaml:"protection_enabled"`
<mask> FilteringEnabled bool `yaml:"filtering_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"`
<mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
<mask> QueryLogEnabled bool `yaml:"querylog_enabled"`
<mask> Ratelimit int `yaml:"ratelimit"`
<mask> RefuseAny bool `yaml:"refuse_any"`
<mask> Pprof string `yaml:"-"`
<mask> Cache string `yaml:"-"`
<mask> Prometheus string `yaml:"-"`
<mask> BootstrapDNS string `yaml:"bootstrap_dns"`
<mask> UpstreamDNS []string `yaml:"upstream_dns"`
<mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type filter struct {
<mask> Enabled bool `json:"enabled"`
</s> Move filtering setting fields from main app to dnsforward. </s> remove Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153",
</s> add Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
},
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
... | https://github.com/AdguardTeam/AdGuardHome/commit/8316d39b4282599681a827a50d6541c5cb4987ed | config.go |
Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
},
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", | <mask> ourConfigFilename: "AdGuardHome.yaml",
<mask> BindPort: 3000,
<mask> BindHost: "127.0.0.1",
<mask> CoreDNS: coreDNSConfig{
<mask> Port: 53,
<mask> binaryFile: "coredns", // only filename, no path
<mask> coreFile: "Corefile", // only filename, no path
<mask> ProtectionEnabled: true,
<mask> FilteringEnabled: true,
<mask> SafeBrowsingEnabled: false,
<mask> BlockedResponseTTL: 10, // in seconds
<mask> QueryLogEnabled: true,
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> BootstrapDNS: "8.8.8.8:53",
<mask> UpstreamDNS: defaultDNS,
<mask> Cache: "cache",
<mask> Prometheus: "prometheus :9153",
<mask> },
<mask> Filters: []filter{
<mask> {Filter: dnsforward.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
<mask> {Filter: dnsforward.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
<mask> {Filter: dnsforward.Filter{ID: 3}, Enabled: false, URL: "https://hosts-file.net/ad_servers.txt", Name: "hpHosts - Ad and Tracking servers only"},
</s> Move filtering setting fields from main app to dnsforward. </s> remove binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
dnsforward.FilteringConfig `yaml:",inline"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8316d39b4282599681a827a50d6541c5cb4987ed | config.go |
type FilteringConfig struct {
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
}
| <mask> fmt.Fprintf(os.Stderr, "%s:%d %s() -> RUnlock() -> done\n", path.Base(file), line, path.Base(f.Name()))
<mask> }
<mask> */
<mask>
<mask> // The zero ServerConfig is empty and ready for use.
<mask> type ServerConfig struct {
<mask> UDPListenAddr *net.UDPAddr // if nil, then default is is used (port 53 on *)
<mask> BlockedResponseTTL uint32 // if 0, then default is used (3600)
</s> Move filtering setting fields from main app to dnsforward. </s> remove binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
dnsforward.FilteringConfig `yaml:",inline"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` </s> remove Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153",
</s> add Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
},
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8316d39b4282599681a827a50d6541c5cb4987ed | dnsforward/dnsforward.go |
FilteringConfig | <mask> UDPListenAddr *net.UDPAddr // if nil, then default is is used (port 53 on *)
<mask> BlockedResponseTTL uint32 // if 0, then default is used (3600)
<mask> Upstreams []Upstream
<mask> Filters []Filter
<mask> }
<mask>
<mask> var defaultValues = ServerConfig{
<mask> UDPListenAddr: &net.UDPAddr{Port: 53},
<mask> BlockedResponseTTL: 3600,
<mask> Upstreams: []Upstream{
</s> Move filtering setting fields from main app to dnsforward. </s> remove binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
dnsforward.FilteringConfig `yaml:",inline"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` </s> remove Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153",
</s> add Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
},
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8316d39b4282599681a827a50d6541c5cb4987ed | dnsforward/dnsforward.go |
// Server is the main way to start a DNS server.
// | <mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // Server is the main way to start a DNS server
<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
<mask> // err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
</s> Update docs for formatting in godoc. </s> remove // pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn)
</s> add // pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn) </s> remove // upstream TLS pool.
</s> add // Upstream TLS pool. </s> remove // s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine
</s> add // s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8396dc2fdb90711ba3394b975347a262afe22ae7 | dnsforward/dnsforward.go |
// s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine | <mask> )
<mask>
<mask> // Server is the main way to start a DNS server
<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
<mask> // err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
<mask> // err := s.Start(nil) // will start listening again, on port 53535, in a goroutine
<mask> //
<mask> // The zero Server is empty and ready for use.
<mask> type Server struct {
<mask> udpListen *net.UDPConn
<mask>
</s> Update docs for formatting in godoc. </s> remove // pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn)
</s> add // pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn) </s> remove // upstream TLS pool.
</s> add // Upstream TLS pool. </s> remove // Server is the main way to start a DNS server
</s> add // Server is the main way to start a DNS server.
// | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8396dc2fdb90711ba3394b975347a262afe22ae7 | dnsforward/dnsforward.go |
// Upstream TLS pool. | <mask>
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // upstream TLS pool.
<mask> //
<mask> // Example:
<mask> // pool := TLSPool{Address: "tls://1.1.1.1:853"}
<mask> // netConn, err := pool.Get()
<mask> // if err != nil {panic(err)}
</s> Update docs for formatting in godoc. </s> remove // pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn)
</s> add // pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn) </s> remove // s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine
</s> add // s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine </s> remove // Server is the main way to start a DNS server
</s> add // Server is the main way to start a DNS server.
// | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8396dc2fdb90711ba3394b975347a262afe22ae7 | dnsforward/upstream_pool.go |
// pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn) | <mask>
<mask> // upstream TLS pool.
<mask> //
<mask> // Example:
<mask> // pool := TLSPool{Address: "tls://1.1.1.1:853"}
<mask> // netConn, err := pool.Get()
<mask> // if err != nil {panic(err)}
<mask> // c := dns.Conn{Conn: netConn}
<mask> // q := dns.Msg{}
<mask> // q.SetQuestion("google.com.", dns.TypeA)
<mask> // log.Println(q)
<mask> // err = c.WriteMsg(&q)
<mask> // if err != nil {panic(err)}
<mask> // r, err := c.ReadMsg()
<mask> // if err != nil {panic(err)}
<mask> // log.Println(r)
<mask> // pool.Put(c.Conn)
<mask> type TLSPool struct {
<mask> Address string
<mask> parsedAddress *url.URL
<mask> parsedAddressMutex sync.RWMutex
<mask>
</s> Update docs for formatting in godoc. </s> remove // s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine
</s> add // s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine </s> remove // upstream TLS pool.
</s> add // Upstream TLS pool. </s> remove // Server is the main way to start a DNS server
</s> add // Server is the main way to start a DNS server.
// | [
"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/8396dc2fdb90711ba3394b975347a262afe22ae7 | dnsforward/upstream_pool.go |
<mask> package dnsforward
<mask>
<mask> import (
<mask> "crypto/tls"
<mask> "fmt"
<mask> "net"
<mask> "path"
<mask> "strings"
<mask> "time"
<mask>
</s> Pull request: dnsforward: do not check client srv name unless asked
Merge in DNS/adguard-home from 2664-non-strict-sni to master
Updates #2664.
Squashed commit of the following:
commit e8d625fe3b1f06f97328809a3330b37e5bd578d7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:46:52 2021 +0300
all: imp doc
commit 10537b8bdf126eca9608353e57d92edba632232a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:30:25 2021 +0300
dnsforward: do not check client srv name unless asked </s> remove const maxDomainPartLen = 64
// ValidateClientID returns an error if clientID is not a valid client ID.
func ValidateClientID(clientID string) (err error) {
if len(clientID) > maxDomainPartLen {
return fmt.Errorf("client id %q is too long, max: %d", clientID, maxDomainPartLen)
}
for i, r := range clientID {
if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' {
continue
}
return fmt.Errorf("invalid char %q at index %d in client id %q", r, i, clientID)
}
return nil
}
// clientIDFromClientServerName extracts and validates a client ID. hostSrvName
// is the server name of the host. cliSrvName is the server name as sent by the
// client.
func clientIDFromClientServerName(hostSrvName, cliSrvName string) (clientID string, err error) {
if hostSrvName == cliSrvName {
return "", nil
}
if !strings.HasSuffix(cliSrvName, hostSrvName) {
return "", fmt.Errorf("client server name %q doesn't match host server name %q", cliSrvName, hostSrvName)
}
clientID = cliSrvName[:len(cliSrvName)-len(hostSrvName)-1]
err = ValidateClientID(clientID)
if err != nil {
return "", fmt.Errorf("invalid client id: %w", err)
}
return clientID, nil
}
// processClientIDHTTPS extracts the client's ID from the path of the
// client's DNS-over-HTTPS request.
func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
r := pctx.HTTPRequest
if r == nil {
ctx.err = fmt.Errorf("proxy ctx http request of proto %s is nil", pctx.Proto)
return resultCodeError
}
origPath := r.URL.Path
parts := strings.Split(path.Clean(origPath), "/")
if parts[0] == "" {
parts = parts[1:]
}
if len(parts) == 0 || parts[0] != "dns-query" {
ctx.err = fmt.Errorf("client id check: invalid path %q", origPath)
return resultCodeError
}
clientID := ""
switch len(parts) {
case 1:
// Just /dns-query, no client ID.
return resultCodeSuccess
case 2:
clientID = parts[1]
default:
ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath)
return resultCodeError
}
err := ValidateClientID(clientID)
if err != nil {
ctx.err = fmt.Errorf("client id check: invalid client id: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
// tlsConn is a narrow interface for *tls.Conn to simplify testing.
type tlsConn interface {
ConnectionState() (cs tls.ConnectionState)
}
// quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
ConnectionState() (cs quic.ConnectionState)
}
// processClientID extracts the client's ID from the server name of the client's
// DOT or DOQ request or the path of the client's DOH.
func processClientID(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
proto := pctx.Proto
if proto == proxy.ProtoHTTPS {
return processClientIDHTTPS(ctx)
} else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC {
return resultCodeSuccess
}
hostSrvName := ctx.srv.conf.TLSConfig.ServerName
if hostSrvName == "" {
return resultCodeSuccess
}
cliSrvName := ""
if proto == proxy.ProtoTLS {
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
ctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
return resultCodeError
}
cliSrvName = tc.ConnectionState().ServerName
} else if proto == proxy.ProtoQUIC {
qs, ok := pctx.QUICSession.(quicSession)
if !ok {
ctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession)
return resultCodeError
}
cliSrvName = qs.ConnectionState().ServerName
}
clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName)
if err != nil {
ctx.err = fmt.Errorf("client id check: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
</s> add </s> remove "github.com/lucas-clemente/quic-go"
</s> add </s> remove "path"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/841bb9bc35786c710414706ef38c2830024fbfed | internal/dnsforward/dns.go | |
<mask> import (
<mask> "crypto/tls"
<mask> "fmt"
<mask> "net"
<mask> "path"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> Pull request: dnsforward: do not check client srv name unless asked
Merge in DNS/adguard-home from 2664-non-strict-sni to master
Updates #2664.
Squashed commit of the following:
commit e8d625fe3b1f06f97328809a3330b37e5bd578d7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:46:52 2021 +0300
all: imp doc
commit 10537b8bdf126eca9608353e57d92edba632232a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:30:25 2021 +0300
dnsforward: do not check client srv name unless asked </s> remove const maxDomainPartLen = 64
// ValidateClientID returns an error if clientID is not a valid client ID.
func ValidateClientID(clientID string) (err error) {
if len(clientID) > maxDomainPartLen {
return fmt.Errorf("client id %q is too long, max: %d", clientID, maxDomainPartLen)
}
for i, r := range clientID {
if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' {
continue
}
return fmt.Errorf("invalid char %q at index %d in client id %q", r, i, clientID)
}
return nil
}
// clientIDFromClientServerName extracts and validates a client ID. hostSrvName
// is the server name of the host. cliSrvName is the server name as sent by the
// client.
func clientIDFromClientServerName(hostSrvName, cliSrvName string) (clientID string, err error) {
if hostSrvName == cliSrvName {
return "", nil
}
if !strings.HasSuffix(cliSrvName, hostSrvName) {
return "", fmt.Errorf("client server name %q doesn't match host server name %q", cliSrvName, hostSrvName)
}
clientID = cliSrvName[:len(cliSrvName)-len(hostSrvName)-1]
err = ValidateClientID(clientID)
if err != nil {
return "", fmt.Errorf("invalid client id: %w", err)
}
return clientID, nil
}
// processClientIDHTTPS extracts the client's ID from the path of the
// client's DNS-over-HTTPS request.
func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
r := pctx.HTTPRequest
if r == nil {
ctx.err = fmt.Errorf("proxy ctx http request of proto %s is nil", pctx.Proto)
return resultCodeError
}
origPath := r.URL.Path
parts := strings.Split(path.Clean(origPath), "/")
if parts[0] == "" {
parts = parts[1:]
}
if len(parts) == 0 || parts[0] != "dns-query" {
ctx.err = fmt.Errorf("client id check: invalid path %q", origPath)
return resultCodeError
}
clientID := ""
switch len(parts) {
case 1:
// Just /dns-query, no client ID.
return resultCodeSuccess
case 2:
clientID = parts[1]
default:
ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath)
return resultCodeError
}
err := ValidateClientID(clientID)
if err != nil {
ctx.err = fmt.Errorf("client id check: invalid client id: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
// tlsConn is a narrow interface for *tls.Conn to simplify testing.
type tlsConn interface {
ConnectionState() (cs tls.ConnectionState)
}
// quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
ConnectionState() (cs quic.ConnectionState)
}
// processClientID extracts the client's ID from the server name of the client's
// DOT or DOQ request or the path of the client's DOH.
func processClientID(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
proto := pctx.Proto
if proto == proxy.ProtoHTTPS {
return processClientIDHTTPS(ctx)
} else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC {
return resultCodeSuccess
}
hostSrvName := ctx.srv.conf.TLSConfig.ServerName
if hostSrvName == "" {
return resultCodeSuccess
}
cliSrvName := ""
if proto == proxy.ProtoTLS {
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
ctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
return resultCodeError
}
cliSrvName = tc.ConnectionState().ServerName
} else if proto == proxy.ProtoQUIC {
qs, ok := pctx.QUICSession.(quicSession)
if !ok {
ctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession)
return resultCodeError
}
cliSrvName = qs.ConnectionState().ServerName
}
clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName)
if err != nil {
ctx.err = fmt.Errorf("client id check: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
</s> add </s> remove "github.com/lucas-clemente/quic-go"
</s> add </s> remove "crypto/tls"
"fmt"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/841bb9bc35786c710414706ef38c2830024fbfed | internal/dnsforward/dns.go | |
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/lucas-clemente/quic-go"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // To transfer information between modules
<mask> type dnsContext struct {
</s> Pull request: dnsforward: do not check client srv name unless asked
Merge in DNS/adguard-home from 2664-non-strict-sni to master
Updates #2664.
Squashed commit of the following:
commit e8d625fe3b1f06f97328809a3330b37e5bd578d7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:46:52 2021 +0300
all: imp doc
commit 10537b8bdf126eca9608353e57d92edba632232a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:30:25 2021 +0300
dnsforward: do not check client srv name unless asked </s> remove const maxDomainPartLen = 64
// ValidateClientID returns an error if clientID is not a valid client ID.
func ValidateClientID(clientID string) (err error) {
if len(clientID) > maxDomainPartLen {
return fmt.Errorf("client id %q is too long, max: %d", clientID, maxDomainPartLen)
}
for i, r := range clientID {
if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' {
continue
}
return fmt.Errorf("invalid char %q at index %d in client id %q", r, i, clientID)
}
return nil
}
// clientIDFromClientServerName extracts and validates a client ID. hostSrvName
// is the server name of the host. cliSrvName is the server name as sent by the
// client.
func clientIDFromClientServerName(hostSrvName, cliSrvName string) (clientID string, err error) {
if hostSrvName == cliSrvName {
return "", nil
}
if !strings.HasSuffix(cliSrvName, hostSrvName) {
return "", fmt.Errorf("client server name %q doesn't match host server name %q", cliSrvName, hostSrvName)
}
clientID = cliSrvName[:len(cliSrvName)-len(hostSrvName)-1]
err = ValidateClientID(clientID)
if err != nil {
return "", fmt.Errorf("invalid client id: %w", err)
}
return clientID, nil
}
// processClientIDHTTPS extracts the client's ID from the path of the
// client's DNS-over-HTTPS request.
func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
r := pctx.HTTPRequest
if r == nil {
ctx.err = fmt.Errorf("proxy ctx http request of proto %s is nil", pctx.Proto)
return resultCodeError
}
origPath := r.URL.Path
parts := strings.Split(path.Clean(origPath), "/")
if parts[0] == "" {
parts = parts[1:]
}
if len(parts) == 0 || parts[0] != "dns-query" {
ctx.err = fmt.Errorf("client id check: invalid path %q", origPath)
return resultCodeError
}
clientID := ""
switch len(parts) {
case 1:
// Just /dns-query, no client ID.
return resultCodeSuccess
case 2:
clientID = parts[1]
default:
ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath)
return resultCodeError
}
err := ValidateClientID(clientID)
if err != nil {
ctx.err = fmt.Errorf("client id check: invalid client id: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
// tlsConn is a narrow interface for *tls.Conn to simplify testing.
type tlsConn interface {
ConnectionState() (cs tls.ConnectionState)
}
// quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
ConnectionState() (cs quic.ConnectionState)
}
// processClientID extracts the client's ID from the server name of the client's
// DOT or DOQ request or the path of the client's DOH.
func processClientID(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
proto := pctx.Proto
if proto == proxy.ProtoHTTPS {
return processClientIDHTTPS(ctx)
} else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC {
return resultCodeSuccess
}
hostSrvName := ctx.srv.conf.TLSConfig.ServerName
if hostSrvName == "" {
return resultCodeSuccess
}
cliSrvName := ""
if proto == proxy.ProtoTLS {
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
ctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
return resultCodeError
}
cliSrvName = tc.ConnectionState().ServerName
} else if proto == proxy.ProtoQUIC {
qs, ok := pctx.QUICSession.(quicSession)
if !ok {
ctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession)
return resultCodeError
}
cliSrvName = qs.ConnectionState().ServerName
}
clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName)
if err != nil {
ctx.err = fmt.Errorf("client id check: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
</s> add </s> remove "path"
</s> add </s> remove "crypto/tls"
"fmt"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/841bb9bc35786c710414706ef38c2830024fbfed | internal/dnsforward/dns.go | |
<mask> ctx.proxyCtx.Res = resp
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> const maxDomainPartLen = 64
<mask>
<mask> // ValidateClientID returns an error if clientID is not a valid client ID.
<mask> func ValidateClientID(clientID string) (err error) {
<mask> if len(clientID) > maxDomainPartLen {
<mask> return fmt.Errorf("client id %q is too long, max: %d", clientID, maxDomainPartLen)
<mask> }
<mask>
<mask> for i, r := range clientID {
<mask> if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' {
<mask> continue
<mask> }
<mask>
<mask> return fmt.Errorf("invalid char %q at index %d in client id %q", r, i, clientID)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // clientIDFromClientServerName extracts and validates a client ID. hostSrvName
<mask> // is the server name of the host. cliSrvName is the server name as sent by the
<mask> // client.
<mask> func clientIDFromClientServerName(hostSrvName, cliSrvName string) (clientID string, err error) {
<mask> if hostSrvName == cliSrvName {
<mask> return "", nil
<mask> }
<mask>
<mask> if !strings.HasSuffix(cliSrvName, hostSrvName) {
<mask> return "", fmt.Errorf("client server name %q doesn't match host server name %q", cliSrvName, hostSrvName)
<mask> }
<mask>
<mask> clientID = cliSrvName[:len(cliSrvName)-len(hostSrvName)-1]
<mask> err = ValidateClientID(clientID)
<mask> if err != nil {
<mask> return "", fmt.Errorf("invalid client id: %w", err)
<mask> }
<mask>
<mask> return clientID, nil
<mask> }
<mask>
<mask> // processClientIDHTTPS extracts the client's ID from the path of the
<mask> // client's DNS-over-HTTPS request.
<mask> func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) {
<mask> pctx := ctx.proxyCtx
<mask> r := pctx.HTTPRequest
<mask> if r == nil {
<mask> ctx.err = fmt.Errorf("proxy ctx http request of proto %s is nil", pctx.Proto)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> origPath := r.URL.Path
<mask> parts := strings.Split(path.Clean(origPath), "/")
<mask> if parts[0] == "" {
<mask> parts = parts[1:]
<mask> }
<mask>
<mask> if len(parts) == 0 || parts[0] != "dns-query" {
<mask> ctx.err = fmt.Errorf("client id check: invalid path %q", origPath)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> clientID := ""
<mask> switch len(parts) {
<mask> case 1:
<mask> // Just /dns-query, no client ID.
<mask> return resultCodeSuccess
<mask> case 2:
<mask> clientID = parts[1]
<mask> default:
<mask> ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> err := ValidateClientID(clientID)
<mask> if err != nil {
<mask> ctx.err = fmt.Errorf("client id check: invalid client id: %w", err)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> ctx.clientID = clientID
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // tlsConn is a narrow interface for *tls.Conn to simplify testing.
<mask> type tlsConn interface {
<mask> ConnectionState() (cs tls.ConnectionState)
<mask> }
<mask>
<mask> // quicSession is a narrow interface for quic.Session to simplify testing.
<mask> type quicSession interface {
<mask> ConnectionState() (cs quic.ConnectionState)
<mask> }
<mask>
<mask> // processClientID extracts the client's ID from the server name of the client's
<mask> // DOT or DOQ request or the path of the client's DOH.
<mask> func processClientID(ctx *dnsContext) (rc resultCode) {
<mask> pctx := ctx.proxyCtx
<mask> proto := pctx.Proto
<mask> if proto == proxy.ProtoHTTPS {
<mask> return processClientIDHTTPS(ctx)
<mask> } else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> hostSrvName := ctx.srv.conf.TLSConfig.ServerName
<mask> if hostSrvName == "" {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> cliSrvName := ""
<mask> if proto == proxy.ProtoTLS {
<mask> conn := pctx.Conn
<mask> tc, ok := conn.(tlsConn)
<mask> if !ok {
<mask> ctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> cliSrvName = tc.ConnectionState().ServerName
<mask> } else if proto == proxy.ProtoQUIC {
<mask> qs, ok := pctx.QUICSession.(quicSession)
<mask> if !ok {
<mask> ctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> cliSrvName = qs.ConnectionState().ServerName
<mask> }
<mask>
<mask> clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName)
<mask> if err != nil {
<mask> ctx.err = fmt.Errorf("client id check: %w", err)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> ctx.clientID = clientID
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // Respond to PTR requests if the target IP address is leased by our DHCP server
<mask> func processInternalIPAddrs(ctx *dnsContext) (rc resultCode) {
<mask> s := ctx.srv
<mask> req := ctx.proxyCtx.Req
<mask> if req.Question[0].Qtype != dns.TypePTR {
</s> Pull request: dnsforward: do not check client srv name unless asked
Merge in DNS/adguard-home from 2664-non-strict-sni to master
Updates #2664.
Squashed commit of the following:
commit e8d625fe3b1f06f97328809a3330b37e5bd578d7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:46:52 2021 +0300
all: imp doc
commit 10537b8bdf126eca9608353e57d92edba632232a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:30:25 2021 +0300
dnsforward: do not check client srv name unless asked </s> remove "github.com/lucas-clemente/quic-go"
</s> add </s> remove "path"
</s> add </s> remove "crypto/tls"
"fmt"
</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/841bb9bc35786c710414706ef38c2830024fbfed | internal/dnsforward/dns.go | |
// JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
// int.
func JoinHostPort(host string, port int) (hostport string) {
return net.JoinHostPort(host, strconv.Itoa(port))
}
| <mask> (r >= 'A' && r <= 'Z') ||
<mask> (r >= '0' && r <= '9')
<mask> }
<mask>
<mask> // isValidHostRune returns true if r is a valid rune for a hostname label.
<mask> func isValidHostRune(r rune) (ok bool) {
<mask> return r == '-' || IsValidHostOuterRune(r)
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
</s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/aghnet/addr.go |
func TestJoinHostPort(t *testing.T) {
assert.Equal(t, ":0", JoinHostPort("", 0))
assert.Equal(t, "host:12345", JoinHostPort("host", 12345))
assert.Equal(t, "1.2.3.4:12345", JoinHostPort("1.2.3.4", 12345))
assert.Equal(t, "[1234::5678]:12345", JoinHostPort("1234::5678", 12345))
assert.Equal(t, "[1234::5678%lo]:12345", JoinHostPort("1234::5678%lo", 12345))
}
| <mask> }
<mask> }
<mask>
<mask> func repeatStr(b *strings.Builder, s string, n int) {
<mask> for i := 0; i < n; i++ {
<mask> _, _ = b.WriteString(s)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { </s> remove log.Error("dhcp: invalid DB: %v", err)
return
</s> add return fmt.Errorf("decoding db: %w", err) </s> remove
// JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
// int.
func JoinHostPort(host string, port int) (hostport string) {
return net.JoinHostPort(host, strconv.Itoa(port))
}
</s> add </s> remove func Create(conf ServerConfig) *Server {
s := &Server{}
</s> add func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{} </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/aghnet/addr_test.go |
<mask> }
<mask>
<mask> return addrs, nil
<mask> }
<mask>
<mask> // JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
<mask> // int.
<mask> func JoinHostPort(host string, port int) (hostport string) {
<mask> return net.JoinHostPort(host, strconv.Itoa(port))
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove Leases(flags int) []Lease
</s> add Leases(flags GetLeasesFlags) (leases []*Lease) </s> remove func (s *v6Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/aghnet/net.go | |
"fmt" | <mask> package dhcpd
<mask>
<mask> import (
<mask> "encoding/json"
<mask> "net"
<mask> "os"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *Server) Stop() {
s.srv4.Stop()
s.srv6.Stop()
}
</s> add func (s *Server) Stop() (err error) {
err = s.srv4.Stop()
if err != nil {
return err
} </s> remove func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil }
</s> add func (s *winServer) ResetLeases(_ []*Lease) (err error) { return nil }
func (s *winServer) GetLeases(_ GetLeasesFlags) (leases []*Lease) { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) RemoveStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) (mac net.HardwareAddr) { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() (err error) { return nil }
func (s *winServer) Stop() (err error) { return nil }
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove // flags for Leases() function
const (
LeasesDynamic = 1
LeasesStatic = 2
LeasesAll = LeasesDynamic | LeasesStatic
)
</s> add err = s.srv6.Stop()
if err != nil {
return err
}
return nil
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
func (s *Server) dbLoad() (err error) { | <mask> return ip
<mask> }
<mask>
<mask> // Load lease table from DB
<mask> func (s *Server) dbLoad() {
<mask> dynLeases := []*Lease{}
<mask> staticLeases := []*Lease{}
<mask> v6StaticLeases := []*Lease{}
<mask> v6DynLeases := []*Lease{}
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove result := []Lease{}
</s> add leases = []*Lease{} </s> remove func (s *Server) dbStore() {
var leases []leaseJSON
</s> add func (s *Server) dbStore() (err error) {
// Use an empty slice here as opposed to nil so that it doesn't write
// "null" into the database file if leases are empty.
leases := []leaseJSON{} </s> remove res = []Lease{}
</s> add leases = []*Lease{} </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) </s> remove s.dbStore()
</s> add err := s.dbStore()
if err != nil {
log.Error("updating db: %s", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
return fmt.Errorf("reading db: %w", err) | <mask>
<mask> data, err := os.ReadFile(s.conf.DBFilePath)
<mask> if err != nil {
<mask> if !errors.Is(err, os.ErrNotExist) {
<mask> log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
<mask> }
<mask>
<mask> return
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove return
</s> add return nil </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove log.Error("dhcp: removing %q: %s", s.conf.DBFilePath, err)
</s> add log.Error("dhcp: removing db: %s", err) </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove log.Error("json.Marshal: %v", err)
return
</s> add return fmt.Errorf("encoding db: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
return nil | <mask> if !errors.Is(err, os.ErrNotExist) {
<mask> log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
<mask> }
<mask>
<mask> return
<mask> }
<mask>
<mask> obj := []leaseJSON{}
<mask> err = json.Unmarshal(data, &obj)
<mask> if err != nil {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
</s> add return fmt.Errorf("reading db: %w", err) </s> remove log.Error("dhcp: invalid DB: %v", err)
return
</s> add return fmt.Errorf("decoding db: %w", err) </s> remove log.Error("dhcp: removing %q: %s", s.conf.DBFilePath, err)
</s> add log.Error("dhcp: removing db: %s", err) </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
return fmt.Errorf("decoding db: %w", err) | <mask>
<mask> obj := []leaseJSON{}
<mask> err = json.Unmarshal(data, &obj)
<mask> if err != nil {
<mask> log.Error("dhcp: invalid DB: %v", err)
<mask> return
<mask> }
<mask>
<mask> numLeases := len(obj)
<mask> for i := range obj {
<mask> obj[i].IP = normalizeIP(obj[i].IP)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove return
</s> add return nil </s> remove log.Error("json.Marshal: %v", err)
return
</s> add return fmt.Errorf("encoding db: %w", err) </s> remove data, err := json.Marshal(leases)
</s> add var data []byte
data, err = json.Marshal(leases) </s> remove log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
</s> add return fmt.Errorf("reading db: %w", err) </s> remove log.Error("dhcp: removing %q: %s", s.conf.DBFilePath, err)
</s> add log.Error("dhcp: removing db: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
err = s.srv4.ResetLeases(leases4)
if err != nil {
return fmt.Errorf("resetting dhcpv4 leases: %w", err)
} | <mask> }
<mask> }
<mask>
<mask> leases4 := normalizeLeases(staticLeases, dynLeases)
<mask> s.srv4.ResetLeases(leases4)
<mask>
<mask> leases6 := normalizeLeases(v6StaticLeases, v6DynLeases)
<mask> if s.srv6 != nil {
<mask> s.srv6.ResetLeases(leases6)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.srv6.ResetLeases(leases6)
</s> add err = s.srv6.ResetLeases(leases6)
if err != nil {
return fmt.Errorf("resetting dhcpv6 leases: %w", err)
} </s> remove if s6 != nil {
s.srv6 = s6
</s> add if srv6 != nil {
s.srv6 = srv6 </s> remove if s4 != nil {
s.srv4 = s4
</s> add if srv4 != nil {
s.srv4 = srv4 </s> remove s.dbLoad()
</s> add err = s.dbLoad()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "loading leases db: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
err = s.srv6.ResetLeases(leases6)
if err != nil {
return fmt.Errorf("resetting dhcpv6 leases: %w", err)
} | <mask> s.srv4.ResetLeases(leases4)
<mask>
<mask> leases6 := normalizeLeases(v6StaticLeases, v6DynLeases)
<mask> if s.srv6 != nil {
<mask> s.srv6.ResetLeases(leases6)
<mask> }
<mask>
<mask> log.Info("dhcp: loaded leases v4:%d v6:%d total-read:%d from DB",
<mask> len(leases4), len(leases6), numLeases)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.srv4.ResetLeases(leases4)
</s> add err = s.srv4.ResetLeases(leases4)
if err != nil {
return fmt.Errorf("resetting dhcpv4 leases: %w", err)
} </s> remove log.Info("dhcp: stored %d leases in DB", len(leases))
</s> add log.Info("dhcp: stored %d leases in db", len(leases))
return nil </s> remove log.Error("dhcp: can't store lease table on disk: %v filename: %s",
err, s.conf.DBFilePath)
return
</s> add return fmt.Errorf("writing db: %w", err) </s> remove if s6 != nil {
s.srv6 = s6
</s> add if srv6 != nil {
s.srv6 = srv6 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
return nil | <mask> log.Info("dhcp: loaded leases v4:%d v6:%d total-read:%d from DB",
<mask> len(leases4), len(leases6), numLeases)
<mask> }
<mask>
<mask> // Skip duplicate leases
<mask> // Static leases have a priority over dynamic leases
<mask> func normalizeLeases(staticLeases, dynLeases []*Lease) []*Lease {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.srv6.ResetLeases(leases6)
</s> add err = s.srv6.ResetLeases(leases6)
if err != nil {
return fmt.Errorf("resetting dhcpv6 leases: %w", err)
} </s> remove log.Info("dhcp: stored %d leases in DB", len(leases))
</s> add log.Info("dhcp: stored %d leases in db", len(leases))
return nil </s> remove return result
</s> add return leases </s> remove log.Error("dhcp: can't store lease table on disk: %v filename: %s",
err, s.conf.DBFilePath)
return
</s> add return fmt.Errorf("writing db: %w", err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
func (s *Server) dbStore() (err error) {
// Use an empty slice here as opposed to nil so that it doesn't write
// "null" into the database file if leases are empty.
leases := []leaseJSON{} | <mask> return leases
<mask> }
<mask>
<mask> // Store lease table in DB
<mask> func (s *Server) dbStore() {
<mask> var leases []leaseJSON
<mask>
<mask> leases4 := s.srv4.getLeasesRef()
<mask> for _, l := range leases4 {
<mask> if l.Expiry.Unix() == 0 {
<mask> continue
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove for _, l := range ll {
</s> add for _, l := range leases { </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) </s> remove func (s *Server) dbLoad() {
</s> add func (s *Server) dbLoad() (err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
var data []byte
data, err = json.Marshal(leases) | <mask> leases = append(leases, lease)
<mask> }
<mask> }
<mask>
<mask> data, err := json.Marshal(leases)
<mask> if err != nil {
<mask> log.Error("json.Marshal: %v", err)
<mask> return
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("json.Marshal: %v", err)
return
</s> add return fmt.Errorf("encoding db: %w", err) </s> remove log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
</s> add return fmt.Errorf("reading db: %w", err) </s> remove log.Error("dhcp: can't store lease table on disk: %v filename: %s",
err, s.conf.DBFilePath)
return
</s> add return fmt.Errorf("writing db: %w", err) </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
return fmt.Errorf("encoding db: %w", err) | <mask> }
<mask>
<mask> data, err := json.Marshal(leases)
<mask> if err != nil {
<mask> log.Error("json.Marshal: %v", err)
<mask> return
<mask> }
<mask>
<mask> err = maybe.WriteFile(s.conf.DBFilePath, data, 0o644)
<mask> if err != nil {
<mask> log.Error("dhcp: can't store lease table on disk: %v filename: %s",
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("dhcp: can't store lease table on disk: %v filename: %s",
err, s.conf.DBFilePath)
return
</s> add return fmt.Errorf("writing db: %w", err) </s> remove data, err := json.Marshal(leases)
</s> add var data []byte
data, err = json.Marshal(leases) </s> remove log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
</s> add return fmt.Errorf("reading db: %w", err) </s> remove return
</s> add return nil </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
return fmt.Errorf("writing db: %w", err) | <mask> }
<mask>
<mask> err = maybe.WriteFile(s.conf.DBFilePath, data, 0o644)
<mask> if err != nil {
<mask> log.Error("dhcp: can't store lease table on disk: %v filename: %s",
<mask> err, s.conf.DBFilePath)
<mask>
<mask> return
<mask> }
<mask>
<mask> log.Info("dhcp: stored %d leases in DB", len(leases))
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("json.Marshal: %v", err)
return
</s> add return fmt.Errorf("encoding db: %w", err) </s> remove log.Info("dhcp: stored %d leases in DB", len(leases))
</s> add log.Info("dhcp: stored %d leases in db", len(leases))
return nil </s> remove log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
</s> add return fmt.Errorf("reading db: %w", err) </s> remove data, err := json.Marshal(leases)
</s> add var data []byte
data, err = json.Marshal(leases) </s> remove s.srv6.ResetLeases(leases6)
</s> add err = s.srv6.ResetLeases(leases6)
if err != nil {
return fmt.Errorf("resetting dhcpv6 leases: %w", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
log.Info("dhcp: stored %d leases in db", len(leases))
return nil | <mask>
<mask> return
<mask> }
<mask>
<mask> log.Info("dhcp: stored %d leases in DB", len(leases))
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("dhcp: can't store lease table on disk: %v filename: %s",
err, s.conf.DBFilePath)
return
</s> add return fmt.Errorf("writing db: %w", err) </s> remove s.srv6.ResetLeases(leases6)
</s> add err = s.srv6.ResetLeases(leases6)
if err != nil {
return fmt.Errorf("resetting dhcpv6 leases: %w", err)
} </s> remove return res
</s> add return leases </s> remove return result
</s> add return leases | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/db.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> const (
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove // flags for Leases() function
const (
LeasesDynamic = 1
LeasesStatic = 2
LeasesAll = LeasesDynamic | LeasesStatic
)
</s> add err = s.srv6.Stop()
if err != nil {
return err
}
return nil
} </s> remove func (s *Server) Stop() {
s.srv4.Stop()
s.srv6.Stop()
}
</s> add func (s *Server) Stop() (err error) {
err = s.srv4.Stop()
if err != nil {
return err
} </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
// GetLeasesFlags are the flags for GetLeases.
type GetLeasesFlags uint8
// GetLeasesFlags values
const (
LeasesDynamic GetLeasesFlags = 0b0001
LeasesStatic GetLeasesFlags = 0b0010
LeasesAll = LeasesDynamic | LeasesStatic
)
| <mask> onLeaseChanged []OnLeaseChangedT
<mask> }
<mask>
<mask> // ServerInterface is an interface for servers.
<mask> type ServerInterface interface {
<mask> Enabled() (ok bool)
<mask> Leases(flags GetLeasesFlags) (leases []*Lease)
<mask> SetOnLeaseChanged(onLeaseChanged OnLeaseChangedT)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove Leases(flags int) []Lease
</s> add Leases(flags GetLeasesFlags) (leases []*Lease) </s> remove func (d *testDHCP) Leases(flags int) []dhcpd.Lease {
l := dhcpd.Lease{
</s> add func (d *testDHCP) Leases(flags dhcpd.GetLeasesFlags) (leases []*dhcpd.Lease) {
return []*dhcpd.Lease{{ </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
Leases(flags GetLeasesFlags) (leases []*Lease) | <mask>
<mask> // ServerInterface is an interface for servers.
<mask> type ServerInterface interface {
<mask> Enabled() (ok bool)
<mask> Leases(flags int) []Lease
<mask> SetOnLeaseChanged(onLeaseChanged OnLeaseChangedT)
<mask> }
<mask>
<mask> // Create - create object
<mask> func Create(conf ServerConfig) *Server {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func Create(conf ServerConfig) *Server {
s := &Server{}
</s> add func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{} </s> remove func (d *testDHCP) Leases(flags int) []dhcpd.Lease {
l := dhcpd.Lease{
</s> add func (d *testDHCP) Leases(flags dhcpd.GetLeasesFlags) (leases []*dhcpd.Lease) {
return []*dhcpd.Lease{{ </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{} | <mask> SetOnLeaseChanged(onLeaseChanged OnLeaseChangedT)
<mask> }
<mask>
<mask> // Create - create object
<mask> func Create(conf ServerConfig) *Server {
<mask> s := &Server{}
<mask>
<mask> s.conf.Enabled = conf.Enabled
<mask> s.conf.InterfaceName = conf.InterfaceName
<mask> s.conf.HTTPRegister = conf.HTTPRegister
<mask> s.conf.ConfigModified = conf.ConfigModified
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove Leases(flags int) []Lease
</s> add Leases(flags GetLeasesFlags) (leases []*Lease) </s> remove conf := dhcpServerConfigJSON{}
</s> add conf := &dhcpServerConfigJSON{} </s> remove if s4 != nil {
s.srv4 = s4
</s> add if srv4 != nil {
s.srv4 = srv4 </s> remove s.Stop()
</s> add err = s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove err := json.NewDecoder(r.Body).Decode(&conf)
</s> add err := json.NewDecoder(r.Body).Decode(conf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
<mask>
<mask> webHandlersRegistered = true
<mask> }
<mask>
<mask> var err4, err6 error
<mask> v4conf := conf.Conf4
<mask> v4conf.Enabled = s.conf.Enabled
<mask> if len(v4conf.RangeStart) == 0 {
<mask> v4conf.Enabled = false
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.srv4, err4 = v4Create(v4conf)
</s> add s.srv4, err = v4Create(v4conf)
if err != nil {
return nil, fmt.Errorf("creating dhcpv4 srv: %w", err)
} </s> remove s.srv6, err6 = v6Create(v6conf)
if err4 != nil {
log.Error("%s", err4)
return nil
}
if err6 != nil {
log.Error("%s", err6)
return nil
</s> add s.srv6, err = v6Create(v6conf)
if err != nil {
return nil, fmt.Errorf("creating dhcpv6 srv: %w", err) </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove s.dbLoad()
</s> add err = s.dbLoad()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "loading leases db: %s", err)
return
} </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go | |
s.srv4, err = v4Create(v4conf)
if err != nil {
return nil, fmt.Errorf("creating dhcpv4 srv: %w", err)
} | <mask> v4conf.Enabled = false
<mask> }
<mask> v4conf.InterfaceName = s.conf.InterfaceName
<mask> v4conf.notify = s.onNotify
<mask> s.srv4, err4 = v4Create(v4conf)
<mask>
<mask> v6conf := conf.Conf6
<mask> v6conf.Enabled = s.conf.Enabled
<mask> if len(v6conf.RangeStart) == 0 {
<mask> v6conf.Enabled = false
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.srv6, err6 = v6Create(v6conf)
if err4 != nil {
log.Error("%s", err4)
return nil
}
if err6 != nil {
log.Error("%s", err6)
return nil
</s> add s.srv6, err = v6Create(v6conf)
if err != nil {
return nil, fmt.Errorf("creating dhcpv6 srv: %w", err) </s> remove var err4, err6 error
</s> add </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
}
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
s6, err = v6Create(v6Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err)
</s> add srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err) </s> remove func Create(conf ServerConfig) *Server {
s := &Server{}
</s> add func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
s.srv6, err = v6Create(v6conf)
if err != nil {
return nil, fmt.Errorf("creating dhcpv6 srv: %w", err) | <mask> v6conf.Enabled = false
<mask> }
<mask> v6conf.InterfaceName = s.conf.InterfaceName
<mask> v6conf.notify = s.onNotify
<mask> s.srv6, err6 = v6Create(v6conf)
<mask>
<mask> if err4 != nil {
<mask> log.Error("%s", err4)
<mask> return nil
<mask> }
<mask> if err6 != nil {
<mask> log.Error("%s", err6)
<mask> return nil
<mask> }
<mask>
<mask> s.conf.Conf4 = conf.Conf4
<mask> s.conf.Conf6 = conf.Conf6
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.srv4, err4 = v4Create(v4conf)
</s> add s.srv4, err = v4Create(v4conf)
if err != nil {
return nil, fmt.Errorf("creating dhcpv4 srv: %w", err)
} </s> remove var err4, err6 error
</s> add </s> remove if s4 != nil {
s.srv4 = s4
</s> add if srv4 != nil {
s.srv4 = srv4 </s> remove log.Error("Can't enable DHCP server because neither DHCPv4 nor DHCPv6 servers are configured")
return nil
</s> add return nil, fmt.Errorf("neither dhcpv4 nor dhcpv6 srv is configured") </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
return nil, fmt.Errorf("neither dhcpv4 nor dhcpv6 srv is configured") | <mask> s.conf.Conf4 = conf.Conf4
<mask> s.conf.Conf6 = conf.Conf6
<mask>
<mask> if s.conf.Enabled && !v4conf.Enabled && !v6conf.Enabled {
<mask> log.Error("Can't enable DHCP server because neither DHCPv4 nor DHCPv6 servers are configured")
<mask> return nil
<mask> }
<mask>
<mask> // we can't delay database loading until DHCP server is started,
<mask> // because we need static leases functionality available beforehand
<mask> s.dbLoad()
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove // we can't delay database loading until DHCP server is started,
// because we need static leases functionality available beforehand
s.dbLoad()
return s
</s> add // Don't delay database loading until the DHCP server is started,
// because we need static leases functionality available beforehand.
err = s.dbLoad()
if err != nil {
return nil, fmt.Errorf("loading db: %w", err)
}
return s, nil </s> remove s.srv6, err6 = v6Create(v6conf)
if err4 != nil {
log.Error("%s", err4)
return nil
}
if err6 != nil {
log.Error("%s", err6)
return nil
</s> add s.srv6, err = v6Create(v6conf)
if err != nil {
return nil, fmt.Errorf("creating dhcpv6 srv: %w", err) </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
// Don't delay database loading until the DHCP server is started,
// because we need static leases functionality available beforehand.
err = s.dbLoad()
if err != nil {
return nil, fmt.Errorf("loading db: %w", err)
}
return s, nil | <mask> log.Error("Can't enable DHCP server because neither DHCPv4 nor DHCPv6 servers are configured")
<mask> return nil
<mask> }
<mask>
<mask> // we can't delay database loading until DHCP server is started,
<mask> // because we need static leases functionality available beforehand
<mask> s.dbLoad()
<mask> return s
<mask> }
<mask>
<mask> // Enabled returns true when the server is enabled.
<mask> func (s *Server) Enabled() (ok bool) {
<mask> return s.conf.Enabled
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("Can't enable DHCP server because neither DHCPv4 nor DHCPv6 servers are configured")
return nil
</s> add return nil, fmt.Errorf("neither dhcpv4 nor dhcpv6 srv is configured") </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove func (s *v4Server) GetLeases(flags int) (res []Lease) {
</s> add func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove s.dbStore()
</s> add err := s.dbStore()
if err != nil {
log.Error("updating db: %s", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
err := s.dbStore()
if err != nil {
log.Error("updating db: %s", err)
} | <mask>
<mask> // server calls this function after DB is updated
<mask> func (s *Server) onNotify(flags uint32) {
<mask> if flags == LeaseChangedDBStore {
<mask> s.dbStore()
<mask>
<mask> return
<mask> }
<mask>
<mask> s.notify(int(flags))
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *Server) Stop() {
s.srv4.Stop()
s.srv6.Stop()
}
</s> add func (s *Server) Stop() (err error) {
err = s.srv4.Stop()
if err != nil {
return err
} </s> remove func (s *Server) dbLoad() {
</s> add func (s *Server) dbLoad() (err error) { </s> remove func (s *Server) dbStore() {
var leases []leaseJSON
</s> add func (s *Server) dbStore() (err error) {
// Use an empty slice here as opposed to nil so that it doesn't write
// "null" into the database file if leases are empty.
leases := []leaseJSON{} </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove // flags for Leases() function
const (
LeasesDynamic = 1
LeasesStatic = 2
LeasesAll = LeasesDynamic | LeasesStatic
)
</s> add err = s.srv6.Stop()
if err != nil {
return err
}
return nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
func (s *Server) Stop() (err error) {
err = s.srv4.Stop()
if err != nil {
return err
} | <mask> return nil
<mask> }
<mask>
<mask> // Stop closes the listening UDP socket
<mask> func (s *Server) Stop() {
<mask> s.srv4.Stop()
<mask> s.srv6.Stop()
<mask> }
<mask>
<mask> // flags for Leases() function
<mask> const (
<mask> LeasesDynamic = 1
<mask> LeasesStatic = 2
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove // flags for Leases() function
const (
LeasesDynamic = 1
LeasesStatic = 2
LeasesAll = LeasesDynamic | LeasesStatic
)
</s> add err = s.srv6.Stop()
if err != nil {
return err
}
return nil
} </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove func (s *v6Server) Stop() {
err := s.ra.Close()
</s> add func (s *v6Server) Stop() (err error) {
err = s.ra.Close() </s> remove s.dbStore()
</s> add err := s.dbStore()
if err != nil {
log.Error("updating db: %s", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
err = s.srv6.Stop()
if err != nil {
return err
}
return nil
} | <mask> s.srv4.Stop()
<mask> s.srv6.Stop()
<mask> }
<mask>
<mask> // flags for Leases() function
<mask> const (
<mask> LeasesDynamic = 1
<mask> LeasesStatic = 2
<mask> LeasesAll = LeasesDynamic | LeasesStatic
<mask> )
<mask>
<mask> // Leases returns the list of active IPv4 and IPv6 DHCP leases. It's safe for
<mask> // concurrent use.
<mask> func (s *Server) Leases(flags int) (leases []Lease) {
<mask> return append(s.srv4.GetLeases(flags), s.srv6.GetLeases(flags)...)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { </s> remove func (s *Server) Stop() {
s.srv4.Stop()
s.srv6.Stop()
}
</s> add func (s *Server) Stop() (err error) {
err = s.srv4.Stop()
if err != nil {
return err
} </s> remove func (s *v4Server) GetLeases(flags int) (res []Lease) {
</s> add func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { | <mask> )
<mask>
<mask> // Leases returns the list of active IPv4 and IPv6 DHCP leases. It's safe for
<mask> // concurrent use.
<mask> func (s *Server) Leases(flags int) (leases []Lease) {
<mask> return append(s.srv4.GetLeases(flags), s.srv6.GetLeases(flags)...)
<mask> }
<mask>
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
<mask> func (s *Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove return res
</s> add return leases </s> remove // flags for Leases() function
const (
LeasesDynamic = 1
LeasesStatic = 2
LeasesAll = LeasesDynamic | LeasesStatic
)
</s> add err = s.srv6.Stop()
if err != nil {
return err
}
return nil
} </s> remove AddStaticLease(lease Lease) error
</s> add AddStaticLease(l *Lease) (err error) </s> remove RemoveStaticLease(l Lease) error
</s> add RemoveStaticLease(l *Lease) (err error) </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) | <mask> return s.srv6.FindMACbyIP(ip)
<mask> }
<mask>
<mask> // AddStaticLease - add static v4 lease
<mask> func (s *Server) AddStaticLease(lease Lease) error {
<mask> return s.srv4.AddStaticLease(lease)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove AddStaticLease(lease Lease) error
</s> add AddStaticLease(l *Lease) (err error) </s> remove RemoveStaticLease(l Lease) error
</s> add RemoveStaticLease(l *Lease) (err error) </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) </s> remove func (s *v6Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { </s> remove func (s *v6Server) AddStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) AddStaticLease(l *Lease) (err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd.go |
leases := []*Lease{{ | <mask>
<mask> s.srv6, err = v6Create(V6ServerConf{})
<mask> require.NoError(t, err)
<mask>
<mask> leases := []Lease{{
<mask> Expiry: time.Now().Add(time.Hour),
<mask> Hostname: "static-1.local",
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> IP: net.IP{192, 168, 10, 100},
<mask> }, {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
</s> add err = clients.dhcpServer.AddStaticLease(&dhcpd.Lease{ </s> remove err = 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/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd_test.go |
err = srv4.addLease(leases[0]) | <mask>
<mask> srv4, ok := s.srv4.(*v4Server)
<mask> require.True(t, ok)
<mask>
<mask> err = srv4.addLease(&leases[0])
<mask> require.NoError(t, err)
<mask>
<mask> err = s.srv4.AddStaticLease(leases[1])
<mask> require.NoError(t, err)
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </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 s.dbStore()
</s> add err = s.dbStore()
require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove l := Lease{
</s> add l := &Lease{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd_test.go |
err = s.dbStore()
require.NoError(t, err)
| <mask>
<mask> err = s.srv4.AddStaticLease(leases[1])
<mask> require.NoError(t, err)
<mask>
<mask> s.dbStore()
<mask> t.Cleanup(func() {
<mask> assert.NoError(t, os.Remove(dbFilename))
<mask> })
<mask> s.srv4.ResetLeases(nil)
<mask> s.dbLoad()
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.srv4.ResetLeases(nil)
s.dbLoad()
</s> add err = s.srv4.ResetLeases(nil)
require.NoError(t, err)
err = s.dbLoad()
require.NoError(t, err) </s> remove err = srv4.addLease(&leases[0])
</s> add err = srv4.addLease(leases[0]) </s> remove clients.dhcpServer = dhcpd.Create(config)
</s> add clients.dhcpServer, err = dhcpd.Create(config)
require.NoError(t, err)
</s> remove err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
</s> add err = clients.dhcpServer.AddStaticLease(&dhcpd.Lease{ </s> remove s.dbLoad()
</s> add err = s.dbLoad()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "loading leases db: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd_test.go |
err = s.srv4.ResetLeases(nil)
require.NoError(t, err)
err = s.dbLoad()
require.NoError(t, err) | <mask> s.dbStore()
<mask> t.Cleanup(func() {
<mask> assert.NoError(t, os.Remove(dbFilename))
<mask> })
<mask> s.srv4.ResetLeases(nil)
<mask> s.dbLoad()
<mask>
<mask> ll := s.srv4.GetLeases(LeasesAll)
<mask> require.Len(t, ll, len(leases))
<mask>
<mask> assert.Equal(t, leases[1].HWAddr, ll[0].HWAddr)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.dbStore()
</s> add err = s.dbStore()
require.NoError(t, err)
</s> remove require.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.Error(t, err) </s> remove err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
</s> add err = clients.dhcpServer.AddStaticLease(&dhcpd.Lease{ </s> remove s.dbStore()
</s> add err := s.dbStore()
if err != nil {
log.Error("updating db: %s", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/dhcpd_test.go |
<mask> }
<mask>
<mask> // dhcpStatusResponse is the response for /control/dhcp/status endpoint.
<mask> type dhcpStatusResponse struct {
<mask> Enabled bool `json:"enabled"`
<mask> IfaceName string `json:"interface_name"`
<mask> V4 V4ServerConf `json:"v4"`
<mask> V6 V6ServerConf `json:"v6"`
<mask> Leases []Lease `json:"leases"`
<mask> StaticLeases []Lease `json:"static_leases"`
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove Leases []Lease `json:"leases"`
StaticLeases []Lease `json:"static_leases"`
</s> add Leases []*Lease `json:"leases"`
StaticLeases []*Lease `json:"static_leases"`
Enabled bool `json:"enabled"` </s> remove Leases(flags int) []Lease
</s> add Leases(flags GetLeasesFlags) (leases []*Lease) </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove conf := dhcpServerConfigJSON{}
</s> add conf := &dhcpServerConfigJSON{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go | |
Leases []*Lease `json:"leases"`
StaticLeases []*Lease `json:"static_leases"`
Enabled bool `json:"enabled"` | <mask> Enabled bool `json:"enabled"`
<mask> IfaceName string `json:"interface_name"`
<mask> V4 V4ServerConf `json:"v4"`
<mask> V6 V6ServerConf `json:"v6"`
<mask> Leases []Lease `json:"leases"`
<mask> StaticLeases []Lease `json:"static_leases"`
<mask> }
<mask>
<mask> func (s *Server) handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> status := &dhcpStatusResponse{
<mask> Enabled: s.conf.Enabled,
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove Enabled bool `json:"enabled"`
</s> add </s> remove conf := dhcpServerConfigJSON{}
</s> add conf := &dhcpServerConfigJSON{} </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
conf := &dhcpServerConfigJSON{} | <mask> Enabled nullBool `json:"enabled"`
<mask> }
<mask>
<mask> func (s *Server) handleDHCPSetConfig(w http.ResponseWriter, r *http.Request) {
<mask> conf := dhcpServerConfigJSON{}
<mask> conf.Enabled = boolToNullBool(s.conf.Enabled)
<mask> conf.InterfaceName = s.conf.InterfaceName
<mask>
<mask> err := json.NewDecoder(r.Body).Decode(&conf)
<mask> if err != nil {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err := json.NewDecoder(r.Body).Decode(&conf)
</s> add err := json.NewDecoder(r.Body).Decode(conf) </s> remove Leases []Lease `json:"leases"`
StaticLeases []Lease `json:"static_leases"`
</s> add Leases []*Lease `json:"leases"`
StaticLeases []*Lease `json:"static_leases"`
Enabled bool `json:"enabled"` </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.