docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
return false, fmt.Errorf("couldn't receive packet: %w", err) | <mask> log.Debug("DHCPv4: didn't receive DHCP response")
<mask> return false, nil
<mask> }
<mask> if err != nil {
<mask> return false, wrapErrPrint(err, "Couldn't receive packet")
<mask> }
<mask>
<mask> log.Tracef("Received packet (%v bytes)", n)
<mask>
<mask> response, err := dhcpv4.FromBytes(b[:n])
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, wrapErrPrint(err, "Couldn't receive packet")
</s> add return false, fmt.Errorf("couldn't receive packet: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Couldn't listen on :68")
</s> add return false, fmt.Errorf("couldn't listen on :68: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst)
</s> add return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err) | <mask> // and waits for a response for a period defined by defaultDiscoverTime
<mask> func CheckIfOtherDHCPServersPresentV6(ifaceName string) (bool, error) {
<mask> iface, err := net.InterfaceByName(ifaceName)
<mask> if err != nil {
<mask> return false, fmt.Errorf("DHCPv6: net.InterfaceByName: %s: %s", ifaceName, err)
<mask> }
<mask>
<mask> ifaceIPNet := getIfaceIPv6(*iface)
<mask> if len(ifaceIPNet) == 0 {
<mask> return false, fmt.Errorf("DHCPv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return false, fmt.Errorf("DHCPv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface)
</s> add return false, fmt.Errorf("dhcpv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
</s> add return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't send a packet to %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dst, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("dhcpv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface) | <mask> }
<mask>
<mask> ifaceIPNet := getIfaceIPv6(*iface)
<mask> if len(ifaceIPNet) == 0 {
<mask> return false, fmt.Errorf("DHCPv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface)
<mask> }
<mask>
<mask> srcIP := ifaceIPNet[0]
<mask> src := net.JoinHostPort(srcIP.String(), "546")
<mask> dst := "[ff02::1:2]:547"
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, fmt.Errorf("DHCPv6: net.InterfaceByName: %s: %s", ifaceName, err)
</s> add return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
</s> add return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) </s> remove log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name)
</s> add log.Debug("dhcpv4: no IPv6 address for interface %s", iface.Name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) | <mask> dst := "[ff02::1:2]:547"
<mask>
<mask> req, err := dhcpv6.NewSolicit(iface.HardwareAddr)
<mask> if err != nil {
<mask> return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
<mask> }
<mask>
<mask> udpAddr, err := net.ResolveUDPAddr("udp6", src)
<mask> if err != nil {
<mask> return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", src, err) | <mask> }
<mask>
<mask> udpAddr, err := net.ResolveUDPAddr("udp6", src)
<mask> if err != nil {
<mask> return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src)
<mask> }
<mask>
<mask> if !udpAddr.IP.To16().Equal(srcIP) {
<mask> return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err) | <mask> return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src)
<mask> }
<mask>
<mask> if !udpAddr.IP.To16().Equal(srcIP) {
<mask> return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
<mask> }
<mask>
<mask> dstAddr, err := net.ResolveUDPAddr("udp6", dst)
<mask> if err != nil {
<mask> return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) | <mask> }
<mask>
<mask> dstAddr, err := net.ResolveUDPAddr("udp6", dst)
<mask> if err != nil {
<mask> return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
<mask> }
<mask>
<mask> log.Debug("DHCPv6: Listening to udp6 %+v", udpAddr)
<mask> c, err := nclient6.NewIPv6UDPConn(ifaceName, dhcpv6.DefaultClientPort)
<mask> if err != nil {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, fmt.Errorf("DHCPv6: Couldn't listen on :546: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't listen on :546: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", src, err) </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("dhcpv6: Couldn't listen on :546: %w", err) | <mask>
<mask> log.Debug("DHCPv6: Listening to udp6 %+v", udpAddr)
<mask> c, err := nclient6.NewIPv6UDPConn(ifaceName, dhcpv6.DefaultClientPort)
<mask> if err != nil {
<mask> return false, fmt.Errorf("DHCPv6: Couldn't listen on :546: %s", err)
<mask> }
<mask> if c != nil {
<mask> defer c.Close()
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Couldn't listen on :68")
</s> add return false, fmt.Errorf("couldn't listen on :68: %w", err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't send a packet to %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", dst)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dst, err) | <mask> }
<mask>
<mask> _, err = c.WriteTo(req.ToBytes(), dstAddr)
<mask> if err != nil {
<mask> return false, fmt.Errorf("DHCPv6: Couldn't send a packet to %s: %s", dst, err)
<mask> }
<mask>
<mask> for {
<mask> log.Debug("DHCPv6: Waiting %v for an answer", defaultDiscoverTime)
<mask> b := make([]byte, 4096)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst)
</s> add return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't listen on :546: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't listen on :546: %w", err) </s> remove return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err) </s> remove return false, fmt.Errorf("DHCPv6: net.InterfaceByName: %s: %s", ifaceName, err)
</s> add return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
return false, fmt.Errorf("couldn't receive packet: %w", err) | <mask> log.Debug("DHCPv6: didn't receive DHCP response")
<mask> return false, nil
<mask> }
<mask> if err != nil {
<mask> return false, wrapErrPrint(err, "Couldn't receive packet")
<mask> }
<mask>
<mask> log.Debug("DHCPv6: Received packet (%v bytes)", n)
<mask>
<mask> resp, err := dhcpv6.FromBytes(b[:n])
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return false, wrapErrPrint(err, "Couldn't receive packet")
</s> add return false, fmt.Errorf("couldn't receive packet: %w", err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't send a packet to %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dst, err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't listen on :546: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't listen on :546: %w", err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Couldn't resolve UDP address %s", src)
</s> add return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/check_other_dhcp.go |
<mask> import (
<mask> "encoding/binary"
<mask> "fmt"
<mask> "net"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> func isTimeout(err error) bool {
<mask> operr, ok := err.(*net.OpError)
<mask> if !ok {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/agherr" </s> remove
"github.com/joomcode/errorx"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/helpers.go |
|
<mask> }
<mask> return res
<mask> }
<mask>
<mask> func wrapErrPrint(err error, message string, args ...interface{}) error {
<mask> var errx error
<mask> if err == nil {
<mask> errx = fmt.Errorf(message, args...)
<mask> } else {
<mask> errx = errorx.Decorate(err, message, args...)
<mask> }
<mask> log.Println(errx.Error())
<mask> return errx
<mask> }
<mask>
<mask> func parseIPv4(text string) (net.IP, error) {
<mask> result := net.ParseIP(text)
<mask> if result == nil {
<mask> return nil, fmt.Errorf("%s is not an IP address", text)
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return nil, errorx.Decorate(err, "Couldn't get interfaces")
</s> add return nil, fmt.Errorf("couldn't get interfaces: %w", err) </s> remove log.Info("DNS: %s %s: %s", r.Method, r.URL, text)
</s> add log.Info("dns: %s %s: %s", r.Method, r.URL, text) </s> remove return fmt.Errorf("%s is not a valid port: %s", port, err)
</s> add return fmt.Errorf("%s is not a valid port: %w", port, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/helpers.go |
|
log.Debug("dhcpv6 ra: source IP address: %s DNS IP address: %s", | <mask> if !(ra.raAllowSlaac || ra.raSlaacOnly) {
<mask> return nil
<mask> }
<mask>
<mask> log.Debug("DHCPv6 RA: source IP address: %s DNS IP address: %s",
<mask> ra.ipAddr, ra.dnsIPAddr)
<mask>
<mask> params := icmpv6RA{
<mask> managedAddressConfiguration: !ra.raSlaacOnly,
<mask> otherConfiguration: !ra.raSlaacOnly,
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err)
</s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetMulticastHopLimit: %w", err) </s> remove return fmt.Errorf("DNS: invalid custom blocking IP address specified")
</s> add return fmt.Errorf("dns: invalid custom blocking IP address specified") </s> remove log.Debug("DHCPv4: No more IP addresses")
</s> add log.Debug("dhcpv4: No more IP addresses") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/router_adv.go |
return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) | <mask> var err error
<mask> ipAndScope := ra.ipAddr.String() + "%" + ra.ifaceName
<mask> ra.conn, err = icmp.ListenPacket("ip6:ipv6-icmp", ipAndScope)
<mask> if err != nil {
<mask> return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
<mask> }
<mask> success := false
<mask> defer func() {
<mask> if !success {
<mask> ra.Close()
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetMulticastHopLimit: %w", err) </s> remove return false, fmt.Errorf("open file: %s", err)
</s> add return false, fmt.Errorf("open file: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair")
</s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/router_adv.go |
return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) | <mask>
<mask> con6 := ra.conn.IPv6PacketConn()
<mask>
<mask> if err := con6.SetHopLimit(255); err != nil {
<mask> return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
<mask> }
<mask>
<mask> if err := con6.SetMulticastHopLimit(255); err != nil {
<mask> return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err)
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetMulticastHopLimit: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err) </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/router_adv.go |
return fmt.Errorf("dhcpv6 ra: SetMulticastHopLimit: %w", err) | <mask> return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
<mask> }
<mask>
<mask> if err := con6.SetMulticastHopLimit(255); err != nil {
<mask> return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err)
<mask> }
<mask>
<mask> msg := &ipv6.ControlMessage{
<mask> HopLimit: 255,
<mask> Src: ra.ipAddr,
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) </s> remove log.Error("DHCPv6 RA: WriteTo: %s", err)
</s> add log.Error("dhcpv6 ra: WriteTo: %s", err) </s> remove return fmt.Errorf("invalid upstream servers: %s", err)
</s> add return fmt.Errorf("invalid upstream servers: %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/router_adv.go |
log.Debug("dhcpv6 ra: starting to send periodic RouterAdvertisement packets") | <mask> IP: net.ParseIP("ff02::1"),
<mask> }
<mask>
<mask> go func() {
<mask> log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets")
<mask> for ra.stop.Load() == 0 {
<mask> _, err = con6.WriteTo(data, msg, addr)
<mask> if err != nil {
<mask> log.Error("DHCPv6 RA: WriteTo: %s", err)
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Error("DHCPv6 RA: WriteTo: %s", err)
</s> add log.Error("dhcpv6 ra: WriteTo: %s", err) </s> remove log.Debug("DHCPv6 RA: loop exit")
</s> add log.Debug("dhcpv6 ra: loop exit") </s> remove log.Info("DHCPv4: listening")
</s> add log.Info("dhcpv4: listening") </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/router_adv.go |
log.Error("dhcpv6 ra: WriteTo: %s", err) | <mask> log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets")
<mask> for ra.stop.Load() == 0 {
<mask> _, err = con6.WriteTo(data, msg, addr)
<mask> if err != nil {
<mask> log.Error("DHCPv6 RA: WriteTo: %s", err)
<mask> }
<mask> time.Sleep(ra.packetSendPeriod)
<mask> }
<mask> log.Debug("DHCPv6 RA: loop exit")
<mask> }()
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets")
</s> add log.Debug("dhcpv6 ra: starting to send periodic RouterAdvertisement packets") </s> remove log.Debug("DHCPv6 RA: loop exit")
</s> add log.Debug("dhcpv6 ra: loop exit") </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove log.Debug("DHCPv6 RA: closing")
</s> add log.Debug("dhcpv6 ra: closing") </s> remove return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetMulticastHopLimit: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/router_adv.go |
log.Debug("dhcpv6 ra: loop exit") | <mask> log.Error("DHCPv6 RA: WriteTo: %s", err)
<mask> }
<mask> time.Sleep(ra.packetSendPeriod)
<mask> }
<mask> log.Debug("DHCPv6 RA: loop exit")
<mask> }()
<mask>
<mask> success = true
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Error("DHCPv6 RA: WriteTo: %s", err)
</s> add log.Error("dhcpv6 ra: WriteTo: %s", err) </s> remove log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets")
</s> add log.Debug("dhcpv6 ra: starting to send periodic RouterAdvertisement packets") </s> remove return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetMulticastHopLimit: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/router_adv.go |
log.Debug("dhcpv6 ra: closing") | <mask> }
<mask>
<mask> // Close - close module
<mask> func (ra *raCtx) Close() {
<mask> log.Debug("DHCPv6 RA: closing")
<mask>
<mask> ra.stop.Store(1)
<mask>
<mask> if ra.conn != nil {
<mask> ra.conn.Close()
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Error("DHCPv6 RA: WriteTo: %s", err)
</s> add log.Error("dhcpv6 ra: WriteTo: %s", err) </s> remove log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets")
</s> add log.Debug("dhcpv6 ra: starting to send periodic RouterAdvertisement packets") </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove log.Debug("DHCPv6 RA: loop exit")
</s> add log.Debug("dhcpv6 ra: loop exit") </s> remove log.Debug("DHCPv6 RA: source IP address: %s DNS IP address: %s",
</s> add log.Debug("dhcpv6 ra: source IP address: %s DNS IP address: %s", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/router_adv.go |
log.Debug("dhcpv4: skipping a lease with IP %v: not within current IP range", l.IP) | <mask>
<mask> if l.Expiry.Unix() != leaseExpireStatic &&
<mask> !ip4InRange(s.conf.ipStart, s.conf.ipEnd, l.IP) {
<mask>
<mask> log.Debug("DHCPv4: skipping a lease with IP %v: not within current IP range", l.IP)
<mask> continue
<mask> }
<mask>
<mask> s.addLease(l)
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: No more IP addresses")
</s> add log.Debug("dhcpv4: No more IP addresses") </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
</s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) </s> remove log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: removed lease %s", s.leases[i].HWAddr) | <mask>
<mask> // Remove (swap) lease by index
<mask> func (s *v4Server) leaseRemoveSwapByIndex(i int) {
<mask> s.ipAddrs[s.leases[i].IP[3]] = 0
<mask> log.Debug("DHCPv4: removed lease %s", s.leases[i].HWAddr)
<mask>
<mask> n := len(s.leases)
<mask> if i != n-1 {
<mask> s.leases[i] = s.leases[n-1] // swap with the last element
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
</s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) </s> remove log.Debug("DHCPv4: ICMP procedure is complete: %v", target)
</s> add log.Debug("dhcpv4: ICMP procedure is complete: %v", target) </s> remove log.Debug("DHCPv4: No more IP addresses")
</s> add log.Debug("dhcpv4: No more IP addresses") </s> remove log.Debug("DHCPv4: skipping a lease with IP %v: not within current IP range", l.IP)
</s> add log.Debug("dhcpv4: skipping a lease with IP %v: not within current IP range", l.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) | <mask> // Add a lease
<mask> func (s *v4Server) addLease(l *Lease) {
<mask> s.leases = append(s.leases, l)
<mask> s.ipAddrs[l.IP[3]] = 1
<mask> log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
<mask> }
<mask>
<mask> // Remove a lease with the same properties
<mask> func (s *v4Server) rmLease(lease Lease) error {
<mask> for i, l := range s.leases {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: removed lease %s", s.leases[i].HWAddr)
</s> add log.Debug("dhcpv4: removed lease %s", s.leases[i].HWAddr) </s> remove log.Debug("DHCPv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac) </s> remove log.Debug("DHCPv4: ICMP procedure is complete: %v", target)
</s> add log.Debug("dhcpv4: ICMP procedure is complete: %v", target) </s> remove log.Debug("DHCPv4: skipping a lease with IP %v: not within current IP range", l.IP)
</s> add log.Debug("dhcpv4: skipping a lease with IP %v: not within current IP range", l.IP) </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return fmt.Errorf("lease not found") | <mask> if net.IP.Equal(l.IP, lease.IP) {
<mask>
<mask> if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
<mask> l.Hostname != lease.Hostname {
<mask>
<mask> return fmt.Errorf("Lease not found")
<mask> }
<mask>
<mask> s.leaseRemoveSwapByIndex(i)
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove
return fmt.Errorf("Lease not found")
</s> add return fmt.Errorf("lease not found") </s> remove log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: Sending ICMP Echo to %v", target) | <mask> reply := false
<mask> pinger.OnRecv = func(pkt *ping.Packet) {
<mask> reply = true
<mask> }
<mask> log.Debug("DHCPv4: Sending ICMP Echo to %v", target)
<mask> pinger.Run()
<mask>
<mask> if reply {
<mask> log.Info("DHCPv4: IP conflict: %v is already used by another device", target)
<mask> return false
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Info("DHCPv4: IP conflict: %v is already used by another device", target)
</s> add log.Info("dhcpv4: IP conflict: %v is already used by another device", target) </s> remove log.Debug("DHCPv4: ICMP procedure is complete: %v", target)
</s> add log.Debug("dhcpv4: ICMP procedure is complete: %v", target) </s> remove log.Debug("DHCPv4: No more IP addresses")
</s> add log.Debug("dhcpv4: No more IP addresses") </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644)
</s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) </s> remove log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Info("dhcpv4: IP conflict: %v is already used by another device", target) | <mask> log.Debug("DHCPv4: Sending ICMP Echo to %v", target)
<mask> pinger.Run()
<mask>
<mask> if reply {
<mask> log.Info("DHCPv4: IP conflict: %v is already used by another device", target)
<mask> return false
<mask> }
<mask>
<mask> log.Debug("DHCPv4: ICMP procedure is complete: %v", target)
<mask> return true
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: Sending ICMP Echo to %v", target)
</s> add log.Debug("dhcpv4: Sending ICMP Echo to %v", target) </s> remove log.Debug("DHCPv4: ICMP procedure is complete: %v", target)
</s> add log.Debug("dhcpv4: ICMP procedure is complete: %v", target) </s> remove log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP) </s> remove return "", fmt.Errorf("Whois: redirect loop")
</s> add return "", fmt.Errorf("whois: redirect loop") </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644)
</s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: ICMP procedure is complete: %v", target) | <mask> log.Info("DHCPv4: IP conflict: %v is already used by another device", target)
<mask> return false
<mask> }
<mask>
<mask> log.Debug("DHCPv4: ICMP procedure is complete: %v", target)
<mask> return true
<mask> }
<mask>
<mask> // Find lease by MAC
<mask> func (s *v4Server) findLease(mac net.HardwareAddr) *Lease {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Info("DHCPv4: IP conflict: %v is already used by another device", target)
</s> add log.Info("dhcpv4: IP conflict: %v is already used by another device", target) </s> remove log.Debug("DHCPv4: Sending ICMP Echo to %v", target)
</s> add log.Debug("dhcpv4: Sending ICMP Echo to %v", target) </s> remove log.Debug("DHCPv4: removed lease %s", s.leases[i].HWAddr)
</s> add log.Debug("dhcpv4: removed lease %s", s.leases[i].HWAddr) </s> remove log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP) </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
</s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: No more IP addresses") | <mask> toStore := false
<mask> for lease == nil {
<mask> lease = s.reserveLease(mac)
<mask> if lease == nil {
<mask> log.Debug("DHCPv4: No more IP addresses")
<mask> if toStore {
<mask> s.conf.notify(LeaseChangedDBStore)
<mask> }
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) </s> remove log.Debug("DHCPv4: skipping a lease with IP %v: not within current IP range", l.IP)
</s> add log.Debug("dhcpv4: skipping a lease with IP %v: not within current IP range", l.IP) </s> remove log.Debug("DHCPv4: removed lease %s", s.leases[i].HWAddr)
</s> add log.Debug("dhcpv4: removed lease %s", s.leases[i].HWAddr) </s> remove return fmt.Errorf("DNS: invalid custom blocking IP address specified")
</s> add return fmt.Errorf("dns: invalid custom blocking IP address specified") </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
</s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP) | <mask> } else {
<mask> reqIP := req.Options.Get(dhcpv4.OptionRequestedIPAddress)
<mask> if len(reqIP) != 0 &&
<mask> !bytes.Equal(reqIP, lease.IP) {
<mask> log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP)
<mask> }
<mask> }
<mask>
<mask> resp.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer))
<mask> return lease
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove
return fmt.Errorf("Lease not found")
</s> add return fmt.Errorf("lease not found") </s> remove
return fmt.Errorf("Lease not found")
</s> add return fmt.Errorf("lease not found") </s> remove log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac) </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) </s> remove log.Debug("DHCPv4: Invalid ClientHWAddr")
</s> add log.Debug("dhcpv4: Invalid ClientHWAddr") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac) | <mask>
<mask> sid := req.Options.Get(dhcpv4.OptionServerIdentifier)
<mask> if len(sid) != 0 &&
<mask> !bytes.Equal(sid, s.conf.dnsIPAddrs[0]) {
<mask> log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac)
<mask> return nil, false
<mask> }
<mask>
<mask> if len(reqIP) != 4 {
<mask> log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) </s> remove log.Debug("DHCPv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac) </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) </s> remove return fmt.Errorf("DHCPv6: drop packet: ServerID option in message %s", msg.Type().String())
</s> add return fmt.Errorf("dhcpv6: drop packet: ServerID option in message %s", msg.Type().String()) </s> remove return fmt.Errorf("DHCPv6: drop packet: mismatched ServerID option in message %s: %s",
</s> add return fmt.Errorf("dhcpv6: drop packet: mismatched ServerID option in message %s: %s", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) | <mask> return nil, false
<mask> }
<mask>
<mask> if len(reqIP) != 4 {
<mask> log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
<mask> return nil, false
<mask> }
<mask>
<mask> s.leasesLock.Lock()
<mask> for _, l := range s.leases {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac) </s> remove log.Debug("DHCPv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac) </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) </s> remove addrs, e := iface.Addrs()
if e != nil {
return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name)
</s> add addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac) | <mask> for _, l := range s.leases {
<mask> if bytes.Equal(l.HWAddr, mac) {
<mask> if !bytes.Equal(l.IP, reqIP) {
<mask> s.leasesLock.Unlock()
<mask> log.Debug("DHCPv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac)
<mask> return nil, true
<mask> }
<mask>
<mask> lease = l
<mask> break
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) </s> remove log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac) </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
</s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) </s> remove log.Debug("DHCPv4: No more IP addresses")
</s> add log.Debug("dhcpv4: No more IP addresses") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: No lease for %s", mac) | <mask> }
<mask> s.leasesLock.Unlock()
<mask>
<mask> if lease == nil {
<mask> log.Debug("DHCPv4: No lease for %s", mac)
<mask> return nil, true
<mask> }
<mask>
<mask> if lease.Expiry.Unix() != leaseExpireStatic {
<mask> lease.Hostname = string(hostname)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac) </s> remove log.Debug("DHCPv4: No more IP addresses")
</s> add log.Debug("dhcpv4: No more IP addresses") </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) </s> remove log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac) </s> remove log.Debug("DHCPv4: skipping a lease with IP %v: not within current IP range", l.IP)
</s> add log.Debug("dhcpv4: skipping a lease with IP %v: not within current IP range", l.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: received message: %s", req.Summary()) | <mask> // client(255.255.255.255:68) <- (Reply:YourIP,ClientMAC,Type=Offer,ServerID,SubnetMask,LeaseTime) <- server(<IP>:67)
<mask> // client(0.0.0.0:68) -> (Request:ClientMAC,Type=Request,ClientID,ReqIP||ClientIP,HostName,ServerID,ParamReqList) -> server(255.255.255.255:67)
<mask> // client(255.255.255.255:68) <- (Reply:YourIP,ClientMAC,Type=ACK,ServerID,SubnetMask,LeaseTime) <- server(<IP>:67)
<mask> func (s *v4Server) packetHandler(conn net.PacketConn, peer net.Addr, req *dhcpv4.DHCPv4) {
<mask> log.Debug("DHCPv4: received message: %s", req.Summary())
<mask>
<mask> switch req.MessageType() {
<mask> case dhcpv4.MessageTypeDiscover,
<mask> dhcpv4.MessageTypeRequest:
<mask> //
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
</s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) </s> remove log.Debug("DHCPv4: removed lease %s", s.leases[i].HWAddr)
</s> add log.Debug("dhcpv4: removed lease %s", s.leases[i].HWAddr) </s> remove log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
</s> add log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost)) </s> remove return false //software
</s> add return false // software </s> remove return false //private network
</s> add return false // private network | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: unsupported message type %d", req.MessageType()) | <mask> dhcpv4.MessageTypeRequest:
<mask> //
<mask>
<mask> default:
<mask> log.Debug("DHCPv4: unsupported message type %d", req.MessageType())
<mask> return
<mask> }
<mask>
<mask> resp, err := dhcpv4.NewReplyFromRequest(req)
<mask> if err != nil {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) </s> remove return false, fmt.Errorf("open file: %s", err)
</s> add return false, fmt.Errorf("open file: %w", err) </s> remove log.Debug("DHCPv4: stopping")
</s> add log.Debug("dhcpv4: stopping") </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: dhcpv4.New: %s", err) | <mask> }
<mask>
<mask> resp, err := dhcpv4.NewReplyFromRequest(req)
<mask> if err != nil {
<mask> log.Debug("DHCPv4: dhcpv4.New: %s", err)
<mask> return
<mask> }
<mask>
<mask> if len(req.ClientHWAddr) != 6 {
<mask> log.Debug("DHCPv4: Invalid ClientHWAddr")
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: Invalid ClientHWAddr")
</s> add log.Debug("dhcpv4: Invalid ClientHWAddr") </s> remove log.Debug("DHCPv4: unsupported message type %d", req.MessageType())
</s> add log.Debug("dhcpv4: unsupported message type %d", req.MessageType()) </s> remove log.Debug("DHCPv4: stopping")
</s> add log.Debug("dhcpv4: stopping") </s> remove log.Error("DHCPv4: srv.Close: %s", err)
</s> add log.Error("dhcpv4: srv.Close: %s", err) </s> remove return false, fmt.Errorf("open file: %s", err)
</s> add return false, fmt.Errorf("open file: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: Invalid ClientHWAddr") | <mask> return
<mask> }
<mask>
<mask> if len(req.ClientHWAddr) != 6 {
<mask> log.Debug("DHCPv4: Invalid ClientHWAddr")
<mask> return
<mask> }
<mask>
<mask> r := s.process(req, resp)
<mask> if r < 0 {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) </s> remove log.Debug("DHCPv4: sending: %s", resp.Summary())
</s> add log.Debug("dhcpv4: sending: %s", resp.Summary()) </s> remove return fmt.Errorf("ID required")
</s> add return fmt.Errorf("id required") </s> remove log.Debug("DHCPv4: stopping")
</s> add log.Debug("dhcpv4: stopping") </s> remove log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: sending: %s", resp.Summary()) | <mask> } else if r == 0 {
<mask> resp.Options.Update(dhcpv4.OptMessageType(dhcpv4.MessageTypeNak))
<mask> }
<mask>
<mask> log.Debug("DHCPv4: sending: %s", resp.Summary())
<mask>
<mask> _, err = conn.WriteTo(resp.ToBytes(), peer)
<mask> if err != nil {
<mask> log.Error("DHCPv4: conn.Write to %s failed: %s", peer, err)
<mask> return
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Error("DHCPv4: conn.Write to %s failed: %s", peer, err)
</s> add log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err) </s> remove return fmt.Errorf(".tar.gz unpack failed: %s", err)
</s> add return fmt.Errorf(".tar.gz unpack failed: %w", err) </s> remove return fmt.Errorf(".zip unpack failed: %s", err)
</s> add return fmt.Errorf(".zip unpack failed: %w", err) </s> remove log.Debug("DHCPv4: stopping")
</s> add log.Debug("dhcpv4: stopping") </s> remove log.Error("DHCPv4: srv.Close: %s", err)
</s> add log.Error("dhcpv4: srv.Close: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err) | <mask> log.Debug("DHCPv4: sending: %s", resp.Summary())
<mask>
<mask> _, err = conn.WriteTo(resp.ToBytes(), peer)
<mask> if err != nil {
<mask> log.Error("DHCPv4: conn.Write to %s failed: %s", peer, err)
<mask> return
<mask> }
<mask> }
<mask>
<mask> // Start - start server
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: sending: %s", resp.Summary())
</s> add log.Debug("dhcpv4: sending: %s", resp.Summary()) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err)
</s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove log.Error("DHCPv4: srv.Close: %s", err)
</s> add log.Error("dhcpv4: srv.Close: %s", err) </s> remove log.Debug("DHCPv4: stopping")
</s> add log.Debug("dhcpv4: stopping") </s> remove log.Debug("DHCPv4: srv.Serve: %s", err)
</s> add log.Debug("dhcpv4: srv.Serve: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return fmt.Errorf("dhcpv4: Couldn't find interface by name %s: %w", s.conf.InterfaceName, err) | <mask> }
<mask>
<mask> iface, err := net.InterfaceByName(s.conf.InterfaceName)
<mask> if err != nil {
<mask> return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err)
<mask> }
<mask>
<mask> log.Debug("DHCPv4: starting...")
<mask> s.conf.dnsIPAddrs = getIfaceIPv4(*iface)
<mask> if len(s.conf.dnsIPAddrs) == 0 {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: starting...")
</s> add log.Debug("dhcpv4: starting...") </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
</s> add return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name)
</s> add log.Debug("dhcpv4: no IPv6 address for interface %s", iface.Name) </s> remove return false, fmt.Errorf("DHCPv6: net.InterfaceByName: %s: %s", ifaceName, err)
</s> add return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: starting...") | <mask> if err != nil {
<mask> return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err)
<mask> }
<mask>
<mask> log.Debug("DHCPv4: starting...")
<mask> s.conf.dnsIPAddrs = getIfaceIPv4(*iface)
<mask> if len(s.conf.dnsIPAddrs) == 0 {
<mask> log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name)
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err)
</s> add return fmt.Errorf("dhcpv4: Couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
</s> add return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name)
</s> add log.Debug("dhcpv4: no IPv6 address for interface %s", iface.Name) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return false, fmt.Errorf("DHCPv6: net.InterfaceByName: %s: %s", ifaceName, err)
</s> add return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: no IPv6 address for interface %s", iface.Name) | <mask>
<mask> log.Debug("DHCPv4: starting...")
<mask> s.conf.dnsIPAddrs = getIfaceIPv4(*iface)
<mask> if len(s.conf.dnsIPAddrs) == 0 {
<mask> log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name)
<mask> return nil
<mask> }
<mask>
<mask> laddr := &net.UDPAddr{
<mask> IP: net.ParseIP("0.0.0.0"),
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: starting...")
</s> add log.Debug("dhcpv4: starting...") </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
</s> add return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err)
</s> add return fmt.Errorf("dhcpv4: Couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return false, fmt.Errorf("DHCPv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface)
</s> add return false, fmt.Errorf("dhcpv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Info("dhcpv4: listening") | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> log.Info("DHCPv4: listening")
<mask>
<mask> go func() {
<mask> err = s.srv.Serve()
<mask> log.Debug("DHCPv4: srv.Serve: %s", err)
<mask> }()
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: srv.Serve: %s", err)
</s> add log.Debug("dhcpv4: srv.Serve: %s", err) </s> remove log.Error("DHCPv4: srv.Close: %s", err)
</s> add log.Error("dhcpv4: srv.Close: %s", err) </s> remove log.Debug("DHCPv4: stopping")
</s> add log.Debug("dhcpv4: stopping") </s> remove return nil, fmt.Errorf("os.Open(): %s", err)
</s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: srv.Serve: %s", err) | <mask> log.Info("DHCPv4: listening")
<mask>
<mask> go func() {
<mask> err = s.srv.Serve()
<mask> log.Debug("DHCPv4: srv.Serve: %s", err)
<mask> }()
<mask> return nil
<mask> }
<mask>
<mask> // Stop - stop server
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Info("DHCPv4: listening")
</s> add log.Info("dhcpv4: listening") </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove log.Error("DHCPv4: srv.Close: %s", err)
</s> add log.Error("dhcpv4: srv.Close: %s", err) </s> remove log.Error("DHCPv4: conn.Write to %s failed: %s", peer, err)
</s> add log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err) </s> remove log.Debug("DHCPv4: stopping")
</s> add log.Debug("dhcpv4: stopping") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: stopping") | <mask> if s.srv == nil {
<mask> return
<mask> }
<mask>
<mask> log.Debug("DHCPv4: stopping")
<mask> err := s.srv.Close()
<mask> if err != nil {
<mask> log.Error("DHCPv4: srv.Close: %s", err)
<mask> }
<mask> // now s.srv.Serve() will return
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Error("DHCPv4: srv.Close: %s", err)
</s> add log.Error("dhcpv4: srv.Close: %s", err) </s> remove log.Info("DHCPv4: listening")
</s> add log.Info("dhcpv4: listening") </s> remove log.Debug("DHCPv4: sending: %s", resp.Summary())
</s> add log.Debug("dhcpv4: sending: %s", resp.Summary()) </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Error("dhcpv4: srv.Close: %s", err) | <mask>
<mask> log.Debug("DHCPv4: stopping")
<mask> err := s.srv.Close()
<mask> if err != nil {
<mask> log.Error("DHCPv4: srv.Close: %s", err)
<mask> }
<mask> // now s.srv.Serve() will return
<mask> s.srv = nil
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: stopping")
</s> add log.Debug("dhcpv4: stopping") </s> remove log.Info("DHCPv4: listening")
</s> add log.Info("dhcpv4: listening") </s> remove log.Debug("DHCPv4: sending: %s", resp.Summary())
</s> add log.Debug("dhcpv4: sending: %s", resp.Summary()) </s> remove log.Error("DHCPv4: conn.Write to %s failed: %s", peer, err)
</s> add log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err) </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return s, fmt.Errorf("dhcpv4: %w", err) | <mask>
<mask> var err error
<mask> s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
<mask> if err != nil {
<mask> return s, fmt.Errorf("DHCPv4: %s", err)
<mask> }
<mask>
<mask> subnet, err := parseIPv4(s.conf.SubnetMask)
<mask> if err != nil || !isValidSubnetMask(subnet) {
<mask> return s, fmt.Errorf("DHCPv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask) </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP")
</s> add return s, fmt.Errorf("dhcpv4: invalid range start IP") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask) | <mask> }
<mask>
<mask> subnet, err := parseIPv4(s.conf.SubnetMask)
<mask> if err != nil || !isValidSubnetMask(subnet) {
<mask> return s, fmt.Errorf("DHCPv4: invalid subnet mask: %s", s.conf.SubnetMask)
<mask> }
<mask> s.conf.subnetMask = make([]byte, 4)
<mask> copy(s.conf.subnetMask, subnet)
<mask>
<mask> s.conf.ipStart, err = parseIPv4(conf.RangeStart)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP")
</s> add return s, fmt.Errorf("dhcpv4: invalid range start IP") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
</s> add return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return s, fmt.Errorf("dhcpv4: %w", err) | <mask> copy(s.conf.subnetMask, subnet)
<mask>
<mask> s.conf.ipStart, err = parseIPv4(conf.RangeStart)
<mask> if s.conf.ipStart == nil {
<mask> return s, fmt.Errorf("DHCPv4: %s", err)
<mask> }
<mask> if s.conf.ipStart[0] == 0 {
<mask> return s, fmt.Errorf("DHCPv4: invalid range start IP")
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP")
</s> add return s, fmt.Errorf("dhcpv4: invalid range start IP") </s> remove return s, fmt.Errorf("DHCPv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: range end IP should match range start IP")
</s> add return s, fmt.Errorf("dhcpv4: range end IP should match range start IP") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return s, fmt.Errorf("dhcpv4: invalid range start IP") | <mask> if s.conf.ipStart == nil {
<mask> return s, fmt.Errorf("DHCPv4: %s", err)
<mask> }
<mask> if s.conf.ipStart[0] == 0 {
<mask> return s, fmt.Errorf("DHCPv4: invalid range start IP")
<mask> }
<mask>
<mask> s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
<mask> if s.conf.ipEnd == nil {
<mask> return s, fmt.Errorf("DHCPv4: %s", err)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: range end IP should match range start IP")
</s> add return s, fmt.Errorf("dhcpv4: range end IP should match range start IP") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
</s> add return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return s, fmt.Errorf("dhcpv4: %w", err) | <mask> }
<mask>
<mask> s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
<mask> if s.conf.ipEnd == nil {
<mask> return s, fmt.Errorf("DHCPv4: %s", err)
<mask> }
<mask> if !net.IP.Equal(s.conf.ipStart[:3], s.conf.ipEnd[:3]) ||
<mask> s.conf.ipStart[3] > s.conf.ipEnd[3] {
<mask> return s, fmt.Errorf("DHCPv4: range end IP should match range start IP")
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv4: range end IP should match range start IP")
</s> add return s, fmt.Errorf("dhcpv4: range end IP should match range start IP") </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP")
</s> add return s, fmt.Errorf("dhcpv4: invalid range start IP") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return s, fmt.Errorf("dhcpv4: range end IP should match range start IP") | <mask> return s, fmt.Errorf("DHCPv4: %s", err)
<mask> }
<mask> if !net.IP.Equal(s.conf.ipStart[:3], s.conf.ipEnd[:3]) ||
<mask> s.conf.ipStart[3] > s.conf.ipEnd[3] {
<mask> return s, fmt.Errorf("DHCPv4: range end IP should match range start IP")
<mask> }
<mask>
<mask> if conf.LeaseDuration == 0 {
<mask> s.conf.leaseTime = time.Hour * 24
<mask> s.conf.LeaseDuration = uint32(s.conf.leaseTime.Seconds())
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
</s> add return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP")
</s> add return s, fmt.Errorf("dhcpv4: invalid range start IP") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
log.Debug("dhcpv4: bad option string: %s", o) | <mask>
<mask> for _, o := range conf.Options {
<mask> code, val := parseOptionString(o)
<mask> if code == 0 {
<mask> log.Debug("DHCPv4: bad option string: %s", o)
<mask> continue
<mask> }
<mask>
<mask> opt := dhcpOption{
<mask> code: code,
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Info("IPSET: ipset add: code:%d output:'%s'", code, out)
</s> add log.Info("IPSET: ipset add: code:%d output:%q", code, out) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v4.go |
return fmt.Errorf("lease not found") | <mask> if net.IP.Equal(l.IP, lease.IP) {
<mask>
<mask> if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
<mask> l.Hostname != lease.Hostname {
<mask>
<mask> return fmt.Errorf("Lease not found")
<mask> }
<mask>
<mask> s.leaseRemoveSwapByIndex(i)
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v6.go |
return fmt.Errorf("dhcpv6: no ClientID option in request") | <mask>
<mask> // Check Client ID
<mask> func (s *v6Server) checkCID(msg *dhcpv6.Message) error {
<mask> if msg.Options.ClientID() == nil {
<mask> return fmt.Errorf("DHCPv6: no ClientID option in request")
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Check ServerID policy
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DHCPv6: drop packet: mismatched ServerID option in message %s: %s",
</s> add return fmt.Errorf("dhcpv6: drop packet: mismatched ServerID option in message %s: %s", </s> remove return fmt.Errorf("DHCPv6: drop packet: no ServerID option in message %s", msg.Type().String())
</s> add return fmt.Errorf("dhcpv6: drop packet: no ServerID option in message %s", msg.Type().String()) </s> remove return fmt.Errorf("DHCPv6: drop packet: ServerID option in message %s", msg.Type().String())
</s> add return fmt.Errorf("dhcpv6: drop packet: ServerID option in message %s", msg.Type().String()) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v6.go |
return fmt.Errorf("dhcpv6: drop packet: ServerID option in message %s", msg.Type().String()) | <mask> dhcpv6.MessageTypeConfirm,
<mask> dhcpv6.MessageTypeRebind:
<mask>
<mask> if sid != nil {
<mask> return fmt.Errorf("DHCPv6: drop packet: ServerID option in message %s", msg.Type().String())
<mask> }
<mask>
<mask> case dhcpv6.MessageTypeRequest,
<mask> dhcpv6.MessageTypeRenew,
<mask> dhcpv6.MessageTypeRelease,
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DHCPv6: drop packet: no ServerID option in message %s", msg.Type().String())
</s> add return fmt.Errorf("dhcpv6: drop packet: no ServerID option in message %s", msg.Type().String()) </s> remove return fmt.Errorf("DHCPv6: drop packet: mismatched ServerID option in message %s: %s",
</s> add return fmt.Errorf("dhcpv6: drop packet: mismatched ServerID option in message %s: %s", </s> remove return fmt.Errorf("DHCPv6: no ClientID option in request")
</s> add return fmt.Errorf("dhcpv6: no ClientID option in request") </s> remove log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac) </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v6.go |
return fmt.Errorf("dhcpv6: drop packet: no ServerID option in message %s", msg.Type().String()) | <mask> dhcpv6.MessageTypeRelease,
<mask> dhcpv6.MessageTypeDecline:
<mask>
<mask> if sid == nil {
<mask> return fmt.Errorf("DHCPv6: drop packet: no ServerID option in message %s", msg.Type().String())
<mask> }
<mask> if !sid.Equal(s.sid) {
<mask> return fmt.Errorf("DHCPv6: drop packet: mismatched ServerID option in message %s: %s",
<mask> msg.Type().String(), sid.String())
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DHCPv6: drop packet: mismatched ServerID option in message %s: %s",
</s> add return fmt.Errorf("dhcpv6: drop packet: mismatched ServerID option in message %s: %s", </s> remove return fmt.Errorf("DHCPv6: drop packet: ServerID option in message %s", msg.Type().String())
</s> add return fmt.Errorf("dhcpv6: drop packet: ServerID option in message %s", msg.Type().String()) </s> remove return fmt.Errorf("DHCPv6: no ClientID option in request")
</s> add return fmt.Errorf("dhcpv6: no ClientID option in request") </s> remove log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac) </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v6.go |
return fmt.Errorf("dhcpv6: drop packet: mismatched ServerID option in message %s: %s", | <mask> if sid == nil {
<mask> return fmt.Errorf("DHCPv6: drop packet: no ServerID option in message %s", msg.Type().String())
<mask> }
<mask> if !sid.Equal(s.sid) {
<mask> return fmt.Errorf("DHCPv6: drop packet: mismatched ServerID option in message %s: %s",
<mask> msg.Type().String(), sid.String())
<mask> }
<mask> }
<mask>
<mask> return nil
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DHCPv6: drop packet: no ServerID option in message %s", msg.Type().String())
</s> add return fmt.Errorf("dhcpv6: drop packet: no ServerID option in message %s", msg.Type().String()) </s> remove return fmt.Errorf("DHCPv6: drop packet: ServerID option in message %s", msg.Type().String())
</s> add return fmt.Errorf("dhcpv6: drop packet: ServerID option in message %s", msg.Type().String()) </s> remove return fmt.Errorf("DHCPv6: no ClientID option in request")
</s> add return fmt.Errorf("dhcpv6: no ClientID option in request") </s> remove log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac) </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v6.go |
return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) | <mask> }
<mask>
<mask> iface, err := net.InterfaceByName(s.conf.InterfaceName)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
<mask> }
<mask>
<mask> s.conf.dnsIPAddrs = getIfaceIPv6(*iface)
<mask> if len(s.conf.dnsIPAddrs) == 0 {
<mask> log.Debug("DHCPv6: no IPv6 address for interface %s", iface.Name)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("DHCPv4: starting...")
</s> add log.Debug("dhcpv4: starting...") </s> remove return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err)
</s> add return fmt.Errorf("dhcpv4: Couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name)
</s> add log.Debug("dhcpv4: no IPv6 address for interface %s", iface.Name) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return false, fmt.Errorf("DHCPv6: net.InterfaceByName: %s: %s", ifaceName, err)
</s> add return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v6.go |
return fmt.Errorf("dhcpv6: invalid MAC %s", iface.HardwareAddr) | <mask>
<mask> log.Debug("DHCPv6: starting...")
<mask>
<mask> if len(iface.HardwareAddr) != 6 {
<mask> return fmt.Errorf("DHCPv6: invalid MAC %s", iface.HardwareAddr)
<mask> }
<mask> s.sid = dhcpv6.Duid{
<mask> Type: dhcpv6.DUID_LLT,
<mask> HwType: iana.HWTypeEthernet,
<mask> LinkLayerAddr: iface.HardwareAddr,
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
</s> add return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) </s> remove log.Debug("DHCPv4: starting...")
</s> add log.Debug("dhcpv4: starting...") </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't listen on :546: %s", err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't listen on :546: %w", err) </s> remove return false, fmt.Errorf("DHCPv6: Couldn't send a packet to %s: %s", dst, err)
</s> add return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dst, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v6.go |
return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) | <mask> }
<mask>
<mask> s.conf.ipStart = net.ParseIP(conf.RangeStart)
<mask> if s.conf.ipStart == nil || s.conf.ipStart.To16() == nil {
<mask> return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
<mask> }
<mask>
<mask> if conf.LeaseDuration == 0 {
<mask> s.conf.leaseTime = time.Hour * 24
<mask> s.conf.LeaseDuration = uint32(s.conf.leaseTime.Seconds())
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv4: range end IP should match range start IP")
</s> add return s, fmt.Errorf("dhcpv4: range end IP should match range start IP") </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP")
</s> add return s, fmt.Errorf("dhcpv4: invalid range start IP") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return fmt.Errorf("DNS: invalid custom blocking IP address specified")
</s> add return fmt.Errorf("dns: invalid custom blocking IP address specified") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dhcpd/v6.go |
return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %w", f.FilePath, err) | <mask> // On Windows we don't pass a file to urlfilter because
<mask> // it's difficult to update this file while it's being used.
<mask> data, err := ioutil.ReadFile(f.FilePath)
<mask> if err != nil {
<mask> return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %s", f.FilePath, err)
<mask> }
<mask> list = &filterlist.StringRuleList{
<mask> ID: int(f.ID),
<mask> RulesText: string(data),
<mask> IgnoreCosmetic: true,
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644)
</s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain")
</s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode private key")
</s> add return data, fmt.Errorf("failed to base64-decode private key: %w", err) </s> remove if //noinspection ALL
</s> add if // noinspection ALL | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) | <mask> } else {
<mask> var err error
<mask> list, err = filterlist.NewFileRuleList(int(f.ID), f.FilePath, true)
<mask> if err != nil {
<mask> return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
<mask> }
<mask> }
<mask> listArray = append(listArray, list)
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return fmt.Errorf("filterlist.NewRuleStorage(): %w", err) </s> remove return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %w", f.FilePath, err) </s> remove return nil, fmt.Errorf("gzip.NewReader(): %s", err)
</s> add return nil, fmt.Errorf("gzip.NewReader(): %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err) | <mask> }
<mask>
<mask> rulesStorage, err := filterlist.NewRuleStorage(listArray)
<mask> if err != nil {
<mask> return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
<mask> }
<mask> filteringEngine := urlfilter.NewDNSEngine(rulesStorage)
<mask> return rulesStorage, filteringEngine, nil
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return fmt.Errorf("filterlist.NewRuleStorage(): %w", err) </s> remove return nil, fmt.Errorf("gzip.NewReader(): %s", err)
</s> add return nil, fmt.Errorf("gzip.NewReader(): %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove return nil, errorx.Decorate(err, "Couldn't get interfaces")
</s> add return nil, fmt.Errorf("couldn't get interfaces: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
log.Debug("Filtering: found whitelist rule for host %q: %q list_id: %d", | <mask> } else if rr.HostRulesV6 != nil {
<mask> rule = rr.HostRulesV6[0]
<mask> }
<mask>
<mask> log.Debug("Filtering: found whitelist rule for host '%s': '%s' list_id: %d",
<mask> host, rule.Text(), rule.GetFilterListID())
<mask> res := makeResult(rule, NotFilteredWhiteList)
<mask> return res, nil
<mask> }
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
</s> add return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
log.Debug("Filtering: found rule for host %q: %q list_id: %d", | <mask> return Result{}, nil
<mask> }
<mask>
<mask> if rr.NetworkRule != nil {
<mask> log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
<mask> host, rr.NetworkRule.Text(), rr.NetworkRule.GetFilterListID())
<mask> reason := FilteredBlackList
<mask> if rr.NetworkRule.Whitelist {
<mask> reason = NotFilteredWhiteList
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("Filtering: found whitelist rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found whitelist rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
</s> add return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
log.Debug("Filtering: found rule for host %q: %q list_id: %d", | <mask> }
<mask>
<mask> if qtype == dns.TypeA && rr.HostRulesV4 != nil {
<mask> rule := rr.HostRulesV4[0] // note that we process only 1 matched rule
<mask> log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
<mask> host, rule.Text(), rule.GetFilterListID())
<mask> res := makeResult(rule, FilteredBlackList)
<mask> res.IP = rule.IP.To4()
<mask> return res, nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found whitelist rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found whitelist rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
</s> add return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
log.Debug("Filtering: found rule for host %q: %q list_id: %d", | <mask> }
<mask>
<mask> if qtype == dns.TypeAAAA && rr.HostRulesV6 != nil {
<mask> rule := rr.HostRulesV6[0] // note that we process only 1 matched rule
<mask> log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
<mask> host, rule.Text(), rule.GetFilterListID())
<mask> res := makeResult(rule, FilteredBlackList)
<mask> res.IP = rule.IP
<mask> return res, nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found whitelist rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found whitelist rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
</s> add return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
log.Debug("Filtering: found rule for host %q: %q list_id: %d", | <mask> rule = rr.HostRulesV4[0]
<mask> } else if rr.HostRulesV6 != nil {
<mask> rule = rr.HostRulesV6[0]
<mask> }
<mask> log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
<mask> host, rule.Text(), rule.GetFilterListID())
<mask> res := makeResult(rule, FilteredBlackList)
<mask> res.IP = net.IP{}
<mask> return res, nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("Filtering: found whitelist rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found whitelist rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
</s> add return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
log.Debug("skipping unknown blocked-service %q", s) | <mask>
<mask> bsvcs := []string{}
<mask> for _, s := range d.BlockedServices {
<mask> if !BlockedSvcKnown(s) {
<mask> log.Debug("skipping unknown blocked-service '%s'", s)
<mask> continue
<mask> }
<mask> bsvcs = append(bsvcs, s)
<mask> }
<mask> d.BlockedServices = bsvcs
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("Clients: skipping unknown blocked-service '%s'", s)
</s> add log.Debug("Clients: skipping unknown blocked-service %q", s) </s> remove log.Debug("Clients: skipping unknown tag '%s'", t)
</s> add log.Debug("Clients: skipping unknown tag %q", t) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsfilter/dnsfilter.go |
return fmt.Errorf("filterlist.NewRuleStorage(): %w", err) | <mask> }
<mask> listArray = append(listArray, list)
<mask> rulesStorage, err := filterlist.NewRuleStorage(listArray)
<mask> if err != nil {
<mask> return fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
<mask> }
<mask> a.blockedHostsEngine = urlfilter.NewDNSEngine(rulesStorage)
<mask>
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/access.go |
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // FilteringConfig represents the DNS filtering configuration of AdGuard Home
<mask> // The zero FilteringConfig is empty and ready for use.
<mask> type FilteringConfig struct {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove
"github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove var (
nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
</s> add var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID </s> remove "github.com/joomcode/errorx"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/config.go |
|
return fmt.Errorf("dns: proxy.ParseUpstreamsConfig: %w", err) | <mask> }
<mask> upstreams = filterOutComments(upstreams)
<mask> upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
<mask> if err != nil {
<mask> return fmt.Errorf("DNS: proxy.ParseUpstreamsConfig: %s", err)
<mask> }
<mask>
<mask> if len(upstreamConfig.Upstreams) == 0 {
<mask> log.Info("Warning: no default upstream servers specified, using %v", defaultDNS)
<mask> uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DNS: failed to parse default upstreams: %v", err)
</s> add return fmt.Errorf("dns: failed to parse default upstreams: %v", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return errorx.Decorate(err, "x509.ParseCertificate(): %s", err)
</s> add return fmt.Errorf("x509.ParseCertificate(): %w", err) </s> remove return fmt.Errorf("invalid upstream servers: %s", err)
</s> add return fmt.Errorf("invalid upstream servers: %w", err) </s> remove log.Debug("Checking if DNS %s works...", input)
</s> add log.Debug("checking if dns %s works...", input) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/config.go |
return fmt.Errorf("dns: failed to parse default upstreams: %v", err) | <mask> if len(upstreamConfig.Upstreams) == 0 {
<mask> log.Info("Warning: no default upstream servers specified, using %v", defaultDNS)
<mask> uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
<mask> if err != nil {
<mask> return fmt.Errorf("DNS: failed to parse default upstreams: %v", err)
<mask> }
<mask> upstreamConfig.Upstreams = uc.Upstreams
<mask> }
<mask>
<mask> s.conf.UpstreamConfig = &upstreamConfig
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DNS: proxy.ParseUpstreamsConfig: %s", err)
</s> add return fmt.Errorf("dns: proxy.ParseUpstreamsConfig: %w", err) </s> remove return errorx.Decorate(err, "x509.ParseCertificate(): %s", err)
</s> add return fmt.Errorf("x509.ParseCertificate(): %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair")
</s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to parse new TLS config json")
</s> add return data, fmt.Errorf("failed to parse new TLS config json: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/config.go |
return fmt.Errorf("failed to parse TLS keypair: %w", err) | <mask>
<mask> var err error
<mask> s.conf.cert, err = tls.X509KeyPair(s.conf.CertificateChainData, s.conf.PrivateKeyData)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Failed to parse TLS keypair")
<mask> }
<mask>
<mask> if s.conf.StrictSNICheck {
<mask> x, err := x509.ParseCertificate(s.conf.cert.Certificate[0])
<mask> if err != nil {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return data, errorx.Decorate(err, "Failed to parse new TLS config json")
</s> add return data, fmt.Errorf("failed to parse new TLS config json: %w", err) </s> remove return errorx.Decorate(err, "x509.ParseCertificate(): %s", err)
</s> add return fmt.Errorf("x509.ParseCertificate(): %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain")
</s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode private key")
</s> add return data, fmt.Errorf("failed to base64-decode private key: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/config.go |
return fmt.Errorf("x509.ParseCertificate(): %w", err) | <mask>
<mask> if s.conf.StrictSNICheck {
<mask> x, err := x509.ParseCertificate(s.conf.cert.Certificate[0])
<mask> if err != nil {
<mask> return errorx.Decorate(err, "x509.ParseCertificate(): %s", err)
<mask> }
<mask> if len(x.DNSNames) != 0 {
<mask> s.conf.dnsNames = x.DNSNames
<mask> log.Debug("DNS: using DNS names from certificate's SAN: %v", x.DNSNames)
<mask> sort.Strings(s.conf.dnsNames)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair")
</s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove return fmt.Errorf("DNS: proxy.ParseUpstreamsConfig: %s", err)
</s> add return fmt.Errorf("dns: proxy.ParseUpstreamsConfig: %w", err) </s> remove return fmt.Errorf("DNS: failed to parse default upstreams: %v", err)
</s> add return fmt.Errorf("dns: failed to parse default upstreams: %v", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/config.go |
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // DefaultTimeout is the default upstream timeout
<mask> const DefaultTimeout = 10 * time.Second
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
</s> add const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) </s> remove "github.com/joomcode/errorx"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward.go |
|
return fmt.Errorf("dns: invalid custom blocking IP address specified") | <mask> if s.conf.BlockingMode == "custom_ip" {
<mask> s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
<mask> s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
<mask> if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
<mask> return fmt.Errorf("DNS: invalid custom blocking IP address specified")
<mask> }
<mask> }
<mask> if s.conf.MaxGoroutines == 0 {
<mask> s.conf.MaxGoroutines = 50
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
</s> add return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP")
</s> add return s, fmt.Errorf("dhcpv4: invalid range start IP") </s> remove log.Debug("DHCPv4: No more IP addresses")
</s> add log.Debug("dhcpv4: No more IP addresses") </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward.go |
return fmt.Errorf("could not stop the DNS server properly: %w", err) | <mask> func (s *Server) stopInternal() error {
<mask> if s.dnsProxy != nil {
<mask> err := s.dnsProxy.Stop()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not stop the DNS server properly")
<mask> }
<mask> }
<mask>
<mask> s.isRunning = false
<mask> return nil
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
</s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair")
</s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward.go |
return fmt.Errorf("could not reconfigure the server: %w", err) | <mask>
<mask> log.Print("Start reconfiguring the server")
<mask> err := s.stopInternal()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not reconfigure the server")
<mask> }
<mask>
<mask> // It seems that net.Listener.Close() doesn't close file descriptors right away.
<mask> // We wait for some time and hope that this fd will be closed.
<mask> time.Sleep(100 * time.Millisecond)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
</s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
</s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward.go |
return fmt.Errorf("could not reconfigure the server: %w", err) | <mask> time.Sleep(100 * time.Millisecond)
<mask>
<mask> err = s.Prepare(config)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not reconfigure the server")
<mask> }
<mask>
<mask> err = s.startInternal()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not reconfigure the server")
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
</s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward.go |
return fmt.Errorf("could not reconfigure the server: %w", err) | <mask> }
<mask>
<mask> err = s.startInternal()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not reconfigure the server")
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
</s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward.go |
log.Info("dns: %s %s: %s", r.Method, r.URL, text) | <mask> )
<mask>
<mask> func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
<mask> text := fmt.Sprintf(format, args...)
<mask> log.Info("DNS: %s %s: %s", r.Method, r.URL, text)
<mask> http.Error(w, text, code)
<mask> }
<mask>
<mask> type dnsConfigJSON struct {
<mask> Upstreams []string `json:"upstream_dns"`
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove
"github.com/joomcode/errorx"
</s> add </s> remove const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
</s> add const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) </s> remove "github.com/joomcode/errorx"
</s> add </s> remove log.Debug("DHCPv4: bad option string: %s", o)
</s> add log.Debug("dhcpv4: bad option string: %s", o) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return fmt.Errorf("invalid bootstrap server address: %w", err) | <mask> return fmt.Errorf("invalid bootstrap server address: empty")
<mask> }
<mask> _, err := upstream.NewResolver(addr, 0)
<mask> if err != nil {
<mask> return fmt.Errorf("invalid bootstrap server address: %s", err)
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // nolint(gocyclo) - we need to check each JSON field separately
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("invalid upstream servers: %s", err)
</s> add return fmt.Errorf("invalid upstream servers: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove log.Error("DHCPv4: conn.Write to %s failed: %s", peer, err)
</s> add log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err) </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
</s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return "", defaultUpstream, fmt.Errorf("wrong dns upstream per domain specification: %s", upstream) | <mask> defaultUpstream = false
<mask> // split domains and upstream string
<mask> domainsAndUpstream := strings.Split(strings.TrimPrefix(upstream, "[/"), "/]")
<mask> if len(domainsAndUpstream) != 2 {
<mask> return "", defaultUpstream, fmt.Errorf("wrong DNS upstream per domain specification: %s", upstream)
<mask> }
<mask>
<mask> // split domains list and validate each one
<mask> for _, host := range strings.Split(domainsAndUpstream[0], "/") {
<mask> if host != "" {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain")
</s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return fmt.Errorf("%s is not a valid port: %w", port, err) | <mask> }
<mask>
<mask> _, err = strconv.ParseInt(port, 0, 64)
<mask> if err != nil {
<mask> return fmt.Errorf("%s is not a valid port: %s", port, err)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove err = fmt.Errorf("port '%s' is not a number", v)
</s> add err = fmt.Errorf("port %q is not a number", v) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return fmt.Errorf("wrong upstream format: %w", err) | <mask>
<mask> // separate upstream from domains list
<mask> input, defaultUpstream, err := separateUpstream(input)
<mask> if err != nil {
<mask> return fmt.Errorf("wrong upstream format: %s", err)
<mask> }
<mask>
<mask> // No need to check this DNS server
<mask> if !defaultUpstream {
<mask> return nil
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return "", defaultUpstream, fmt.Errorf("wrong DNS upstream per domain specification: %s", upstream)
</s> add return "", defaultUpstream, fmt.Errorf("wrong dns upstream per domain specification: %s", upstream) </s> remove return fmt.Errorf("failed to choose upstream for %s: %s", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %s: %w", input, err) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err)
</s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return fmt.Errorf("invalid upstream servers: %s", err)
</s> add return fmt.Errorf("invalid upstream servers: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return fmt.Errorf("wrong upstream format: %w", err) | <mask> return nil
<mask> }
<mask>
<mask> if _, err := validateUpstream(input); err != nil {
<mask> return fmt.Errorf("wrong upstream format: %s", err)
<mask> }
<mask>
<mask> if len(bootstrap) == 0 {
<mask> bootstrap = defaultBootstrap
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("Checking if DNS %s works...", input)
</s> add log.Debug("checking if dns %s works...", input) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("invalid upstream servers: %s", err)
</s> add return fmt.Errorf("invalid upstream servers: %w", err) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err)
</s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return fmt.Errorf("DNS: proxy.ParseUpstreamsConfig: %s", err)
</s> add return fmt.Errorf("dns: proxy.ParseUpstreamsConfig: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
log.Debug("checking if dns %s works...", input) | <mask> if len(bootstrap) == 0 {
<mask> bootstrap = defaultBootstrap
<mask> }
<mask>
<mask> log.Debug("Checking if DNS %s works...", input)
<mask> u, err := upstream.AddressToUpstream(input, upstream.Options{Bootstrap: bootstrap, Timeout: DefaultTimeout})
<mask> if err != nil {
<mask> return fmt.Errorf("failed to choose upstream for %s: %s", input, err)
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("failed to choose upstream for %s: %s", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %s: %w", input, err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("DNS server %s returned wrong answer", input)
</s> add return fmt.Errorf("dns server %s returned wrong answer", input) </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
</s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return fmt.Errorf("failed to choose upstream for %s: %w", input, err) | <mask>
<mask> log.Debug("Checking if DNS %s works...", input)
<mask> u, err := upstream.AddressToUpstream(input, upstream.Options{Bootstrap: bootstrap, Timeout: DefaultTimeout})
<mask> if err != nil {
<mask> return fmt.Errorf("failed to choose upstream for %s: %s", input, err)
<mask> }
<mask>
<mask> req := dns.Msg{}
<mask> req.Id = dns.Id()
<mask> req.RecursionDesired = true
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("Checking if DNS %s works...", input)
</s> add log.Debug("checking if dns %s works...", input) </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
</s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) </s> remove return fmt.Errorf("DNS server %s returned wrong answer", input)
</s> add return fmt.Errorf("dns server %s returned wrong answer", input) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) | <mask> {Name: "google-public-dns-a.google.com.", Qtype: dns.TypeA, Qclass: dns.ClassINET},
<mask> }
<mask> reply, err := u.Exchange(&req)
<mask> if err != nil {
<mask> return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
<mask> }
<mask> if len(reply.Answer) != 1 {
<mask> return fmt.Errorf("DNS server %s returned wrong answer", input)
<mask> }
<mask> if t, ok := reply.Answer[0].(*dns.A); ok {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DNS server %s returned wrong answer", input)
</s> add return fmt.Errorf("dns server %s returned wrong answer", input) </s> remove return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A)
</s> add return fmt.Errorf("dns server %s returned wrong answer: %v", input, t.A) </s> remove log.Debug("DNS %s works OK", input)
</s> add log.Debug("dns %s works OK", input) </s> remove log.Debug("Checking if DNS %s works...", input)
</s> add log.Debug("checking if dns %s works...", input) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return fmt.Errorf("dns server %s returned wrong answer", input) | <mask> if err != nil {
<mask> return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
<mask> }
<mask> if len(reply.Answer) != 1 {
<mask> return fmt.Errorf("DNS server %s returned wrong answer", input)
<mask> }
<mask> if t, ok := reply.Answer[0].(*dns.A); ok {
<mask> if !net.IPv4(8, 8, 8, 8).Equal(t.A) {
<mask> return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A)
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A)
</s> add return fmt.Errorf("dns server %s returned wrong answer: %v", input, t.A) </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
</s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) </s> remove log.Debug("DNS %s works OK", input)
</s> add log.Debug("dns %s works OK", input) </s> remove log.Debug("Checking if DNS %s works...", input)
</s> add log.Debug("checking if dns %s works...", input) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
return fmt.Errorf("dns server %s returned wrong answer: %v", input, t.A) | <mask> return fmt.Errorf("DNS server %s returned wrong answer", input)
<mask> }
<mask> if t, ok := reply.Answer[0].(*dns.A); ok {
<mask> if !net.IPv4(8, 8, 8, 8).Equal(t.A) {
<mask> return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A)
<mask> }
<mask> }
<mask>
<mask> log.Debug("DNS %s works OK", input)
<mask> return nil
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DNS server %s returned wrong answer", input)
</s> add return fmt.Errorf("dns server %s returned wrong answer", input) </s> remove log.Debug("DNS %s works OK", input)
</s> add log.Debug("dns %s works OK", input) </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
</s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) </s> remove log.Debug("Checking if DNS %s works...", input)
</s> add log.Debug("checking if dns %s works...", input) </s> remove return fmt.Errorf("failed to choose upstream for %s: %s", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %s: %w", input, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
log.Debug("dns %s works OK", input) | <mask> return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A)
<mask> }
<mask> }
<mask>
<mask> log.Debug("DNS %s works OK", input)
<mask> return nil
<mask> }
<mask>
<mask> // Control flow:
<mask> // web
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A)
</s> add return fmt.Errorf("dns server %s returned wrong answer: %v", input, t.A) </s> remove return fmt.Errorf("DNS server %s returned wrong answer", input)
</s> add return fmt.Errorf("dns server %s returned wrong answer", input) </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
</s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) </s> remove log.Debug("Checking if DNS %s works...", input)
</s> add log.Debug("checking if dns %s works...", input) </s> remove log.Error("DHCPv4: conn.Write to %s failed: %s", peer, err)
</s> add log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
httpError(r, w, http.StatusInternalServerError, "dns server is not running") | <mask> return
<mask> }
<mask>
<mask> if !s.IsRunning() {
<mask> httpError(r, w, http.StatusInternalServerError, "DNS server is not running")
<mask> return
<mask> }
<mask>
<mask> s.ServeHTTP(w, r)
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return fmt.Errorf("%s is not a valid port: %s", port, err)
</s> add return fmt.Errorf("%s is not a valid port: %w", port, err) </s> remove return false, wrapErrPrint(err, "Resolved UDP address is not %s", src)
</s> add return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err) </s> remove return fmt.Errorf("DNS server %s returned wrong answer", input)
</s> add return fmt.Errorf("dns server %s returned wrong answer", input) </s> remove
return fmt.Errorf("Lease not found")
</s> add return fmt.Errorf("lease not found") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/dnsforward_http.go |
"fmt" | <mask> package dnsforward
<mask>
<mask> import (
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove "github.com/joomcode/errorx"
</s> add </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/agherr" </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/filter.go |
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> func (s *Server) beforeRequestHandler(_ *proxy.Proxy, d *proxy.DNSContext) (bool, error) {
<mask> ip := ipFromAddr(d.Addr)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove "github.com/joomcode/errorx"
</s> add </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/filter.go |
|
return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) | <mask> host := strings.TrimSuffix(req.Question[0].Name, ".")
<mask> res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts)
<mask> if err != nil {
<mask> // Return immediately if there's an error
<mask> return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
<mask>
<mask> } else if res.IsFiltered {
<mask> log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask>
<mask> } else if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 && len(res.IPList) == 0 {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
</s> add log.Tracef("Host %s is filtered, reason - %q, matched rule: %q", host, res.Reason, res.Rule) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/filter.go |
log.Tracef("Host %s is filtered, reason - %q, matched rule: %q", host, res.Reason, res.Rule) | <mask> // Return immediately if there's an error
<mask> return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
<mask>
<mask> } else if res.IsFiltered {
<mask> log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask>
<mask> } else if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 && len(res.IPList) == 0 {
<mask> ctx.origQuestion = d.Req.Question[0]
<mask> // resolve canonical name, not the original host name
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
</s> add return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
</s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/filter.go |
log.Debug("IPSET: invalid value %q", it) | <mask> for _, it := range ipsetConfig {
<mask> it = strings.TrimSpace(it)
<mask> hostsAndNames := strings.Split(it, "/")
<mask> if len(hostsAndNames) != 2 {
<mask> log.Debug("IPSET: invalid value '%s'", it)
<mask> continue
<mask> }
<mask>
<mask> ipsetNames := strings.Split(hostsAndNames[1], ",")
<mask> if len(ipsetNames) == 0 {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("skipping unknown blocked-service '%s'", s)
</s> add log.Debug("skipping unknown blocked-service %q", s) </s> remove log.Debug("Clients: skipping unknown blocked-service '%s'", s)
</s> add log.Debug("Clients: skipping unknown blocked-service %q", s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.