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 |
|---|---|---|---|---|
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0 | <mask> github.com/ti-mo/netfilter v0.4.0
<mask> go.etcd.io/bbolt v1.3.6
<mask> golang.org/x/crypto v0.1.0
<mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136
<mask> golang.org/x/net v0.1.0
<mask> golang.org/x/sys v0.2.0
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v3 v3.0.1
<mask> howett.net/plist v1.0.0
<mask> )
<mask>
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove golang.org/x/text v0.4.0 // indirect
</s> add golang.org/x/text v0.5.0 // indirect </s> remove golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
</s> add golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove if len(errs) > 0 {
return errors.List("stopping dns server", errs...)
} else {
s.isRunning = false
}
</s> add s.isRunning = false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | go.mod |
golang.org/x/text v0.5.0 // indirect | <mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
<mask> golang.org/x/mod v0.6.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/text v0.4.0 // indirect
<mask> golang.org/x/tools v0.2.0 // indirect
<mask> )
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove golang.org/x/net v0.1.0
golang.org/x/sys v0.2.0
</s> add golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0 </s> remove if len(errs) > 0 {
return errors.List("stopping dns server", errs...)
} else {
s.isRunning = false
}
</s> add s.isRunning = false </s> remove golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
</s> add golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | go.mod |
github.com/AdguardTeam/dnsproxy v0.46.5 h1:TiJZhwaIDDaKkqEfJ9AD9aroFjcHN8oEbKB8WfTjSIs=
github.com/AdguardTeam/dnsproxy v0.46.5/go.mod h1:yKBVgFlE6CqTQtye++3e7SATaMPc4Ixij+KkHsM6HhM= | <mask> github.com/AdguardTeam/dnsproxy v0.46.4 h1:/+wnTG0q2TkGQyA1PeSsjv4/f5ZprGduKPSoOcG+rOU=
<mask> github.com/AdguardTeam/dnsproxy v0.46.4/go.mod h1:yYDMAH6ay2PxLcLtfVM3FUiyv/U9B/zYO+cIIssuJNU=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.11.3 h1:Oif+REq2WLycQ2Xm3ZPmJdfftptss0HbGWbxdFaC310=
<mask> github.com/AdguardTeam/golibs v0.11.3/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove github.com/AdguardTeam/dnsproxy v0.46.4
</s> add github.com/AdguardTeam/dnsproxy v0.46.5 </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
</s> add golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= </s> remove if len(errs) > 0 {
return errors.List("stopping dns server", errs...)
} else {
s.isRunning = false
}
</s> add s.isRunning = false | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | go.sum |
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= | <mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
<mask> golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
<mask> golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
<mask> golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
<mask> golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove golang.org/x/net v0.1.0
golang.org/x/sys v0.2.0
</s> add golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0 </s> remove golang.org/x/text v0.4.0 // indirect
</s> add golang.org/x/text v0.5.0 // indirect </s> remove if len(errs) > 0 {
return errors.List("stopping dns server", errs...)
} else {
s.isRunning = false
}
</s> add s.isRunning = false </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing local resolvers: %s", err) </s> remove const action = "closing local resolvers"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | go.sum |
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
<mask> golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove golang.org/x/net v0.1.0
golang.org/x/sys v0.2.0
</s> add golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0 </s> remove golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/text v0.4.0 // indirect
</s> add golang.org/x/text v0.5.0 // indirect </s> remove github.com/AdguardTeam/dnsproxy v0.46.4 h1:/+wnTG0q2TkGQyA1PeSsjv4/f5ZprGduKPSoOcG+rOU=
github.com/AdguardTeam/dnsproxy v0.46.4/go.mod h1:yYDMAH6ay2PxLcLtfVM3FUiyv/U9B/zYO+cIIssuJNU=
</s> add github.com/AdguardTeam/dnsproxy v0.46.5 h1:TiJZhwaIDDaKkqEfJ9AD9aroFjcHN8oEbKB8WfTjSIs=
github.com/AdguardTeam/dnsproxy v0.46.5/go.mod h1:yKBVgFlE6CqTQtye++3e7SATaMPc4Ixij+KkHsM6HhM= </s> remove if len(errs) > 0 {
return errors.List("stopping dns server", errs...)
} else {
s.isRunning = false
}
</s> add s.isRunning = false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | go.sum |
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= | <mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
<mask> golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
<mask> golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
<mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove golang.org/x/text v0.4.0 // indirect
</s> add golang.org/x/text v0.5.0 // indirect </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
</s> add golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= </s> remove golang.org/x/net v0.1.0
golang.org/x/sys v0.2.0
</s> add golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0 </s> remove github.com/AdguardTeam/dnsproxy v0.46.4 h1:/+wnTG0q2TkGQyA1PeSsjv4/f5ZprGduKPSoOcG+rOU=
github.com/AdguardTeam/dnsproxy v0.46.4/go.mod h1:yYDMAH6ay2PxLcLtfVM3FUiyv/U9B/zYO+cIIssuJNU=
</s> add github.com/AdguardTeam/dnsproxy v0.46.5 h1:TiJZhwaIDDaKkqEfJ9AD9aroFjcHN8oEbKB8WfTjSIs=
github.com/AdguardTeam/dnsproxy v0.46.5/go.mod h1:yKBVgFlE6CqTQtye++3e7SATaMPc4Ixij+KkHsM6HhM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | go.sum |
// TODO(e.burkov, a.garipov): Return critical errors, not just log them.
// This will require filtering all the non-critical errors in
// [upstream.Upstream] implementations.
| <mask>
<mask> // stopLocked stops the DNS server without locking. For internal use only.
<mask> func (s *Server) stopLocked() (err error) {
<mask> if s.dnsProxy != nil {
<mask> err = s.dnsProxy.Stop()
<mask> if err != nil {
<mask> log.Error("dnsforward: closing primary resolvers: %s", err)
<mask> }
<mask> }
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove return fmt.Errorf("closing primary resolvers: %w", err)
</s> add log.Error("dnsforward: closing primary resolvers: %s", err) </s> remove if len(errs) > 0 {
return errors.List("stopping dns server", errs...)
} else {
s.isRunning = false
}
</s> add s.isRunning = false </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing internal resolvers: %s", err) </s> remove var errs []error
</s> add </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing local resolvers: %s", err) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | internal/dnsforward/dnsforward.go |
log.Error("dnsforward: closing primary resolvers: %s", err) | <mask> func (s *Server) stopLocked() (err error) {
<mask> if s.dnsProxy != nil {
<mask> err = s.dnsProxy.Stop()
<mask> if err != nil {
<mask> return fmt.Errorf("closing primary resolvers: %w", err)
<mask> }
<mask> }
<mask>
<mask> var errs []error
<mask>
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove var errs []error
</s> add </s> remove const action = "closing internal resolvers"
</s> add </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing local resolvers: %s", err) </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing internal resolvers: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | internal/dnsforward/dnsforward.go |
<mask> return fmt.Errorf("closing primary resolvers: %w", err)
<mask> }
<mask> }
<mask>
<mask> var errs []error
<mask>
<mask> if upsConf := s.internalProxy.UpstreamConfig; upsConf != nil {
<mask> const action = "closing internal resolvers"
<mask>
<mask> err = upsConf.Close()
<mask> if err != nil {
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove const action = "closing internal resolvers"
</s> add </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing internal resolvers: %s", err) </s> remove return fmt.Errorf("closing primary resolvers: %w", err)
</s> add log.Error("dnsforward: closing primary resolvers: %s", err) </s> remove const action = "closing local resolvers"
</s> add </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing local resolvers: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | internal/dnsforward/dnsforward.go | |
<mask>
<mask> var errs []error
<mask>
<mask> if upsConf := s.internalProxy.UpstreamConfig; upsConf != nil {
<mask> const action = "closing internal resolvers"
<mask>
<mask> err = upsConf.Close()
<mask> if err != nil {
<mask> if errors.Is(err, net.ErrClosed) {
<mask> log.Debug("dnsforward: %s: %s", action, err)
<mask> } else {
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing internal resolvers: %s", err) </s> remove const action = "closing local resolvers"
</s> add </s> remove var errs []error
</s> add </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing local resolvers: %s", err) </s> remove return fmt.Errorf("closing primary resolvers: %w", err)
</s> add log.Error("dnsforward: closing primary resolvers: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | internal/dnsforward/dnsforward.go | |
log.Error("dnsforward: closing internal resolvers: %s", err) | <mask> const action = "closing internal resolvers"
<mask>
<mask> err = upsConf.Close()
<mask> if err != nil {
<mask> if errors.Is(err, net.ErrClosed) {
<mask> log.Debug("dnsforward: %s: %s", action, err)
<mask> } else {
<mask> errs = append(errs, fmt.Errorf("%s: %w", action, err))
<mask> }
<mask> }
<mask> }
<mask>
<mask> if upsConf := s.localResolvers.UpstreamConfig; upsConf != nil {
<mask> const action = "closing local resolvers"
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove const action = "closing local resolvers"
</s> add </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing local resolvers: %s", err) </s> remove const action = "closing internal resolvers"
</s> add </s> remove var errs []error
</s> add </s> remove return fmt.Errorf("closing primary resolvers: %w", err)
</s> add log.Error("dnsforward: closing primary resolvers: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | internal/dnsforward/dnsforward.go |
<mask> }
<mask> }
<mask>
<mask> if upsConf := s.localResolvers.UpstreamConfig; upsConf != nil {
<mask> const action = "closing local resolvers"
<mask>
<mask> err = upsConf.Close()
<mask> if err != nil {
<mask> if errors.Is(err, net.ErrClosed) {
<mask> log.Debug("dnsforward: %s: %s", action, err)
<mask> } else {
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing internal resolvers: %s", err) </s> remove const action = "closing internal resolvers"
</s> add </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing local resolvers: %s", err) </s> remove var errs []error
</s> add </s> remove return fmt.Errorf("closing primary resolvers: %w", err)
</s> add log.Error("dnsforward: closing primary resolvers: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | internal/dnsforward/dnsforward.go | |
log.Error("dnsforward: closing local resolvers: %s", err) | <mask> const action = "closing local resolvers"
<mask>
<mask> err = upsConf.Close()
<mask> if err != nil {
<mask> if errors.Is(err, net.ErrClosed) {
<mask> log.Debug("dnsforward: %s: %s", action, err)
<mask> } else {
<mask> errs = append(errs, fmt.Errorf("%s: %w", action, err))
<mask> }
<mask> }
<mask> }
<mask>
<mask> if len(errs) > 0 {
<mask> return errors.List("stopping dns server", errs...)
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing internal resolvers: %s", err) </s> remove if len(errs) > 0 {
return errors.List("stopping dns server", errs...)
} else {
s.isRunning = false
}
</s> add s.isRunning = false </s> remove const action = "closing local resolvers"
</s> add </s> remove const action = "closing internal resolvers"
</s> add </s> remove var errs []error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | internal/dnsforward/dnsforward.go |
s.isRunning = false | <mask> }
<mask> }
<mask> }
<mask>
<mask> if len(errs) > 0 {
<mask> return errors.List("stopping dns server", errs...)
<mask> } else {
<mask> s.isRunning = false
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // IsRunning returns true if the DNS server is running.
</s> Pull request: 5251-close-ups
Merge in DNS/adguard-home from 5251-close-ups to master
Updates #5251.
Squashed commit of the following:
commit 98a4a9a45ae702df3cf26cab0b28bd83a6556085
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:31:17 2022 +0300
all: log changes better
commit af25803925c15ba2d9b07865c3deb58033006c52
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:24:42 2022 +0300
all: log changes
commit 65bb12d8b6d6bd2e37ee83bc4aca63aa573da63a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 18:15:41 2022 +0300
all: upd dnsproxy
commit 24039cd7f9c64ee5d9806e1146dbd1e76c298a20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 17:19:15 2022 +0300
dnsforward: imp code, docs
commit a40bbd55267c9904c14b89568408f86ccb3ef6c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 14 16:43:10 2022 +0300
dnsforward: log errs instead of return </s> remove if errors.Is(err, net.ErrClosed) {
log.Debug("dnsforward: %s: %s", action, err)
} else {
errs = append(errs, fmt.Errorf("%s: %w", action, err))
}
</s> add log.Error("dnsforward: closing local resolvers: %s", err) </s> remove var errs []error
</s> add </s> remove const action = "closing local resolvers"
</s> add </s> remove return fmt.Errorf("closing primary resolvers: %w", err)
</s> add log.Error("dnsforward: closing primary resolvers: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d77b743c7bd371a207d0c103a3a8821dd95841ba | internal/dnsforward/dnsforward.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghalg" | <mask> "net"
<mask> "net/http"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/AdguardTeam/urlfilter"
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove uv.Add(p)
</s> add uc.Add(p) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/dnsforward/access.go |
err = merged.Validate(aghalg.StringIsBefore) | <mask> return fmt.Errorf("validating blocked hosts: %w", err)
<mask> }
<mask>
<mask> merged := allowed.Merge(disallowed)
<mask> err = merged.Validate(aghalgo.StringIsBefore)
<mask> if err != nil {
<mask> return fmt.Errorf("items in allowed and disallowed clients intersect: %w", err)
<mask> }
<mask>
<mask> return nil
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove uv := aghalgo.UniquenessValidator{}
addPorts(
uv,
config.BindPort,
config.BetaBindPort,
reqData.Web.Port,
)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.Web.Status = err.Error()
} else if reqData.Web.Port != 0 {
err = aghnet.CheckPort("tcp", reqData.Web.IP, reqData.Web.Port)
</s> add switch port {
case 0, config.BindPort:
return nil
default:
// Go on and check the port binding only if it's not zero or won't be
// unbound after install.
}
return aghnet.CheckPort("tcp", req.Web.IP, port)
}
// validateDNS returns error if the DNS part of the initial configuration can't
// be set. autofix is true if the port can be unbound by AdGuard Home
// automatically.
func (req *checkConfReq) validateDNS(uc aghalg.UniqChecker) (canAutofix bool, err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }()
port := req.DNS.Port
addPorts(uc, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
return false, err
}
switch port {
case 0:
return false, nil
case config.BindPort:
// Go on and only check the UDP port since the TCP one is already bound
// by AdGuard Home for web interface.
default:
// Check TCP as well.
err = aghnet.CheckPort("tcp", req.DNS.IP, port) </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/dnsforward/access.go |
func validateStrUniq(clients []string) (uc aghalg.UniqChecker, err error) {
uc = make(aghalg.UniqChecker, len(clients)) | <mask> return nil
<mask> }
<mask>
<mask> // validateStrUniq returns an informative error if clients are not unique.
<mask> func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) {
<mask> uv = make(aghalgo.UniquenessValidator, len(clients))
<mask> for _, c := range clients {
<mask> uv.Add(c)
<mask> }
<mask>
<mask> return uv, uv.Validate(aghalgo.StringIsBefore)
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv.Add(c)
</s> add uc.Add(c) </s> remove return uv, uv.Validate(aghalgo.StringIsBefore)
</s> add return uc, uc.Validate(aghalg.StringIsBefore) </s> remove func addPorts(uv aghalgo.UniquenessValidator, ports ...int) {
</s> add func addPorts(uc aghalg.UniqChecker, ports ...int) { </s> remove uv.Add(p)
</s> add uc.Add(p) </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/dnsforward/access.go |
uc.Add(c) | <mask> // validateStrUniq returns an informative error if clients are not unique.
<mask> func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) {
<mask> uv = make(aghalgo.UniquenessValidator, len(clients))
<mask> for _, c := range clients {
<mask> uv.Add(c)
<mask> }
<mask>
<mask> return uv, uv.Validate(aghalgo.StringIsBefore)
<mask> }
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) {
uv = make(aghalgo.UniquenessValidator, len(clients))
</s> add func validateStrUniq(clients []string) (uc aghalg.UniqChecker, err error) {
uc = make(aghalg.UniqChecker, len(clients)) </s> remove return uv, uv.Validate(aghalgo.StringIsBefore)
</s> add return uc, uc.Validate(aghalg.StringIsBefore) </s> remove func addPorts(uv aghalgo.UniquenessValidator, ports ...int) {
</s> add func addPorts(uc aghalg.UniqChecker, ports ...int) { </s> remove uv.Add(p)
</s> add uc.Add(p) </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/dnsforward/access.go |
return uc, uc.Validate(aghalg.StringIsBefore) | <mask> for _, c := range clients {
<mask> uv.Add(c)
<mask> }
<mask>
<mask> return uv, uv.Validate(aghalgo.StringIsBefore)
<mask> }
<mask>
<mask> func (s *Server) handleAccessSet(w http.ResponseWriter, r *http.Request) {
<mask> list := &accessListJSON{}
<mask> err := json.NewDecoder(r.Body).Decode(&list)
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv.Add(c)
</s> add uc.Add(c) </s> remove func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) {
uv = make(aghalgo.UniquenessValidator, len(clients))
</s> add func validateStrUniq(clients []string) (uc aghalg.UniqChecker, err error) {
uc = make(aghalg.UniqChecker, len(clients)) </s> remove func addPorts(uv aghalgo.UniquenessValidator, ports ...int) {
</s> add func addPorts(uc aghalg.UniqChecker, ports ...int) { </s> remove uv.Add(p)
</s> add uc.Add(p) </s> remove if aghnet.IsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
</s> add // handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/dnsforward/access.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghalg" | <mask> "os"
<mask> "path/filepath"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove uv.Add(p)
</s> add uc.Add(p) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/config.go |
uc := aghalg.UniqChecker{} | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/config.go |
uc, | <mask> }
<mask>
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
<mask> )
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/config.go |
uc, | <mask> )
<mask>
<mask> if config.TLS.Enabled {
<mask> addPorts(
<mask> uv,
<mask> config.TLS.PortHTTPS,
<mask> config.TLS.PortDNSOverTLS,
<mask> config.TLS.PortDNSOverQUIC,
<mask> config.TLS.PortDNSCrypt,
<mask> )
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/config.go |
if err = uc.Validate(aghalg.IntIsBefore); err != nil { | <mask> config.TLS.PortDNSOverQUIC,
<mask> config.TLS.PortDNSCrypt,
<mask> )
<mask> }
<mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
<mask> return fmt.Errorf("validating ports: %w", err)
<mask> }
<mask>
<mask> if !checkFiltersUpdateIntervalHours(config.DNS.FiltersUpdateIntervalHours) {
<mask> config.DNS.FiltersUpdateIntervalHours = 24
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove err = merged.Validate(aghalgo.StringIsBefore)
</s> add err = merged.Validate(aghalg.StringIsBefore) </s> remove err = uv.Validate(aghalgo.IntIsBefore)
</s> add err = uc.Validate(aghalg.IntIsBefore) </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/config.go |
func addPorts(uc aghalg.UniqChecker, ports ...int) { | <mask> return nil
<mask> }
<mask>
<mask> // addPorts is a helper for ports validation. It skips zero ports.
<mask> func addPorts(uv aghalgo.UniquenessValidator, ports ...int) {
<mask> for _, p := range ports {
<mask> if p != 0 {
<mask> uv.Add(p)
<mask> }
<mask> }
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv.Add(p)
</s> add uc.Add(p) </s> remove uv.Add(c)
</s> add uc.Add(c) </s> remove func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) {
uv = make(aghalgo.UniquenessValidator, len(clients))
</s> add func validateStrUniq(clients []string) (uc aghalg.UniqChecker, err error) {
uc = make(aghalg.UniqChecker, len(clients)) </s> remove return uv, uv.Validate(aghalgo.StringIsBefore)
</s> add return uc, uc.Validate(aghalg.StringIsBefore) </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/config.go |
uc.Add(p) | <mask> // addPorts is a helper for ports validation. It skips zero ports.
<mask> func addPorts(uv aghalgo.UniquenessValidator, ports ...int) {
<mask> for _, p := range ports {
<mask> if p != 0 {
<mask> uv.Add(p)
<mask> }
<mask> }
<mask> }
<mask>
<mask> // readConfigFile reads configuration file contents.
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove func addPorts(uv aghalgo.UniquenessValidator, ports ...int) {
</s> add func addPorts(uc aghalg.UniqChecker, ports ...int) { </s> remove uv.Add(c)
</s> add uc.Add(c) </s> remove func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) {
uv = make(aghalgo.UniquenessValidator, len(clients))
</s> add func validateStrUniq(clients []string) (uc aghalg.UniqChecker, err error) {
uc = make(aghalg.UniqChecker, len(clients)) </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() </s> remove return uv, uv.Validate(aghalgo.StringIsBefore)
</s> add return uc, uc.Validate(aghalg.StringIsBefore) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/config.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghalg" | <mask> "runtime"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove uv.Add(p)
</s> add uc.Add(p) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
type checkConfReqEnt struct { | <mask> return
<mask> }
<mask> }
<mask>
<mask> type checkConfigReqEnt struct {
<mask> IP net.IP `json:"ip"`
<mask> Port int `json:"port"`
<mask> Autofix bool `json:"autofix"`
<mask> }
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove type checkConfigReq struct {
Web checkConfigReqEnt `json:"web"`
DNS checkConfigReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"`
</s> add type checkConfReq struct {
Web checkConfReqEnt `json:"web"`
DNS checkConfReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"` </s> remove type checkConfigRespEnt struct {
</s> add type checkConfRespEnt struct { </s> remove type checkConfigResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"`
</s> add type checkConfResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfRespEnt `json:"web"`
DNS checkConfRespEnt `json:"dns"` </s> remove err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
</s> add return
} </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
type checkConfReq struct {
Web checkConfReqEnt `json:"web"`
DNS checkConfReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"` | <mask> Port int `json:"port"`
<mask> Autofix bool `json:"autofix"`
<mask> }
<mask>
<mask> type checkConfigReq struct {
<mask> Web checkConfigReqEnt `json:"web"`
<mask> DNS checkConfigReqEnt `json:"dns"`
<mask> SetStaticIP bool `json:"set_static_ip"`
<mask> }
<mask>
<mask> type checkConfigRespEnt struct {
<mask> Status string `json:"status"`
<mask> CanAutofix bool `json:"can_autofix"`
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove type checkConfigRespEnt struct {
</s> add type checkConfRespEnt struct { </s> remove type checkConfigReqEnt struct {
</s> add type checkConfReqEnt struct { </s> remove type checkConfigResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"`
</s> add type checkConfResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfRespEnt `json:"web"`
DNS checkConfRespEnt `json:"dns"` </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
type checkConfRespEnt struct { | <mask> DNS checkConfigReqEnt `json:"dns"`
<mask> SetStaticIP bool `json:"set_static_ip"`
<mask> }
<mask>
<mask> type checkConfigRespEnt struct {
<mask> Status string `json:"status"`
<mask> CanAutofix bool `json:"can_autofix"`
<mask> }
<mask>
<mask> type staticIPJSON struct {
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove type checkConfigReq struct {
Web checkConfigReqEnt `json:"web"`
DNS checkConfigReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"`
</s> add type checkConfReq struct {
Web checkConfReqEnt `json:"web"`
DNS checkConfReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"` </s> remove type checkConfigResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"`
</s> add type checkConfResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfRespEnt `json:"web"`
DNS checkConfRespEnt `json:"dns"` </s> remove type checkConfigReqEnt struct {
</s> add type checkConfReqEnt struct { </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
type checkConfResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfRespEnt `json:"web"`
DNS checkConfRespEnt `json:"dns"` | <mask> IP string `json:"ip"`
<mask> Error string `json:"error"`
<mask> }
<mask>
<mask> type checkConfigResp struct {
<mask> StaticIP staticIPJSON `json:"static_ip"`
<mask> Web checkConfigRespEnt `json:"web"`
<mask> DNS checkConfigRespEnt `json:"dns"`
<mask> }
<mask>
<mask> // Check if ports are available, respond with results
<mask> func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
<mask> reqData := checkConfigReq{}
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() </s> remove type checkConfigReq struct {
Web checkConfigReqEnt `json:"web"`
DNS checkConfigReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"`
</s> add type checkConfReq struct {
Web checkConfReqEnt `json:"web"`
DNS checkConfReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"` </s> remove type checkConfigRespEnt struct {
</s> add type checkConfRespEnt struct { </s> remove err := json.NewDecoder(r.Body).Decode(&reqData)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
</s> add port := req.Web.Port
addPorts(uc, config.BetaBindPort, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
// Avoid duplicating the error into the status of DNS.
uc[port] = 1 </s> remove type checkConfigReqEnt struct {
</s> add type checkConfReqEnt struct { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
// validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() | <mask> Web checkConfigRespEnt `json:"web"`
<mask> DNS checkConfigRespEnt `json:"dns"`
<mask> }
<mask>
<mask> // Check if ports are available, respond with results
<mask> func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
<mask> reqData := checkConfigReq{}
<mask> respData := checkConfigResp{}
<mask>
<mask> err := json.NewDecoder(r.Body).Decode(&reqData)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove type checkConfigResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"`
</s> add type checkConfResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfRespEnt `json:"web"`
DNS checkConfRespEnt `json:"dns"` </s> remove err := json.NewDecoder(r.Body).Decode(&reqData)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
</s> add port := req.Web.Port
addPorts(uc, config.BetaBindPort, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
// Avoid duplicating the error into the status of DNS.
uc[port] = 1 </s> remove return
</s> add return err </s> remove if aghnet.IsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
</s> add // handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} </s> remove type checkConfigReq struct {
Web checkConfigReqEnt `json:"web"`
DNS checkConfigReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"`
</s> add type checkConfReq struct {
Web checkConfReqEnt `json:"web"`
DNS checkConfReqEnt `json:"dns"`
SetStaticIP bool `json:"set_static_ip"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
port := req.Web.Port
addPorts(uc, config.BetaBindPort, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
// Avoid duplicating the error into the status of DNS.
uc[port] = 1 | <mask> func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
<mask> reqData := checkConfigReq{}
<mask> respData := checkConfigResp{}
<mask>
<mask> err := json.NewDecoder(r.Body).Decode(&reqData)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
<mask>
<mask> return
<mask> }
<mask>
<mask> uv := aghalgo.UniquenessValidator{}
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() </s> remove return
</s> add return err </s> remove if aghnet.IsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
</s> add // handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} </s> remove type checkConfigResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"`
</s> add type checkConfResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfRespEnt `json:"web"`
DNS checkConfRespEnt `json:"dns"` </s> remove return uv, uv.Validate(aghalgo.StringIsBefore)
</s> add return uc, uc.Validate(aghalg.StringIsBefore) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
return err | <mask> err := json.NewDecoder(r.Body).Decode(&reqData)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
<mask>
<mask> return
<mask> }
<mask>
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove err := json.NewDecoder(r.Body).Decode(&reqData)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
</s> add port := req.Web.Port
addPorts(uc, config.BetaBindPort, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
// Avoid duplicating the error into the status of DNS.
uc[port] = 1 </s> remove // Check if ports are available, respond with results
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
reqData := checkConfigReq{}
respData := checkConfigResp{}
</s> add // validateWeb returns error is the web part if the initial configuration can't
// be set.
func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }() </s> remove aghhttp.Error(r, w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
</s> add aghhttp.Error(r, w, http.StatusInternalServerError, "encoding the response: %s", err) </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) </s> remove err = uv.Validate(aghalgo.IntIsBefore)
</s> add err = uc.Validate(aghalg.IntIsBefore) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
switch port {
case 0, config.BindPort:
return nil
default:
// Go on and check the port binding only if it's not zero or won't be
// unbound after install.
}
return aghnet.CheckPort("tcp", req.Web.IP, port)
}
// validateDNS returns error if the DNS part of the initial configuration can't
// be set. autofix is true if the port can be unbound by AdGuard Home
// automatically.
func (req *checkConfReq) validateDNS(uc aghalg.UniqChecker) (canAutofix bool, err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }()
port := req.DNS.Port
addPorts(uc, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
return false, err
}
switch port {
case 0:
return false, nil
case config.BindPort:
// Go on and only check the UDP port since the TCP one is already bound
// by AdGuard Home for web interface.
default:
// Check TCP as well.
err = aghnet.CheckPort("tcp", req.DNS.IP, port) | <mask>
<mask> return
<mask> }
<mask>
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> reqData.Web.Port,
<mask> )
<mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
<mask> err = fmt.Errorf("validating ports: %w", err)
<mask> respData.Web.Status = err.Error()
<mask> } else if reqData.Web.Port != 0 {
<mask> err = aghnet.CheckPort("tcp", reqData.Web.IP, reqData.Web.Port)
<mask> if err != nil {
<mask> respData.Web.Status = err.Error()
<mask> }
<mask> }
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) | <mask> respData.Web.Status = err.Error()
<mask> } else if reqData.Web.Port != 0 {
<mask> err = aghnet.CheckPort("tcp", reqData.Web.IP, reqData.Web.Port)
<mask> if err != nil {
<mask> respData.Web.Status = err.Error()
<mask> }
<mask> }
<mask>
<mask> addPorts(uv, reqData.DNS.Port)
<mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove if err == nil {
err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
}
</s> add if err = req.validateWeb(uc); err != nil {
resp.Web.Status = err.Error()
} </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) </s> remove uv := aghalgo.UniquenessValidator{}
addPorts(
uv,
config.BindPort,
config.BetaBindPort,
reqData.Web.Port,
)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.Web.Status = err.Error()
} else if reqData.Web.Port != 0 {
err = aghnet.CheckPort("tcp", reqData.Web.IP, reqData.Web.Port)
</s> add switch port {
case 0, config.BindPort:
return nil
default:
// Go on and check the port binding only if it's not zero or won't be
// unbound after install.
}
return aghnet.CheckPort("tcp", req.Web.IP, port)
}
// validateDNS returns error if the DNS part of the initial configuration can't
// be set. autofix is true if the port can be unbound by AdGuard Home
// automatically.
func (req *checkConfReq) validateDNS(uc aghalg.UniqChecker) (canAutofix bool, err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }()
port := req.DNS.Port
addPorts(uc, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
return false, err
}
switch port {
case 0:
return false, nil
case config.BindPort:
// Go on and only check the UDP port since the TCP one is already bound
// by AdGuard Home for web interface.
default:
// Check TCP as well.
err = aghnet.CheckPort("tcp", req.DNS.IP, port) </s> remove if aghnet.IsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
</s> add // handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
err = aghnet.CheckPort("udp", req.DNS.IP, port)
canAutofix = false | <mask> if derr := disableDNSStubListener(); derr != nil {
<mask> log.Error("disabling DNSStubListener: %s", err)
<mask> }
<mask> }
<mask>
<mask> return canAutofix, err
<mask> }
<mask>
<mask> // handleInstallCheckConfig handles the /check_config endpoint.
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) </s> remove if aghnet.IsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
</s> add // handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) </s> remove err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
</s> add return
} </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
return canAutofix, err
} | <mask> respData.Web.Status = err.Error()
<mask> }
<mask> }
<mask>
<mask> addPorts(uv, reqData.DNS.Port)
<mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
<mask> err = fmt.Errorf("validating ports: %w", err)
<mask> respData.DNS.Status = err.Error()
<mask> } else if reqData.DNS.Port != 0 {
<mask> err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
<mask>
<mask> if aghnet.IsAddrInUse(err) {
<mask> canAutofix := checkDNSStubListener()
<mask> if canAutofix && reqData.DNS.Autofix {
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove if aghnet.IsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
</s> add // handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) </s> remove if err == nil {
err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
}
</s> add if err = req.validateWeb(uc); err != nil {
resp.Web.Status = err.Error()
} </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
// handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} | <mask> respData.DNS.Status = err.Error()
<mask> } else if reqData.DNS.Port != 0 {
<mask> err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
<mask>
<mask> if aghnet.IsAddrInUse(err) {
<mask> canAutofix := checkDNSStubListener()
<mask> if canAutofix && reqData.DNS.Autofix {
<mask>
<mask> err = disableDNSStubListener()
<mask> if err != nil {
<mask> log.Error("Couldn't disable DNSStubListener: %s", err)
<mask> }
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
</s> add return
} </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) </s> remove if err == nil {
err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
}
</s> add if err = req.validateWeb(uc); err != nil {
resp.Web.Status = err.Error()
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) | <mask> if aghnet.IsAddrInUse(err) {
<mask> canAutofix := checkDNSStubListener()
<mask> if canAutofix && reqData.DNS.Autofix {
<mask>
<mask> err = disableDNSStubListener()
<mask> if err != nil {
<mask> log.Error("Couldn't disable DNSStubListener: %s", err)
<mask> }
<mask>
<mask> err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
<mask> canAutofix = false
<mask> }
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove if aghnet.IsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
</s> add // handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} </s> remove err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
</s> add return
} </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove respData.DNS.CanAutofix = canAutofix
}
</s> add resp := &checkConfResp{}
uc := aghalg.UniqChecker{} </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
return
} | <mask> if err != nil {
<mask> log.Error("Couldn't disable DNSStubListener: %s", err)
<mask> }
<mask>
<mask> err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
<mask> canAutofix = false
<mask> }
<mask>
<mask> respData.DNS.CanAutofix = canAutofix
<mask> }
<mask>
<mask> if err == nil {
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) </s> remove respData.DNS.CanAutofix = canAutofix
}
</s> add resp := &checkConfResp{}
uc := aghalg.UniqChecker{} </s> remove if aghnet.IsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
</s> add // handleInstallCheckConfig handles the /check_config endpoint.
func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
req := &checkConfReq{} </s> remove if err == nil {
err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
}
</s> add if err = req.validateWeb(uc); err != nil {
resp.Web.Status = err.Error()
} </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
resp := &checkConfResp{}
uc := aghalg.UniqChecker{} | <mask> err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
<mask> canAutofix = false
<mask> }
<mask>
<mask> respData.DNS.CanAutofix = canAutofix
<mask> }
<mask>
<mask> if err == nil {
<mask> err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
<mask> }
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
</s> add return
} </s> remove if err == nil {
err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
}
</s> add if err = req.validateWeb(uc); err != nil {
resp.Web.Status = err.Error()
} </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
if err = req.validateWeb(uc); err != nil {
resp.Web.Status = err.Error()
} | <mask>
<mask> respData.DNS.CanAutofix = canAutofix
<mask> }
<mask>
<mask> if err == nil {
<mask> err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
<mask> }
<mask>
<mask> if err != nil {
<mask> respData.DNS.Status = err.Error()
<mask> } else if !reqData.DNS.IP.IsUnspecified() {
<mask> respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) </s> remove respData.DNS.CanAutofix = canAutofix
}
</s> add resp := &checkConfResp{}
uc := aghalg.UniqChecker{} </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
</s> add return
} </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) | <mask> if err == nil {
<mask> err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
<mask> }
<mask>
<mask> if err != nil {
<mask> respData.DNS.Status = err.Error()
<mask> } else if !reqData.DNS.IP.IsUnspecified() {
<mask> respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
<mask> }
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err = json.NewEncoder(w).Encode(respData)
<mask> if err != nil {
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove if err == nil {
err = aghnet.CheckPort("tcp", reqData.DNS.IP, reqData.DNS.Port)
}
</s> add if err = req.validateWeb(uc); err != nil {
resp.Web.Status = err.Error()
} </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) </s> remove err = json.NewEncoder(w).Encode(respData)
</s> add err = json.NewEncoder(w).Encode(resp) </s> remove err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
</s> add return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
err = json.NewEncoder(w).Encode(resp) | <mask> }
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err = json.NewEncoder(w).Encode(respData)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove aghhttp.Error(r, w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
</s> add aghhttp.Error(r, w, http.StatusInternalServerError, "encoding the response: %s", err) </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) </s> remove return
</s> add return err </s> remove err = uv.Validate(aghalgo.IntIsBefore)
</s> add err = uc.Validate(aghalg.IntIsBefore) </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
aghhttp.Error(r, w, http.StatusInternalServerError, "encoding the response: %s", err) | <mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err = json.NewEncoder(w).Encode(respData)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
<mask>
<mask> return
<mask> }
<mask> }
<mask>
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove err = json.NewEncoder(w).Encode(respData)
</s> add err = json.NewEncoder(w).Encode(resp) </s> remove if err != nil {
respData.DNS.Status = err.Error()
} else if !reqData.DNS.IP.IsUnspecified() {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}
</s> add if resp.DNS.CanAutofix, err = req.validateDNS(uc); err != nil {
resp.DNS.Status = err.Error()
} else if !req.DNS.IP.IsUnspecified() {
resp.StaticIP = handleStaticIP(req.DNS.IP, req.SetStaticIP) </s> remove return
</s> add return err </s> remove err = uv.Validate(aghalgo.IntIsBefore)
</s> add err = uc.Validate(aghalg.IntIsBefore) </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
nonBetaReqData := checkConfReq{
Web: checkConfReqEnt{ | <mask>
<mask> return
<mask> }
<mask>
<mask> nonBetaReqData := checkConfigReq{
<mask> Web: checkConfigReqEnt{
<mask> IP: reqData.Web.IP[0],
<mask> Port: reqData.Web.Port,
<mask> Autofix: reqData.Web.Autofix,
<mask> },
<mask> DNS: checkConfigReqEnt{
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove DNS: checkConfigReqEnt{
</s> add DNS: checkConfReqEnt{ </s> remove return uv, uv.Validate(aghalgo.StringIsBefore)
</s> add return uc, uc.Validate(aghalg.StringIsBefore) </s> remove uv := aghalgo.UniquenessValidator{}
addPorts(
uv,
config.BindPort,
config.BetaBindPort,
reqData.Web.Port,
)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.Web.Status = err.Error()
} else if reqData.Web.Port != 0 {
err = aghnet.CheckPort("tcp", reqData.Web.IP, reqData.Web.Port)
</s> add switch port {
case 0, config.BindPort:
return nil
default:
// Go on and check the port binding only if it's not zero or won't be
// unbound after install.
}
return aghnet.CheckPort("tcp", req.Web.IP, port)
}
// validateDNS returns error if the DNS part of the initial configuration can't
// be set. autofix is true if the port can be unbound by AdGuard Home
// automatically.
func (req *checkConfReq) validateDNS(uc aghalg.UniqChecker) (canAutofix bool, err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }()
port := req.DNS.Port
addPorts(uc, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
return false, err
}
switch port {
case 0:
return false, nil
case config.BindPort:
// Go on and only check the UDP port since the TCP one is already bound
// by AdGuard Home for web interface.
default:
// Check TCP as well.
err = aghnet.CheckPort("tcp", req.DNS.IP, port) </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove respData.DNS.CanAutofix = canAutofix
}
</s> add resp := &checkConfResp{}
uc := aghalg.UniqChecker{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
DNS: checkConfReqEnt{ | <mask> IP: reqData.Web.IP[0],
<mask> Port: reqData.Web.Port,
<mask> Autofix: reqData.Web.Autofix,
<mask> },
<mask> DNS: checkConfigReqEnt{
<mask> IP: reqData.DNS.IP[0],
<mask> Port: reqData.DNS.Port,
<mask> Autofix: reqData.DNS.Autofix,
<mask> },
<mask> SetStaticIP: reqData.SetStaticIP,
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove nonBetaReqData := checkConfigReq{
Web: checkConfigReqEnt{
</s> add nonBetaReqData := checkConfReq{
Web: checkConfReqEnt{ </s> remove uv := aghalgo.UniquenessValidator{}
addPorts(
uv,
config.BindPort,
config.BetaBindPort,
reqData.Web.Port,
)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.Web.Status = err.Error()
} else if reqData.Web.Port != 0 {
err = aghnet.CheckPort("tcp", reqData.Web.IP, reqData.Web.Port)
</s> add switch port {
case 0, config.BindPort:
return nil
default:
// Go on and check the port binding only if it's not zero or won't be
// unbound after install.
}
return aghnet.CheckPort("tcp", req.Web.IP, port)
}
// validateDNS returns error if the DNS part of the initial configuration can't
// be set. autofix is true if the port can be unbound by AdGuard Home
// automatically.
func (req *checkConfReq) validateDNS(uc aghalg.UniqChecker) (canAutofix bool, err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }()
port := req.DNS.Port
addPorts(uc, port)
if err = uc.Validate(aghalg.IntIsBefore); err != nil {
return false, err
}
switch port {
case 0:
return false, nil
case config.BindPort:
// Go on and only check the UDP port since the TCP one is already bound
// by AdGuard Home for web interface.
default:
// Check TCP as well.
err = aghnet.CheckPort("tcp", req.DNS.IP, port) </s> remove func validateStrUniq(clients []string) (uv aghalgo.UniquenessValidator, err error) {
uv = make(aghalgo.UniquenessValidator, len(clients))
</s> add func validateStrUniq(clients []string) (uc aghalg.UniqChecker, err error) {
uc = make(aghalg.UniqChecker, len(clients)) </s> remove uv.Add(p)
</s> add uc.Add(p) </s> remove return
</s> add return err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/controlinstall.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghalg" | <mask> "sync"
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove uv.Add(p)
</s> add uc.Add(p) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/home.go |
uc := aghalg.UniqChecker{} | <mask>
<mask> Context.clients.Init(config.Clients, Context.dhcpServer, Context.etcHosts)
<mask>
<mask> if args.bindPort != 0 {
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> args.bindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv,
</s> add uc, </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/home.go |
uc, | <mask>
<mask> if args.bindPort != 0 {
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> args.bindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
<mask> )
<mask> if config.TLS.Enabled {
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/home.go |
uc, | <mask> config.DNS.Port,
<mask> )
<mask> if config.TLS.Enabled {
<mask> addPorts(
<mask> uv,
<mask> config.TLS.PortHTTPS,
<mask> config.TLS.PortDNSOverTLS,
<mask> config.TLS.PortDNSOverQUIC,
<mask> config.TLS.PortDNSCrypt,
<mask> )
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/home.go |
if err = uc.Validate(aghalg.IntIsBefore); err != nil { | <mask> config.TLS.PortDNSOverQUIC,
<mask> config.TLS.PortDNSCrypt,
<mask> )
<mask> }
<mask> if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
<mask> return fmt.Errorf("validating ports: %w", err)
<mask> }
<mask>
<mask> config.BindPort = args.bindPort
<mask> }
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
</s> add if err = uc.Validate(aghalg.IntIsBefore); err != nil { </s> remove addPorts(uv, reqData.DNS.Port)
if err = uv.Validate(aghalgo.IntIsBefore); err != nil {
err = fmt.Errorf("validating ports: %w", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.Port != 0 {
err = aghnet.CheckPort("udp", reqData.DNS.IP, reqData.DNS.Port)
</s> add return canAutofix, err
} </s> remove err = merged.Validate(aghalgo.StringIsBefore)
</s> add err = merged.Validate(aghalg.StringIsBefore) </s> remove err = uv.Validate(aghalgo.IntIsBefore)
</s> add err = uc.Validate(aghalg.IntIsBefore) </s> remove respData.Web.Status = err.Error()
</s> add return false, err
}
}
err = aghnet.CheckPort("udp", req.DNS.IP, port)
if !aghnet.IsAddrInUse(err) {
return false, err
}
// Try to fix automatically.
canAutofix = checkDNSStubListener()
if canAutofix && req.DNS.Autofix {
if derr := disableDNSStubListener(); derr != nil {
log.Error("disabling DNSStubListener: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/home.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghalg" | <mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/google/go-cmp/cmp"
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghalgo"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> remove uv.Add(p)
</s> add uc.Add(p) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/tls.go |
uc := aghalg.UniqChecker{} | <mask> setts.PrivateKey = t.conf.PrivateKey
<mask> }
<mask>
<mask> if setts.Enabled {
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/tls.go |
uc, | <mask>
<mask> if setts.Enabled {
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
<mask> setts.PortHTTPS,
<mask> setts.PortDNSOverTLS,
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/tls.go |
err = uc.Validate(aghalg.IntIsBefore) | <mask> setts.PortDNSOverQUIC,
<mask> setts.PortDNSCrypt,
<mask> )
<mask>
<mask> err = uv.Validate(aghalgo.IntIsBefore)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "validating ports: %s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove err = uv.Validate(aghalgo.IntIsBefore)
</s> add err = uc.Validate(aghalg.IntIsBefore) </s> remove return
</s> add return err </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) </s> remove aghhttp.Error(r, w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
</s> add aghhttp.Error(r, w, http.StatusInternalServerError, "encoding the response: %s", err) </s> remove err = json.NewEncoder(w).Encode(respData)
</s> add err = json.NewEncoder(w).Encode(resp) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/tls.go |
uc := aghalg.UniqChecker{} | <mask> data.PrivateKey = t.conf.PrivateKey
<mask> }
<mask>
<mask> if data.Enabled {
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/tls.go |
uc, | <mask>
<mask> if data.Enabled {
<mask> uv := aghalgo.UniquenessValidator{}
<mask> addPorts(
<mask> uv,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
<mask> data.PortHTTPS,
<mask> data.PortDNSOverTLS,
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv := aghalgo.UniquenessValidator{}
</s> add uc := aghalg.UniqChecker{} </s> remove uv,
</s> add uc, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/tls.go |
err = uc.Validate(aghalg.IntIsBefore) | <mask> data.PortDNSOverQUIC,
<mask> data.PortDNSCrypt,
<mask> )
<mask>
<mask> err = uv.Validate(aghalgo.IntIsBefore)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: 4095 fix duplicating port
Merge in DNS/adguard-home from 4095-port-3000 to master
Updates #4095.
Squashed commit of the following:
commit 968cc806264898523d29c4ec20b3ce6a69abb09c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:26:33 2022 +0300
home: fix typo
commit 03c6798db6a4ca726a7b5a683e475a8a74f79fe1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:20:34 2022 +0300
all: more naming imps
commit d3d417fcb24a1859f53a743b3533faa81b6bef19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:10:14 2022 +0300
aghalgo: rename into aghalg
commit 6e106006d07a747ff4ddf1271532106c3a3e2b20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 20:05:43 2022 +0300
all: imp names, docs
commit 12c8d9fde0d0cc5b953da30b042171ba7c53da5d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:57:21 2022 +0300
all: fix log of changes
commit 49c7a705b9b1ad8f2ef68fa807f9b6b8c447b421
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 19 19:51:00 2022 +0300
home: fix duplicating port 3000 </s> remove err = uv.Validate(aghalgo.IntIsBefore)
</s> add err = uc.Validate(aghalg.IntIsBefore) </s> remove return
</s> add return err </s> remove err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
</s> add err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "decoding the request: %s", err) </s> remove aghhttp.Error(r, w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
</s> add aghhttp.Error(r, w, http.StatusInternalServerError, "encoding the response: %s", err) </s> remove err = json.NewEncoder(w).Encode(respData)
</s> add err = json.NewEncoder(w).Encode(resp) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d82b290251397395a994f2e453adb91ed455d8c8 | internal/home/tls.go |
// Return TRUE if DHCP packet is correct
func isValidPacket(p dhcp4.Packet) bool {
hw := p.CHAddr()
zeroes := make([]byte, len(hw))
if bytes.Equal(hw, zeroes) {
log.Tracef("Packet has empty CHAddr")
return false
}
return true
}
| <mask> }
<mask>
<mask> func (s *Server) handleDiscover(p dhcp4.Packet, options dhcp4.Options) dhcp4.Packet {
<mask> // find a lease, but don't update lease time
<mask> var lease *Lease
<mask> var err error
<mask>
<mask> reqIP := net.IP(options[dhcp4.OptionRequestedIPAddress])
</s> * dhcp: don't process Discover/Request packets with empty client HW address | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d832d7ce95478b595bbf966ffef644b6efaeee7d | dhcpd/dhcpd.go |
if !isValidPacket(p) {
return nil
}
| <mask> log.Tracef("Message from client: Discover. ReqIP: %s HW: %s Hostname: %s",
<mask> reqIP, p.CHAddr(), hostname)
<mask>
<mask> lease = s.findLease(p)
<mask> for lease == nil {
<mask> lease, err = s.reserveLease(p)
<mask> if err != nil {
<mask> log.Error("Couldn't find free lease: %s", err)
<mask> return nil
</s> * dhcp: don't process Discover/Request packets with empty client HW address | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d832d7ce95478b595bbf966ffef644b6efaeee7d | dhcpd/dhcpd.go |
if !isValidPacket(p) {
return nil
}
| <mask> reqIP := net.IP(options[dhcp4.OptionRequestedIPAddress])
<mask> log.Tracef("Message from client: Request. IP: %s ReqIP: %s HW: %s",
<mask> p.CIAddr(), reqIP, p.CHAddr())
<mask>
<mask> server := options[dhcp4.OptionServerIdentifier]
<mask> if server != nil && !net.IP(server).Equal(s.ipnet.IP) {
<mask> log.Tracef("Request message not for this DHCP server (%v vs %v)", server, s.ipnet.IP)
<mask> return nil // Message not for this dhcp server
<mask> }
</s> * dhcp: don't process Discover/Request packets with empty client HW address | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d832d7ce95478b595bbf966ffef644b6efaeee7d | dhcpd/dhcpd.go |
"theme_auto_desc": "Auto (based on the color scheme of your device)",
"theme_dark_desc": "Dark theme",
"theme_light_desc": "Light theme", | <mask> "clear_cache": "Clear cache",
<mask> "make_static": "Make static",
<mask> "disable_for_seconds": "For {{count}} second",
<mask> "disable_for_seconds_plural": "For {{count}} seconds",
<mask> "disable_for_minutes": "For {{count}} minute",
<mask> "disable_for_minutes_plural": "For {{count}} minutes",
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"
d="M8.036 10.93l3.93 4.07 4.068-3.93" />
</s> add <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" d="M8.036 10.93l3.93 4.07 4.068-3.93" /> </s> remove <Icons />
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/__locales/en.json |
.form__group--inner .form__group--checkbox {
margin-bottom: 12px;
}
.form__group--inner .form__group--checkbox:last-child {
margin-bottom: 0;
}
| <mask> .form__group--checkbox {
<mask> margin-bottom: 25px;
<mask> }
<mask>
<mask> .form__inline {
<mask> display: flex;
<mask> justify-content: flex-start;
<mask> }
<mask>
<mask> .btn-standard {
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove import classNames from 'classnames';
</s> add import cn from 'classnames'; </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} </s> remove import Icons from '../Icons';
</s> add </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/Settings/Settings.css |
.toast__dismiss:hover,
.toast__dismiss:focus {
outline: none;
}
| <mask> border: 0;
<mask> cursor: pointer;
<mask> }
<mask>
<mask> .toast-enter {
<mask> opacity: 0.01;
<mask> }
<mask>
<mask> .toast-enter-active {
<mask> opacity: 1;
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove import classNames from 'classnames';
</s> add import cn from 'classnames'; </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} </s> remove import Icons from '../Icons';
</s> add </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/Toasts/Toast.css |
import cn from 'classnames'; | <mask> import React, { useState, useEffect } from 'react';
<mask> import { useTranslation } from 'react-i18next';
<mask> import { useDispatch, useSelector } from 'react-redux';
<mask> import classNames from 'classnames';
<mask>
<mask> import { REPOSITORY, PRIVACY_POLICY_LINK, THEMES } from '../../helpers/constants';
<mask> import { LANGUAGES } from '../../helpers/twosky';
<mask> import i18n from '../../i18n';
<mask>
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove import Icons from '../Icons';
</s> add </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Footer.js |
const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} | <mask> i18n.changeLanguage(value);
<mask> setHtmlLangAttr(value);
<mask> };
<mask>
<mask> const onThemeChanged = (event) => {
<mask> const { value } = event.target;
<mask> dispatch(changeTheme(value));
<mask> };
<mask>
<mask> const onThemeChangedLocal = (event) => {
<mask> const { value } = event.target;
<mask> setUITheme(value);
<mask> setCurrentThemeLocal(value);
<mask> };
<mask>
<mask> const renderCopyright = () => <div className="footer__column">
<mask> <div className="footer__copyright">
<mask> {t('copyright')} © {getYear()}{' '}
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; </s> remove import Icons from '../Icons';
</s> add </s> remove className={classNames('footer__link', className)}
</s> add className={cn('footer__link', className)} </s> remove <Icons />
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Footer.js |
className={cn('footer__link', className)} | <mask>
<mask> const renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
<mask> key={name}
<mask> href={href}
<mask> className={classNames('footer__link', className)}
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> >
<mask> {t(name)}
<mask> </a>);
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; </s> remove import Icons from '../Icons';
</s> add </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} </s> remove <Icons />
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Footer.js |
const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; | <mask> >
<mask> {t(name)}
<mask> </a>);
<mask>
<mask> const themeSelectOptions = () => (
<mask> Object.values(THEMES)
<mask> .map((theme) => (
<mask> <option key={theme} value={theme}>
<mask> {t(`theme_${theme}`)}
<mask> </option>
<mask> ))
<mask> );
<mask>
<mask> const renderThemeSelect = () => (
<mask> <select
<mask> className="form-control select select--theme"
<mask> value={currentTheme}
<mask> onChange={onThemeChanged}
<mask> >
<mask> {themeSelectOptions()}
<mask> </select>
<mask> );
<mask>
<mask> const renderThemeSelectLocal = () => (
<mask> <select
<mask> className="form-control select select--theme"
<mask> value={currentThemeLocal}
<mask> onChange={onThemeChangedLocal}
<mask> >
<mask> {themeSelectOptions()}
<mask> </select>
<mask> );
<mask>
<mask> return (
<mask> <>
<mask> <footer className="footer">
<mask> <div className="container">
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove className={classNames('footer__link', className)}
</s> add className={cn('footer__link', className)} </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} </s> remove {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()}
</s> add <div className="footer__themes">
<div className="btn-group">
{renderThemeButtons()}
</div>
</div> </s> remove <Icons />
</s> add </s> remove import Icons from '../Icons';
</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/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Footer.js |
<div className="footer__themes">
<div className="btn-group">
{renderThemeButtons()}
</div>
</div> | <mask> <div className="footer__column footer__column--links">
<mask> {renderLinks(linksData)}
<mask> </div>
<mask> <div className="footer__column footer__column--theme">
<mask> {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()}
<mask> </div>
<mask> <div className="footer__column footer__column--language">
<mask> <select
<mask> className="form-control select select--language"
<mask> value={i18n.language}
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} </s> remove <Icons />
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Footer.js |
<mask>
<mask> import { MOBILE_CONFIG_LINKS } from '../../../helpers/constants';
<mask>
<mask> import Tabs from '../Tabs';
<mask> import Icons from '../Icons';
<mask> import MobileConfigForm from './MobileConfigForm';
<mask>
<mask> const renderLi = ({ label, components }) => <li key={label}>
<mask> <Trans components={components?.map((props) => {
<mask> if (React.isValidElement(props)) {
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove import classNames from 'classnames';
</s> add import cn from 'classnames'; </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; </s> remove className={classNames('footer__link', className)}
</s> add className={cn('footer__link', className)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Guide/Guide.js | |
<mask> setActiveTabLabel={setActiveTabLabel}
<mask> >
<mask> {activeTab}
<mask> </Tabs>
<mask> <Icons />
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> Guide.defaultProps = {
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} </s> remove className={classNames('footer__link', className)}
</s> add className={cn('footer__link', className)} </s> remove {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()}
</s> add <div className="footer__themes">
<div className="btn-group">
{renderThemeButtons()}
</div>
</div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Guide/Guide.js | |
<symbol id="auto" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path fillRule="evenodd" clipRule="evenodd" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z" stroke="currentColor" strokeWidth="1.5" />
<path fillRule="evenodd" clipRule="evenodd" d="M12 3V21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3Z" fill="currentColor" stroke="currentColor" strokeWidth="1.5" />
</symbol>
<symbol id="dark" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path d="M3.80737 15.731L3.9895 15.0034C3.71002 14.9335 3.41517 15.0298 3.23088 15.2512C3.0466 15.4727 3.00545 15.7801 3.12501 16.0422L3.80737 15.731ZM14.1926 3.26892L14.3747 2.54137C14.0953 2.47141 13.8004 2.56772 13.6161 2.78917C13.4318 3.01062 13.3907 3.31806 13.5102 3.58018L14.1926 3.26892ZM12 20.2499C8.66479 20.2499 5.79026 18.2708 4.48974 15.4197L3.12501 16.0422C4.66034 19.4081 8.05588 21.7499 12 21.7499V20.2499ZM20.25 11.9999C20.25 16.5563 16.5563 20.2499 12 20.2499V21.7499C17.3848 21.7499 21.75 17.3847 21.75 11.9999H20.25ZM14.0105 3.99647C17.5955 4.89391 20.25 8.13787 20.25 11.9999H21.75C21.75 7.43347 18.6114 3.60193 14.3747 2.54137L14.0105 3.99647ZM13.5102 3.58018C13.9851 4.6211 14.25 5.77857 14.25 6.99995H15.75C15.75 5.5595 15.4371 4.1901 14.875 2.95766L13.5102 3.58018ZM14.25 6.99995C14.25 11.5563 10.5563 15.2499 5.99999 15.2499V16.7499C11.3848 16.7499 15.75 12.3847 15.75 6.99995H14.25ZM5.99999 15.2499C5.30559 15.2499 4.63225 15.1643 3.9895 15.0034L3.62525 16.4585C4.38616 16.649 5.18181 16.7499 5.99999 16.7499V15.2499Z" fill="currentColor" />
</symbol>
<symbol id="light" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path d="M12 3.75C16.5563 3.75 20.25 7.44365 20.25 12H21.75C21.75 6.61522 17.3848 2.25 12 2.25V3.75ZM20.25 12C20.25 16.5563 16.5563 20.25 12 20.25V21.75C17.3848 21.75 21.75 17.3848 21.75 12H20.25ZM12 20.25C7.44365 20.25 3.75 16.5563 3.75 12H2.25C2.25 17.3848 6.61522 21.75 12 21.75V20.25ZM3.75 12C3.75 7.44365 7.44365 3.75 12 3.75V2.25C6.61522 2.25 2.25 6.61522 2.25 12H3.75Z" fill="currentColor" />
<path fillRule="evenodd" clipRule="evenodd" d="M12 10C10.8954 10 10 10.8954 10 12C10 13.1046 10.8954 14 12 14C13.1046 14 14 13.1046 14 12C13.9987 10.896 13.104 10.0013 12 10Z" fill="currentColor" />
</symbol>
| <mask> </svg>
<mask> </symbol>
<mask>
<mask> <symbol id="chevron-down" width="24" height="24" viewBox="0 0 24 24">
<mask> <g fill="none" fillRule="evenodd">
<mask> <path d="M0 0h24v24H0z" fill="#878787" fillOpacity=".01" />
<mask> <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" d="M8.036 10.93l3.93 4.07 4.068-3.93" />
<mask> </g>
<mask> </symbol>
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"
d="M8.036 10.93l3.93 4.07 4.068-3.93" />
</s> add <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" d="M8.036 10.93l3.93 4.07 4.068-3.93" /> </s> remove <Icons />
</s> add </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Icons.js |
<path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" d="M8.036 10.93l3.93 4.07 4.068-3.93" /> | <mask>
<mask> <symbol id="chevron-down" width="24" height="24" viewBox="0 0 24 24">
<mask> <g fill="none" fillRule="evenodd">
<mask> <path d="M0 0h24v24H0z" fill="#878787" fillOpacity=".01" />
<mask> <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"
<mask> d="M8.036 10.93l3.93 4.07 4.068-3.93" />
<mask> </g>
<mask> </symbol>
<mask> </svg>
<mask> );
<mask>
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove <Icons />
</s> add </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/components/ui/Icons.js |
import Icons from '../../components/ui/Icons'; | <mask>
<mask> import Toasts from '../../components/Toasts';
<mask> import Footer from '../../components/ui/Footer';
<mask> import logo from '../../components/ui/svg/logo.svg';
<mask>
<mask> import './Setup.css';
<mask> import '../../components/ui/Tabler.css';
<mask>
<mask> class Setup extends Component {
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove import classNames from 'classnames';
</s> add import cn from 'classnames'; </s> remove import Icons from '../Icons';
</s> add </s> remove const onThemeChanged = (event) => {
const { value } = event.target;
dispatch(changeTheme(value));
};
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
</s> add const onThemeChange = (value) => {
if (isLoggedIn) {
dispatch(changeTheme(value));
} else {
setUITheme(value);
setCurrentThemeLocal(value);
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/install/Setup/index.js |
<Icons /> | <mask> </div>
<mask> </div>
<mask> <Footer />
<mask> <Toasts />
<mask> </Fragment>
<mask> }
<mask> </Fragment>
<mask> );
</s> Pull request: add UI theme controls
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls </s> remove <Icons />
</s> add </s> remove {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()}
</s> add <div className="footer__themes">
<div className="btn-group">
{renderThemeButtons()}
</div>
</div> </s> remove <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"
d="M8.036 10.93l3.93 4.07 4.068-3.93" />
</s> add <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" d="M8.036 10.93l3.93 4.07 4.068-3.93" /> </s> remove const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
);
const renderThemeSelect = () => (
<select
className="form-control select select--theme"
value={currentTheme}
onChange={onThemeChanged}
>
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
);
</s> add const renderThemeButtons = () => {
const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
const content = {
auto: {
desc: t('theme_auto_desc'),
icon: '#auto',
},
dark: {
desc: t('theme_dark_desc'),
icon: '#dark',
},
light: {
desc: t('theme_light_desc'),
icon: '#light',
},
};
return (
Object.values(THEMES)
.map((theme) => (
<button
key={theme}
type="button"
className="btn btn-sm btn-secondary footer__theme-button"
onClick={() => onThemeChange(theme)}
title={content[theme].desc}
>
<svg
className={cn(
'footer__theme-icon',
{ 'footer__theme-icon--active': currentValue === theme },
)}
>
<use xlinkHref={content[theme].icon} />
</svg>
</button>
))
);
}; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d859a337877337881f0cb0b40dfaf57524aac7e2 | client/src/install/Setup/index.js |
<mask>
<mask> import (
<mask> "bufio"
<mask> "fmt"
<mask> "log"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "os/signal"
<mask> "path/filepath"
</s> Use new log wrapper and add more functions to it. </s> remove "fmt"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | app.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/gobuffalo/packr"
<mask> "golang.org/x/crypto/ssh/terminal"
<mask> )
<mask>
<mask> // VersionString will be set through ldflags, contains current version
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | app.go |
{"verbose", "v", "enable verbose output", nil, func() { log.Verbose = true }}, | <mask> panic("Got port that is not a number")
<mask> }
<mask> bindPort = &v
<mask> }, nil},
<mask> // {"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
<mask> {"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }},
<mask> }
<mask> printHelp = func() {
<mask> fmt.Printf("Usage:\n\n")
<mask> fmt.Printf("%s [options]\n\n", os.Args[0])
</s> Use new log wrapper and add more functions to it. </s> remove trace("Replying with NAK: request IP is 0.0.0.0")
</s> add log.Tracef("Replying with NAK: request IP is 0.0.0.0") </s> remove trace("Replying with NAK: request IP isn't valid IPv4: %s", reqIP)
</s> add log.Tracef("Replying with NAK: request IP isn't valid IPv4: %s", reqIP) </s> remove // trace("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
</s> add // log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule) </s> remove trace("Request message not for this DHCP server (%v vs %v)", p, server, s.ipnet.IP)
</s> add log.Tracef("Request message not for this DHCP server (%v vs %v)", server, s.ipnet.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | app.go |
<mask> package main
<mask>
<mask> import (
<mask> "io/ioutil"
<mask> "log"
<mask> "os"
<mask> "path/filepath"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | config.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const (
<mask> dataDir = "data" // data storage
<mask> filterDir = "filters" // cache location for downloaded filters, it's under DataDir
</s> Use new log wrapper and add more functions to it. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | config.go |
<mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "log"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "strconv"
<mask> "strings"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | control.go | |
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/miekg/dns"
<mask>
<mask> "gopkg.in/asaskevich/govalidator.v4"
<mask> )
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | control.go | |
"github.com/AdguardTeam/AdGuardHome/log"
"github.com/AdguardTeam/dnsproxy/upstream" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/miekg/dns"
<mask> "gopkg.in/asaskevich/govalidator.v4"
<mask> )
<mask>
<mask> const updatePeriod = time.Minute * 30
</s> Use new log wrapper and add more functions to it. </s> remove "github.com/AdguardTeam/dnsproxy/upstream"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | control.go |
<mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "log"
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcp.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dhcpServer = dhcpd.Server{}
<mask>
<mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
</s> Use new log wrapper and add more functions to it. </s> remove func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcp.go |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "time"
<mask>
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> func CheckIfOtherDHCPServersPresent(ifaceName string) (bool, error) {
<mask> iface, err := net.InterfaceByName(ifaceName)
</s> Use new log wrapper and add more functions to it. </s> remove "fmt"
"os"
"path"
"runtime"
</s> add </s> remove "log"
</s> add </s> remove // trace("called")
</s> add // log.Tracef("called") | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/check_other_dhcp.go |
log.Tracef("Listening to udp4 %+v", udpAddr) | <mask> return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
<mask> }
<mask>
<mask> // bind to 0.0.0.0:68
<mask> trace("Listening to udp4 %+v", udpAddr)
<mask> c, err := net.ListenPacket("udp4", src)
<mask> if c != nil {
<mask> defer c.Close()
<mask> }
<mask> // spew.Dump(c, err)
</s> Use new log wrapper and add more functions to it. </s> remove trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> add log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) </s> remove trace("Waiting %v for an answer", defaultDiscoverTime)
</s> add log.Tracef("Waiting %v for an answer", defaultDiscoverTime) </s> remove trace("Lease not found for %s: creating new one", hwaddr)
</s> add log.Tracef("Lease not found for %s: creating new one", hwaddr) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/check_other_dhcp.go |
log.Tracef("Waiting %v for an answer", defaultDiscoverTime) | <mask> return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst)
<mask> }
<mask>
<mask> // wait for answer
<mask> trace("Waiting %v for an answer", defaultDiscoverTime)
<mask> // TODO: replicate dhclient's behaviour of retrying several times with progressively bigger timeouts
<mask> b := make([]byte, 1500)
<mask> c.SetReadDeadline(time.Now().Add(defaultDiscoverTime))
<mask> n, _, err = c.ReadFrom(b)
<mask> if isTimeout(err) {
</s> Use new log wrapper and add more functions to it. </s> remove trace("Listening to udp4 %+v", udpAddr)
</s> add log.Tracef("Listening to udp4 %+v", udpAddr) </s> remove trace("Lease not found for %s: creating new one", hwaddr)
</s> add log.Tracef("Lease not found for %s: creating new one", hwaddr) </s> remove trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> add log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/check_other_dhcp.go |
<mask>
<mask> import (
<mask> "bytes"
<mask> "fmt"
<mask> "log"
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/krolaw/dhcp4"
<mask> )
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "os"
"path"
"runtime"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "net"
<mask> "time"
<mask>
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> const defaultDiscoverTime = time.Second * 3
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
// log.Tracef("found lease for %s: %+v", hwaddr, foundLease) | <mask> hwaddr := make(net.HardwareAddr, len(hwaddrCOW))
<mask> copy(hwaddr, hwaddrCOW)
<mask> foundLease := s.locateLease(p)
<mask> if foundLease != nil {
<mask> // trace("found lease for %s: %+v", hwaddr, foundLease)
<mask> return foundLease, nil
<mask> }
<mask> // not assigned a lease, create new one, find IP from LRU
<mask> trace("Lease not found for %s: creating new one", hwaddr)
<mask> ip, err := s.findFreeIP(p, hwaddr)
</s> Use new log wrapper and add more functions to it. </s> remove trace("Lease not found for %s: creating new one", hwaddr)
</s> add log.Tracef("Lease not found for %s: creating new one", hwaddr) </s> remove trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> add log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) </s> remove trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
</s> add log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Lease not found for %s: creating new one", hwaddr) | <mask> // trace("found lease for %s: %+v", hwaddr, foundLease)
<mask> return foundLease, nil
<mask> }
<mask> // not assigned a lease, create new one, find IP from LRU
<mask> trace("Lease not found for %s: creating new one", hwaddr)
<mask> ip, err := s.findFreeIP(p, hwaddr)
<mask> if err != nil {
<mask> return nil, wrapErrPrint(err, "Couldn't find free IP for the lease %s", hwaddr.String())
<mask> }
<mask> trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> Use new log wrapper and add more functions to it. </s> remove // trace("found lease for %s: %+v", hwaddr, foundLease)
</s> add // log.Tracef("found lease for %s: %+v", hwaddr, foundLease) </s> remove trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> add log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("requested IP is %s", reqIP)
</s> add log.Tracef("requested IP is %s", reqIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) | <mask> ip, err := s.findFreeIP(p, hwaddr)
<mask> if err != nil {
<mask> return nil, wrapErrPrint(err, "Couldn't find free IP for the lease %s", hwaddr.String())
<mask> }
<mask> trace("Assigning to %s IP address %s", hwaddr, ip.String())
<mask> hostname := p.ParseOptions()[dhcp4.OptionHostName]
<mask> lease := &Lease{HWAddr: hwaddr, IP: ip, Hostname: string(hostname)}
<mask> s.leases = append(s.leases, lease)
<mask> return lease, nil
<mask> }
</s> Use new log wrapper and add more functions to it. </s> remove trace("Lease not found for %s: creating new one", hwaddr)
</s> add log.Tracef("Lease not found for %s: creating new one", hwaddr) </s> remove // trace("found lease for %s: %+v", hwaddr, foundLease)
</s> add // log.Tracef("found lease for %s: %+v", hwaddr, foundLease) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("requested IP is %s", reqIP)
</s> add log.Tracef("requested IP is %s", reqIP) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
// log.Tracef("bytes.Equal(%s, %s) returned true", hwaddr, s.leases[i].hwaddr) | <mask> func (s *Server) locateLease(p dhcp4.Packet) *Lease {
<mask> hwaddr := p.CHAddr()
<mask> for i := range s.leases {
<mask> if bytes.Equal([]byte(hwaddr), []byte(s.leases[i].HWAddr)) {
<mask> // trace("bytes.Equal(%s, %s) returned true", hwaddr, s.leases[i].hwaddr)
<mask> return s.leases[i]
<mask> }
<mask> }
<mask> return nil
<mask> }
</s> Use new log wrapper and add more functions to it. </s> remove trace("Got %v message", msgType)
trace("Leases:")
</s> add log.Tracef("Got %v message", msgType)
log.Tracef("Leases:") </s> remove trace("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry)
</s> add log.Tracef("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry) </s> remove trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> add log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) </s> remove trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
</s> add log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) </s> remove // trace("found lease for %s: %+v", hwaddr, foundLease)
</s> add // log.Tracef("found lease for %s: %+v", hwaddr, foundLease) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) | <mask> var foundIP net.IP
<mask> for i := 0; i < dhcp4.IPRange(s.leaseStart, s.leaseStop); i++ {
<mask> newIP := dhcp4.IPAdd(s.leaseStart, i)
<mask> foundHWaddr := s.getIPpool(newIP)
<mask> trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
<mask> if foundHWaddr != nil && len(foundHWaddr) != 0 {
<mask> // if !bytes.Equal(foundHWaddr, hwaddr) {
<mask> // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
<mask> // }
<mask> trace("will try again")
</s> Use new log wrapper and add more functions to it. </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) </s> remove trace("will try again")
</s> add log.Tracef("will try again") </s> remove trace("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP)
</s> add log.Tracef("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP) </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove trace("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr)
</s> add log.Tracef("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
// log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) | <mask> foundHWaddr := s.getIPpool(newIP)
<mask> trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
<mask> if foundHWaddr != nil && len(foundHWaddr) != 0 {
<mask> // if !bytes.Equal(foundHWaddr, hwaddr) {
<mask> // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
<mask> // }
<mask> trace("will try again")
<mask> continue
<mask> }
<mask> foundIP = newIP
</s> Use new log wrapper and add more functions to it. </s> remove trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
</s> add log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) </s> remove trace("will try again")
</s> add log.Tracef("will try again") </s> remove trace("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP)
</s> add log.Tracef("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP) </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove trace("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr)
</s> add log.Tracef("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("will try again") | <mask> if foundHWaddr != nil && len(foundHWaddr) != 0 {
<mask> // if !bytes.Equal(foundHWaddr, hwaddr) {
<mask> // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
<mask> // }
<mask> trace("will try again")
<mask> continue
<mask> }
<mask> foundIP = newIP
<mask> break
<mask> }
</s> Use new log wrapper and add more functions to it. </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) </s> remove trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
</s> add log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) </s> remove trace("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP)
</s> add log.Tracef("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP) </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove trace("Lease not found for %s: creating new one", hwaddr)
</s> add log.Tracef("Lease not found for %s: creating new one", hwaddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Got %v message", msgType)
log.Tracef("Leases:") | <mask> delete(s.IPpool, IP4)
<mask> }
<mask>
<mask> func (s *Server) ServeDHCP(p dhcp4.Packet, msgType dhcp4.MessageType, options dhcp4.Options) dhcp4.Packet {
<mask> trace("Got %v message", msgType)
<mask> trace("Leases:")
<mask> for i, lease := range s.leases {
<mask> trace("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry)
<mask> }
<mask> trace("IP pool:")
<mask> for ip, hwaddr := range s.IPpool {
</s> Use new log wrapper and add more functions to it. </s> remove trace("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry)
</s> add log.Tracef("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry) </s> remove trace("IP pool:")
</s> add log.Tracef("IP pool:") </s> remove trace("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr)
</s> add log.Tracef("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr) </s> remove // trace("bytes.Equal(%s, %s) returned true", hwaddr, s.leases[i].hwaddr)
</s> add // log.Tracef("bytes.Equal(%s, %s) returned true", hwaddr, s.leases[i].hwaddr) </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.