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
|
|---|---|---|---|---|
"github.com/hmage/golibs/log" | <mask> "time"
<mask>
<mask> "github.com/gobuffalo/packr"
<mask> "golang.org/x/crypto/ssh/terminal"
<mask> )
<mask>
<mask> // VersionString will be set through ldflags, contains current version
<mask> var VersionString = "undefined"
<mask>
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | app.go |
"github.com/hmage/golibs/log" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const (
<mask> dataDir = "data" // data storage
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | config.go |
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
<mask> "gopkg.in/asaskevich/govalidator.v4"
<mask> )
<mask>
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | control.go |
|
"github.com/hmage/golibs/log" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
<mask> "gopkg.in/asaskevich/govalidator.v4"
<mask> )
<mask>
<mask> const updatePeriod = time.Minute * 30
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | control.go |
"github.com/hmage/golibs/log" | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dhcpServer = dhcpd.Server{}
<mask>
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dhcp.go |
"github.com/hmage/golibs/log" | <mask> "net"
<mask> "os"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> func CheckIfOtherDHCPServersPresent(ifaceName string) (bool, error) {
<mask> iface, err := net.InterfaceByName(ifaceName)
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dhcpd/check_other_dhcp.go |
"github.com/hmage/golibs/log" | <mask> "fmt"
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> const defaultDiscoverTime = time.Second * 3
<mask>
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dhcpd/dhcpd.go |
"github.com/hmage/golibs/log" | <mask> "fmt"
<mask> "net"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> func isTimeout(err error) bool {
<mask> operr, ok := err.(*net.OpError)
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dhcpd/helpers.go |
"github.com/hmage/golibs/log" | <mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> func main() {
<mask> if len(os.Args) < 2 {
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dhcpd/standalone/main.go |
<mask> "net"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dnsServer = dnsforward.Server{}
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dns.go |
|
"github.com/hmage/golibs/log" | <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dnsServer = dnsforward.Server{}
<mask>
<mask> func isRunning() bool {
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dns.go |
<mask> "sync"
<mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/bluele/gcache"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsfilter/dnsfilter.go |
|
"github.com/hmage/golibs/log" | <mask>
<mask> "github.com/bluele/gcache"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
<mask> const defaultCacheTime = 30 * time.Minute
<mask>
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsfilter/dnsfilter.go |
"github.com/hmage/golibs/log" | <mask> "fmt"
<mask> "os"
<mask> "runtime"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/shirou/gopsutil/process"
<mask> "go.uber.org/goleak"
<mask> )
<mask>
<mask> // first in file because it must be run first
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsfilter/dnsfilter_test.go |
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsforward/dnsforward.go |
|
"github.com/hmage/golibs/log" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // DefaultTimeout is the default upstream timeout
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsforward/dnsforward.go |
"github.com/hmage/golibs/log" | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
<mask> logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsforward/querylog.go |
<mask> "os"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/go-test/deep"
<mask> )
<mask>
<mask> var (
<mask> fileWriteLock sync.Mutex
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsforward/querylog_file.go |
|
"github.com/hmage/golibs/log" | <mask> "time"
<mask>
<mask> "github.com/go-test/deep"
<mask> )
<mask>
<mask> var (
<mask> fileWriteLock sync.Mutex
<mask> )
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsforward/querylog_file.go |
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "github.com/bluele/gcache"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> type hourTop struct {
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsforward/querylog_top.go |
|
"github.com/hmage/golibs/log" | <mask>
<mask> "github.com/bluele/gcache"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> type hourTop struct {
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsforward/querylog_top.go |
"github.com/hmage/golibs/log" | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> )
<mask>
<mask> var (
<mask> requests = newDNSCounter("requests_total")
<mask> filtered = newDNSCounter("filtered_total")
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | dnsforward/stats.go |
"github.com/hmage/golibs/log" | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | filter.go |
github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 | <mask> github.com/davecgh/go-spew v1.1.1
<mask> github.com/go-ole/go-ole v1.2.1 // indirect
<mask> github.com/go-test/deep v1.0.1
<mask> github.com/gobuffalo/packr v1.19.0
<mask> github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86
<mask> github.com/joomcode/errorx v0.1.0
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
<mask> github.com/miekg/dns v1.1.1
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible
<mask> github.com/pkg/errors v0.8.0
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | go.mod |
github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 h1:FMAReGTEDNr4AdbScv/PqzjMQUpkkVHiF/t8sDHQQVQ=
github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM= | <mask> github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI=
<mask> github.com/gobuffalo/packr v1.19.0 h1:3UDmBDxesCOPF8iZdMDBBWKfkBoYujIMIZePnobqIUI=
<mask> github.com/gobuffalo/packr v1.19.0/go.mod h1:MstrNkfCQhd5o+Ct4IJ0skWlxN8emOq8DsoT1G98VIU=
<mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
<mask> github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
<mask> github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
<mask> github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
<mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
<mask> github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff h1:6NvhExg4omUC9NfA+l4Oq3ibNNeJUdiAF3iBVB0PlDk=
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | go.sum |
"github.com/hmage/golibs/log" | <mask> "io/ioutil"
<mask> "net/http"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> )
<mask>
<mask> // --------------------
<mask> // internationalization
<mask> // --------------------
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | i18n.go |
"github.com/hmage/golibs/log" | <mask> "io/ioutil"
<mask> "os"
<mask> "path/filepath"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/log"
<mask> "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const currentSchemaVersion = 2 // used for upgrading from old configs to new config
<mask>
</s> move log wrapper library outside into hmage/golibs/log </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add "github.com/hmage/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985 | upgrade.go |
<mask> }
<mask>
<mask> continue
<mask> }
<mask> if ok {
<mask> return true, nil
<mask> }
<mask> if err != nil {
<mask> return false, err
<mask> }
<mask> }
<mask> }
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove if ok {
return true, nil
}
</s> add </s> remove func ifaceIPv6Addrs(iface *net.Interface) (ips []net.IP, err error) {
</s> add func ifaceIPv6Addrs(iface netIface) (ips []net.IP, err error) { </s> remove func (s *winServer) ResetLeases(leases []*Lease) {
}
func (s *winServer) GetLeases(flags int) []Lease {
return nil
}
func (s *winServer) GetLeasesRef() []*Lease {
return nil
}
func (s *winServer) AddStaticLease(lease Lease) error {
return nil
}
func (s *winServer) RemoveStaticLease(l Lease) error {
return nil
}
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr {
return nil
}
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {
}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {
}
func (s *winServer) Start() error {
return nil
}
func (s *winServer) Stop() {
}
func (s *winServer) Reset() {
}
func v4Create(conf V4ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
func v6Create(conf V6ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
</s> add func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) GetLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/check_other_dhcp.go |
|
return ok, nil | <mask> }
<mask> if err != nil {
<mask> return false, err
<mask> }
<mask> }
<mask> }
<mask>
<mask> // TODO(a.garipov): Refactor further. Inspect error handling, remove parameter
<mask> // next, address the TODO, merge with tryConn6, etc.
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove if ok {
return true, nil
}
</s> add </s> remove if ok {
return true, nil
}
</s> add </s> remove func ifaceIPv6Addrs(iface *net.Interface) (ips []net.IP, err error) {
</s> add func ifaceIPv6Addrs(iface netIface) (ips []net.IP, err error) { </s> remove func (s *winServer) ResetLeases(leases []*Lease) {
}
func (s *winServer) GetLeases(flags int) []Lease {
return nil
}
func (s *winServer) GetLeasesRef() []*Lease {
return nil
}
func (s *winServer) AddStaticLease(lease Lease) error {
return nil
}
func (s *winServer) RemoveStaticLease(l Lease) error {
return nil
}
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr {
return nil
}
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {
}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {
}
func (s *winServer) Start() error {
return nil
}
func (s *winServer) Stop() {
}
func (s *winServer) Reset() {
}
func v4Create(conf V4ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
func v6Create(conf V6ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
</s> add func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) GetLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/check_other_dhcp.go |
<mask> }
<mask>
<mask> continue
<mask> }
<mask> if ok {
<mask> return true, nil
<mask> }
<mask> if err != nil {
<mask> return false, err
<mask> }
<mask> }
<mask> }
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/check_other_dhcp.go |
|
func ComparePacket(got, want *dhcpv4.DHCPv4) error { | <mask>
<mask> return mc, serverConn
<mask> }
<mask>
<mask> func ComparePacket(got *dhcpv4.DHCPv4, want *dhcpv4.DHCPv4) error {
<mask> if got == nil && got == want {
<mask> return nil
<mask> }
<mask> if (want == nil || got == nil) && (got != want) {
<mask> return fmt.Errorf("packet got %v, want %v", got, want)
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove func pktsExpected(got []*dhcpv4.DHCPv4, want []*dhcpv4.DHCPv4) error {
</s> add func pktsExpected(got, want []*dhcpv4.DHCPv4) error { </s> remove func udpMatch(addr *net.UDPAddr, bound *net.UDPAddr) bool {
</s> add func udpMatch(addr, bound *net.UDPAddr) bool { </s> remove if ip := ipnet.IP.To16(); ip != nil {
ips = append(ips, ip)
</s> add if ip := ipnet.IP.To4(); ip == nil {
// Assume that net.(*Interface).Addrs can only return
// valid IPv4 and IPv6 addresses. Since this isn't an
// IPv4 address, it must be an IPv6 one.
ips = append(ips, ipnet.IP) </s> remove func (s *winServer) ResetLeases(leases []*Lease) {
}
func (s *winServer) GetLeases(flags int) []Lease {
return nil
}
func (s *winServer) GetLeasesRef() []*Lease {
return nil
}
func (s *winServer) AddStaticLease(lease Lease) error {
return nil
}
func (s *winServer) RemoveStaticLease(l Lease) error {
return nil
}
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr {
return nil
}
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {
}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {
}
func (s *winServer) Start() error {
return nil
}
func (s *winServer) Stop() {
}
func (s *winServer) Reset() {
}
func v4Create(conf V4ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
func v6Create(conf V6ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
</s> add func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) GetLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove if ok {
return true, nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/client_test.go |
func pktsExpected(got, want []*dhcpv4.DHCPv4) error { | <mask> }
<mask> return nil
<mask> }
<mask>
<mask> func pktsExpected(got []*dhcpv4.DHCPv4, want []*dhcpv4.DHCPv4) error {
<mask> if len(got) != len(want) {
<mask> return fmt.Errorf("got %d packets, want %d packets", len(got), len(want))
<mask> }
<mask>
<mask> for i := range got {
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove func ComparePacket(got *dhcpv4.DHCPv4, want *dhcpv4.DHCPv4) error {
</s> add func ComparePacket(got, want *dhcpv4.DHCPv4) error { </s> remove func (s *winServer) ResetLeases(leases []*Lease) {
}
func (s *winServer) GetLeases(flags int) []Lease {
return nil
}
func (s *winServer) GetLeasesRef() []*Lease {
return nil
}
func (s *winServer) AddStaticLease(lease Lease) error {
return nil
}
func (s *winServer) RemoveStaticLease(l Lease) error {
return nil
}
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr {
return nil
}
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {
}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {
}
func (s *winServer) Start() error {
return nil
}
func (s *winServer) Stop() {
}
func (s *winServer) Reset() {
}
func v4Create(conf V4ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
func v6Create(conf V6ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
</s> add func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) GetLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove if ok {
return true, nil
}
</s> add </s> remove if ok {
return true, nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/client_test.go |
{ // Response for first packet. | <mask> newPacket(dhcpv4.OpcodeBootRequest, [4]byte{0x33, 0x33, 0x33, 0x33}),
<mask> newPacket(dhcpv4.OpcodeBootRequest, [4]byte{0x44, 0x44, 0x44, 0x44}),
<mask> },
<mask> server: [][]*dhcpv4.DHCPv4{
<mask> []*dhcpv4.DHCPv4{ // Response for first packet.
<mask> newPacket(dhcpv4.OpcodeBootReply, [4]byte{0x33, 0x33, 0x33, 0x33}),
<mask> },
<mask> []*dhcpv4.DHCPv4{ // Response for second packet.
<mask> newPacket(dhcpv4.OpcodeBootReply, [4]byte{0x44, 0x44, 0x44, 0x44}),
<mask> },
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove []*dhcpv4.DHCPv4{ // Response for second packet.
</s> add { // Response for second packet. </s> remove func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr net.IP, dstAddr net.IP) uint16 {
</s> add func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr, dstAddr net.IP) uint16 { </s> remove func pktsExpected(got []*dhcpv4.DHCPv4, want []*dhcpv4.DHCPv4) error {
</s> add func pktsExpected(got, want []*dhcpv4.DHCPv4) error { </s> remove var (
// BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255})
)
</s> add // BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
var BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255}) </s> remove var (
// ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
ErrUDPAddrIsRequired = errors.New("must supply UDPAddr")
)
</s> add // ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
var ErrUDPAddrIsRequired = errors.New("must supply UDPAddr") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/client_test.go |
{ // Response for second packet. | <mask> server: [][]*dhcpv4.DHCPv4{
<mask> []*dhcpv4.DHCPv4{ // Response for first packet.
<mask> newPacket(dhcpv4.OpcodeBootReply, [4]byte{0x33, 0x33, 0x33, 0x33}),
<mask> },
<mask> []*dhcpv4.DHCPv4{ // Response for second packet.
<mask> newPacket(dhcpv4.OpcodeBootReply, [4]byte{0x44, 0x44, 0x44, 0x44}),
<mask> },
<mask> },
<mask> wantErr: []error{
<mask> nil,
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove []*dhcpv4.DHCPv4{ // Response for first packet.
</s> add { // Response for first packet. </s> remove func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr net.IP, dstAddr net.IP) uint16 {
</s> add func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr, dstAddr net.IP) uint16 { </s> remove func ifaceIPv6Addrs(iface *net.Interface) (ips []net.IP, err error) {
</s> add func ifaceIPv6Addrs(iface netIface) (ips []net.IP, err error) { </s> remove func pktsExpected(got []*dhcpv4.DHCPv4, want []*dhcpv4.DHCPv4) error {
</s> add func pktsExpected(got, want []*dhcpv4.DHCPv4) error { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/client_test.go |
// BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
var BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255}) | <mask> "github.com/mdlayher/raw"
<mask> "github.com/u-root/u-root/pkg/uio"
<mask> )
<mask>
<mask> var (
<mask> // BroadcastMac is the broadcast MAC address.
<mask> //
<mask> // Any UDP packet sent to this address is broadcast on the subnet.
<mask> BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255})
<mask> )
<mask>
<mask> var (
<mask> // ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
<mask> ErrUDPAddrIsRequired = errors.New("must supply UDPAddr")
<mask> )
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove var (
// ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
ErrUDPAddrIsRequired = errors.New("must supply UDPAddr")
)
</s> add // ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
var ErrUDPAddrIsRequired = errors.New("must supply UDPAddr") </s> remove func (b UDP) CalculateChecksum(partialChecksum uint16, totalLen uint16) uint16 {
</s> add func (b UDP) CalculateChecksum(partialChecksum, totalLen uint16) uint16 { </s> remove if ip := ipnet.IP.To16(); ip != nil {
ips = append(ips, ip)
</s> add if ip := ipnet.IP.To4(); ip == nil {
// Assume that net.(*Interface).Addrs can only return
// valid IPv4 and IPv6 addresses. Since this isn't an
// IPv4 address, it must be an IPv6 one.
ips = append(ips, ipnet.IP) </s> remove func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr net.IP, dstAddr net.IP) uint16 {
</s> add func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr, dstAddr net.IP) uint16 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/conn_unix.go |
// ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
var ErrUDPAddrIsRequired = errors.New("must supply UDPAddr") | <mask> // Any UDP packet sent to this address is broadcast on the subnet.
<mask> BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255})
<mask> )
<mask>
<mask> var (
<mask> // ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
<mask> ErrUDPAddrIsRequired = errors.New("must supply UDPAddr")
<mask> )
<mask>
<mask> // NewRawUDPConn returns a UDP connection bound to the interface and port
<mask> // given based on a raw packet socket. All packets are broadcasted.
<mask> //
<mask> // The interface can be completely unconfigured.
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove var (
// BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255})
)
</s> add // BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
var BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255}) </s> remove func (b UDP) CalculateChecksum(partialChecksum uint16, totalLen uint16) uint16 {
</s> add func (b UDP) CalculateChecksum(partialChecksum, totalLen uint16) uint16 { </s> remove if ip := ipnet.IP.To16(); ip != nil {
ips = append(ips, ip)
</s> add if ip := ipnet.IP.To4(); ip == nil {
// Assume that net.(*Interface).Addrs can only return
// valid IPv4 and IPv6 addresses. Since this isn't an
// IPv4 address, it must be an IPv6 one.
ips = append(ips, ipnet.IP) </s> remove func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr net.IP, dstAddr net.IP) uint16 {
</s> add func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr, dstAddr net.IP) uint16 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/conn_unix.go |
func udpMatch(addr, bound *net.UDPAddr) bool { | <mask> boundAddr: boundAddr,
<mask> }
<mask> }
<mask>
<mask> func udpMatch(addr *net.UDPAddr, bound *net.UDPAddr) bool {
<mask> if bound == nil {
<mask> return true
<mask> }
<mask> if bound.IP != nil && !bound.IP.Equal(addr.IP) {
<mask> return false
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove func ComparePacket(got *dhcpv4.DHCPv4, want *dhcpv4.DHCPv4) error {
</s> add func ComparePacket(got, want *dhcpv4.DHCPv4) error { </s> remove func udp4pkt(packet []byte, dest *net.UDPAddr, src *net.UDPAddr) []byte {
</s> add func udp4pkt(packet []byte, dest, src *net.UDPAddr) []byte { </s> remove func (s *winServer) ResetLeases(leases []*Lease) {
}
func (s *winServer) GetLeases(flags int) []Lease {
return nil
}
func (s *winServer) GetLeasesRef() []*Lease {
return nil
}
func (s *winServer) AddStaticLease(lease Lease) error {
return nil
}
func (s *winServer) RemoveStaticLease(l Lease) error {
return nil
}
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr {
return nil
}
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {
}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {
}
func (s *winServer) Start() error {
return nil
}
func (s *winServer) Stop() {
}
func (s *winServer) Reset() {
}
func v4Create(conf V4ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
func v6Create(conf V6ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
</s> add func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) GetLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove if ok {
return true, nil
}
</s> add </s> remove if ok {
return true, nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/conn_unix.go |
func (b UDP) CalculateChecksum(partialChecksum, totalLen uint16) uint16 { | <mask>
<mask> // CalculateChecksum calculates the checksum of the udp packet, given the total
<mask> // length of the packet and the checksum of the network-layer pseudo-header
<mask> // (excluding the total length) and the checksum of the payload.
<mask> func (b UDP) CalculateChecksum(partialChecksum uint16, totalLen uint16) uint16 {
<mask> // Add the length portion of the checksum to the pseudo-checksum.
<mask> tmp := make([]byte, 2)
<mask> binary.BigEndian.PutUint16(tmp, totalLen)
<mask> checksum := Checksum(tmp, partialChecksum)
<mask>
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr net.IP, dstAddr net.IP) uint16 {
</s> add func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr, dstAddr net.IP) uint16 { </s> remove var (
// ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
ErrUDPAddrIsRequired = errors.New("must supply UDPAddr")
)
</s> add // ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
var ErrUDPAddrIsRequired = errors.New("must supply UDPAddr") </s> remove var (
// BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255})
)
</s> add // BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
var BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255}) </s> remove func ifaceIPv6Addrs(iface *net.Interface) (ips []net.IP, err error) {
</s> add func ifaceIPv6Addrs(iface netIface) (ips []net.IP, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/ipv4.go |
func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr, dstAddr net.IP) uint16 { | <mask> // PseudoHeaderChecksum calculates the pseudo-header checksum for the
<mask> // given destination protocol and network address, ignoring the length
<mask> // field. Pseudo-headers are needed by transport layers when calculating
<mask> // their own checksum.
<mask> func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr net.IP, dstAddr net.IP) uint16 {
<mask> xsum := Checksum([]byte(srcAddr), 0)
<mask> xsum = Checksum([]byte(dstAddr), xsum)
<mask> return Checksum([]byte{0, uint8(protocol)}, xsum)
<mask> }
<mask>
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove func (b UDP) CalculateChecksum(partialChecksum uint16, totalLen uint16) uint16 {
</s> add func (b UDP) CalculateChecksum(partialChecksum, totalLen uint16) uint16 { </s> remove func udp4pkt(packet []byte, dest *net.UDPAddr, src *net.UDPAddr) []byte {
</s> add func udp4pkt(packet []byte, dest, src *net.UDPAddr) []byte { </s> remove var (
// ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
ErrUDPAddrIsRequired = errors.New("must supply UDPAddr")
)
</s> add // ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
var ErrUDPAddrIsRequired = errors.New("must supply UDPAddr") </s> remove if ip := ipnet.IP.To16(); ip != nil {
ips = append(ips, ip)
</s> add if ip := ipnet.IP.To4(); ip == nil {
// Assume that net.(*Interface).Addrs can only return
// valid IPv4 and IPv6 addresses. Since this isn't an
// IPv4 address, it must be an IPv6 one.
ips = append(ips, ipnet.IP) </s> remove var (
// BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255})
)
</s> add // BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
var BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/ipv4.go |
func udp4pkt(packet []byte, dest, src *net.UDPAddr) []byte { | <mask> xsum = Checksum([]byte(dstAddr), xsum)
<mask> return Checksum([]byte{0, uint8(protocol)}, xsum)
<mask> }
<mask>
<mask> func udp4pkt(packet []byte, dest *net.UDPAddr, src *net.UDPAddr) []byte {
<mask> ipLen := IPv4MinimumSize
<mask> udpLen := UDPMinimumSize
<mask>
<mask> h := make([]byte, 0, ipLen+udpLen+len(packet))
<mask> hdr := uio.NewBigEndianBuffer(h)
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr net.IP, dstAddr net.IP) uint16 {
</s> add func PseudoHeaderChecksum(protocol TransportProtocolNumber, srcAddr, dstAddr net.IP) uint16 { </s> remove func udpMatch(addr *net.UDPAddr, bound *net.UDPAddr) bool {
</s> add func udpMatch(addr, bound *net.UDPAddr) bool { </s> remove if ip := ipnet.IP.To16(); ip != nil {
ips = append(ips, ip)
</s> add if ip := ipnet.IP.To4(); ip == nil {
// Assume that net.(*Interface).Addrs can only return
// valid IPv4 and IPv6 addresses. Since this isn't an
// IPv4 address, it must be an IPv6 one.
ips = append(ips, ipnet.IP) </s> remove func pktsExpected(got []*dhcpv4.DHCPv4, want []*dhcpv4.DHCPv4) error {
</s> add func pktsExpected(got, want []*dhcpv4.DHCPv4) error { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/nclient4/ipv4.go |
func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) GetLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } | <mask>
<mask> type winServer struct {
<mask> }
<mask>
<mask> func (s *winServer) ResetLeases(leases []*Lease) {
<mask> }
<mask> func (s *winServer) GetLeases(flags int) []Lease {
<mask> return nil
<mask> }
<mask> func (s *winServer) GetLeasesRef() []*Lease {
<mask> return nil
<mask> }
<mask> func (s *winServer) AddStaticLease(lease Lease) error {
<mask> return nil
<mask> }
<mask> func (s *winServer) RemoveStaticLease(l Lease) error {
<mask> return nil
<mask> }
<mask> func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr {
<mask> return nil
<mask> }
<mask>
<mask> func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {
<mask> }
<mask> func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {
<mask> }
<mask>
<mask> func (s *winServer) Start() error {
<mask> return nil
<mask> }
<mask> func (s *winServer) Stop() {
<mask> }
<mask> func (s *winServer) Reset() {
<mask> }
<mask>
<mask> func v4Create(conf V4ServerConf) (DHCPServer, error) {
<mask> return &winServer{}, nil
<mask> }
<mask>
<mask> func v6Create(conf V6ServerConf) (DHCPServer, error) {
<mask> return &winServer{}, nil
<mask> }
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove if ok {
return true, nil
}
</s> add </s> remove if ok {
return true, nil
}
</s> add </s> remove func pktsExpected(got []*dhcpv4.DHCPv4, want []*dhcpv4.DHCPv4) error {
</s> add func pktsExpected(got, want []*dhcpv4.DHCPv4) error { </s> remove func udpMatch(addr *net.UDPAddr, bound *net.UDPAddr) bool {
</s> add func udpMatch(addr, bound *net.UDPAddr) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/v46_windows.go |
type netIface interface {
Addrs() ([]net.Addr, error)
}
| <mask> return
<mask> }
<mask> }
<mask>
<mask> // ifaceIPv6Addrs returns the interface's IPv6 addresses.
<mask> func ifaceIPv6Addrs(iface netIface) (ips []net.IP, err error) {
<mask> addrs, err := iface.Addrs()
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove func ifaceIPv6Addrs(iface *net.Interface) (ips []net.IP, err error) {
</s> add func ifaceIPv6Addrs(iface netIface) (ips []net.IP, err error) { </s> remove if ok {
return true, nil
}
</s> add </s> remove if ok {
return true, nil
}
</s> add </s> remove if ip := ipnet.IP.To16(); ip != nil {
ips = append(ips, ip)
</s> add if ip := ipnet.IP.To4(); ip == nil {
// Assume that net.(*Interface).Addrs can only return
// valid IPv4 and IPv6 addresses. Since this isn't an
// IPv4 address, it must be an IPv6 one.
ips = append(ips, ipnet.IP) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/v6.go |
func ifaceIPv6Addrs(iface netIface) (ips []net.IP, err error) { | <mask> }
<mask> }
<mask>
<mask> // ifaceIPv6Addrs returns the interface's IPv6 addresses.
<mask> func ifaceIPv6Addrs(iface *net.Interface) (ips []net.IP, err error) {
<mask> addrs, err := iface.Addrs()
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove if ok {
return true, nil
}
</s> add </s> remove if ok {
return true, nil
}
</s> add </s> remove if ip := ipnet.IP.To16(); ip != nil {
ips = append(ips, ip)
</s> add if ip := ipnet.IP.To4(); ip == nil {
// Assume that net.(*Interface).Addrs can only return
// valid IPv4 and IPv6 addresses. Since this isn't an
// IPv4 address, it must be an IPv6 one.
ips = append(ips, ipnet.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/v6.go |
if ip := ipnet.IP.To4(); ip == nil {
// Assume that net.(*Interface).Addrs can only return
// valid IPv4 and IPv6 addresses. Since this isn't an
// IPv4 address, it must be an IPv6 one.
ips = append(ips, ipnet.IP) | <mask> if !ok {
<mask> continue
<mask> }
<mask>
<mask> if ip := ipnet.IP.To16(); ip != nil {
<mask> ips = append(ips, ip)
<mask> }
<mask> }
<mask>
<mask> return ips, nil
<mask> }
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove if ok {
return true, nil
}
</s> add </s> remove if ok {
return true, nil
}
</s> add </s> remove func (s *winServer) ResetLeases(leases []*Lease) {
}
func (s *winServer) GetLeases(flags int) []Lease {
return nil
}
func (s *winServer) GetLeasesRef() []*Lease {
return nil
}
func (s *winServer) AddStaticLease(lease Lease) error {
return nil
}
func (s *winServer) RemoveStaticLease(l Lease) error {
return nil
}
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr {
return nil
}
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {
}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {
}
func (s *winServer) Start() error {
return nil
}
func (s *winServer) Stop() {
}
func (s *winServer) Reset() {
}
func v4Create(conf V4ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
func v6Create(conf V6ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
</s> add func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) GetLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove func udpMatch(addr *net.UDPAddr, bound *net.UDPAddr) bool {
</s> add func udpMatch(addr, bound *net.UDPAddr) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/v6.go |
"github.com/AdguardTeam/AdGuardHome/internal/agherr" | <mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/insomniacslk/dhcp/dhcpv6"
<mask> "github.com/insomniacslk/dhcp/iana"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
</s> Pull request: dhcpd: fix interface ipv6 check
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335.
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <[email protected]>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check </s> remove var (
// BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255})
)
</s> add // BroadcastMac is the broadcast MAC address.
//
// Any UDP packet sent to this address is broadcast on the subnet.
var BroadcastMac = net.HardwareAddr([]byte{255, 255, 255, 255, 255, 255}) </s> remove var (
// ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
ErrUDPAddrIsRequired = errors.New("must supply UDPAddr")
)
</s> add // ErrUDPAddrIsRequired is an error used when a passed argument is not of type "*net.UDPAddr".
var ErrUDPAddrIsRequired = errors.New("must supply UDPAddr") </s> remove func (s *winServer) ResetLeases(leases []*Lease) {
}
func (s *winServer) GetLeases(flags int) []Lease {
return nil
}
func (s *winServer) GetLeasesRef() []*Lease {
return nil
}
func (s *winServer) AddStaticLease(lease Lease) error {
return nil
}
func (s *winServer) RemoveStaticLease(l Lease) error {
return nil
}
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr {
return nil
}
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {
}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {
}
func (s *winServer) Start() error {
return nil
}
func (s *winServer) Stop() {
}
func (s *winServer) Reset() {
}
func v4Create(conf V4ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
func v6Create(conf V6ServerConf) (DHCPServer, error) {
return &winServer{}, nil
}
</s> add func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) GetLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove func udp4pkt(packet []byte, dest *net.UDPAddr, src *net.UDPAddr) []byte {
</s> add func udp4pkt(packet []byte, dest, src *net.UDPAddr) []byte { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/36c7735b855f4388d0cf36fb2f26f1979809c217 | internal/dhcpd/v6_test.go |
if e.Domain != "." {
// Remove last ".", but save the domain as is for "." queries.
e.Domain = e.Domain[:len(e.Domain)-1]
} | <mask> ) {
<mask> pctx := ctx.proxyCtx
<mask> e := stats.Entry{}
<mask> e.Domain = strings.ToLower(pctx.Req.Question[0].Name)
<mask> e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
<mask>
<mask> if clientID := ctx.clientID; clientID != "" {
<mask> e.Client = clientID
<mask> } else {
<mask> e.Client = clientIP
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove func TestProcessQueryLogsAndStats(t *testing.T) {
</s> add func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
</s> remove Name: "example.com.",
</s> add Name: tc.domain, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats.go |
if e.Domain == "" {
return
}
| <mask> }
<mask>
<mask> // Update implements the [stats.Interface] interface for *testStats.
<mask> func (l *testStats) Update(e stats.Entry) {
<mask> l.lastEntry = e
<mask> }
<mask>
<mask> // ShouldCount implements the [stats.Interface] interface for *testStats.
<mask> func (l *testStats) ShouldCount(string, uint16, uint16, []string) bool {
<mask> return true
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove func TestProcessQueryLogsAndStats(t *testing.T) {
</s> add func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
</s> remove e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
</s> add if e.Domain != "." {
// Remove last ".", but save the domain as is for "." queries.
e.Domain = e.Domain[:len(e.Domain)-1]
} </s> remove Time: time.Now(),
QHost: strings.ToLower(q.Name[:len(q.Name)-1]),
</s> add Time: time.Now(),
QHost: qHost, </s> remove Name: "example.com.",
</s> add Name: tc.domain, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
| <mask> func (l *testStats) ShouldCount(string, uint16, uint16, []string) bool {
<mask> return true
<mask> }
<mask>
<mask> func TestProcessQueryLogsAndStats(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> proto proxy.Proto
<mask> addr net.Addr
<mask> clientID string
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
</s> add if e.Domain != "." {
// Remove last ".", but save the domain as is for "." queries.
e.Domain = e.Domain[:len(e.Domain)-1]
} </s> remove Name: "example.com.",
</s> add Name: tc.domain, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain string | <mask> testCases := []struct {
<mask> name string
<mask> proto proxy.Proto
<mask> addr net.Addr
<mask> clientID string
<mask> wantLogProto querylog.ClientProto
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove func TestProcessQueryLogsAndStats(t *testing.T) {
</s> add func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
</s> remove e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
</s> add if e.Domain != "." {
// Remove last ".", but save the domain as is for "." queries.
e.Domain = e.Domain[:len(e.Domain)-1]
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> reason filtering.Reason
<mask> wantStatResult stats.Result
<mask> }{{
<mask> name: "success_udp",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> reason: filtering.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_tls_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "cli42",
<mask> wantLogProto: querylog.ClientProtoDoT,
<mask> wantStatClient: "cli42",
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> reason: filtering.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_tls",
<mask> proto: proxy.ProtoTLS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDoT,
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> reason: filtering.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_quic",
<mask> proto: proxy.ProtoQUIC,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDoQ,
<mask> wantStatClient: "1.2.3.4",
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_https",
<mask> proto: proxy.ProtoHTTPS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDoH,
<mask> wantStatClient: "1.2.3.4",
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_dnscrypt",
<mask> proto: proxy.ProtoDNSCrypt,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDNSCrypt,
<mask> wantStatClient: "1.2.3.4",
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> reason: filtering.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_udp_filtered",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> wantStatResult: stats.RFiltered,
<mask> }, {
<mask> name: "success_udp_sb",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> }, {
<mask> name: "success_udp_ss",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
domain: domain, | <mask> wantStatResult: stats.RSafeSearch,
<mask> }, {
<mask> name: "success_udp_pc",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
<mask> clientID: "",
<mask> wantLogProto: "",
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
}, {
name: "success_udp_pc_empty_fqdn",
domain: ".",
proto: proxy.ProtoUDP,
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 5}, Port: 1234},
clientID: "",
wantLogProto: "",
wantStatClient: "1.2.3.5",
wantCode: resultCodeSuccess,
reason: filtering.FilteredParental,
wantStatResult: stats.RParental, | <mask> reason: filtering.FilteredParental,
<mask> wantStatResult: stats.RParental,
<mask> }}
<mask>
<mask> ups, err := upstream.AddressToUpstream("1.1.1.1", nil)
<mask> require.NoError(t, err)
<mask>
<mask> for _, tc := range testCases {
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
</s> add {num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
{num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)}, </s> remove e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
</s> add if e.Domain != "." {
// Remove last ".", but save the domain as is for "." queries.
e.Domain = e.Domain[:len(e.Domain)-1]
} </s> remove func TestProcessQueryLogsAndStats(t *testing.T) {
</s> add func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
Name: tc.domain, | <mask> }
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> req := &dns.Msg{
<mask> Question: []dns.Question{{
<mask> Name: "example.com.",
<mask> }},
<mask> }
<mask> pctx := &proxy.DNSContext{
<mask> Proto: tc.proto,
<mask> Req: req,
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
</s> add if e.Domain != "." {
// Remove last ".", but save the domain as is for "." queries.
e.Domain = e.Domain[:len(e.Domain)-1]
} </s> remove func TestProcessQueryLogsAndStats(t *testing.T) {
</s> add func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
</s> remove {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
</s> add {num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
{num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/dnsforward/stats_test.go |
qHost := q.Name
if qHost != "." {
qHost = strings.ToLower(q.Name[:len(q.Name)-1])
} | <mask> func newLogEntry(params *AddParams) (entry *logEntry) {
<mask> q := params.Question.Question[0]
<mask>
<mask> entry = &logEntry{
<mask> // TODO(d.kolyshev): Export this timestamp to func params.
<mask> Time: time.Now(),
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove Time: time.Now(),
QHost: strings.ToLower(q.Name[:len(q.Name)-1]),
</s> add Time: time.Now(),
QHost: qHost, </s> remove func TestProcessQueryLogsAndStats(t *testing.T) {
</s> add func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
</s> remove e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
</s> add if e.Domain != "." {
// Remove last ".", but save the domain as is for "." queries.
e.Domain = e.Domain[:len(e.Domain)-1]
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/querylog/qlog.go |
Time: time.Now(),
QHost: qHost, | <mask> q := params.Question.Question[0]
<mask>
<mask> entry = &logEntry{
<mask> // TODO(d.kolyshev): Export this timestamp to func params.
<mask> Time: time.Now(),
<mask>
<mask> QHost: strings.ToLower(q.Name[:len(q.Name)-1]),
<mask> QType: dns.Type(q.Qtype).String(),
<mask> QClass: dns.Class(q.Qclass).String(),
<mask>
<mask> ClientID: params.ClientID,
<mask> ClientProto: params.ClientProto,
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
</s> add if e.Domain != "." {
// Remove last ".", but save the domain as is for "." queries.
e.Domain = e.Domain[:len(e.Domain)-1]
} </s> remove func TestProcessQueryLogsAndStats(t *testing.T) {
</s> add func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/querylog/qlog.go |
addEntry(l, "", net.IPv4(1, 1, 1, 5), net.IPv4(2, 2, 2, 5)) | <mask> require.NoError(t, l.flushLogBuffer())
<mask> // Add memory entries.
<mask> addEntry(l, "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3))
<mask> addEntry(l, "example.com", net.IPv4(1, 1, 1, 4), net.IPv4(2, 2, 2, 4))
<mask>
<mask> type tcAssertion struct {
<mask> host string
<mask> answer net.IP
<mask> client net.IP
<mask> num int
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
</s> add {num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
{num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)}, </s> remove {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
</s> add {num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
{num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)}, </s> remove func TestProcessQueryLogsAndStats(t *testing.T) {
</s> add func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
const domain = "example.com."
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/querylog/qlog_test.go |
{num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
{num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)}, | <mask> }{{
<mask> name: "all",
<mask> sCr: []searchCriterion{},
<mask> want: []tcAssertion{
<mask> {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
<mask> {num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
<mask> {num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
<mask> {num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
<mask> },
<mask> }, {
<mask> name: "by_domain_strict",
<mask> sCr: []searchCriterion{{
<mask> criterionType: ctTerm,
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
</s> add {num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
{num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/querylog/qlog_test.go |
{num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
{num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)}, | <mask> strict: false,
<mask> value: "2.2.2",
<mask> }},
<mask> want: []tcAssertion{
<mask> {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
<mask> {num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
<mask> {num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
<mask> {num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
<mask> },
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
</s> Pull request: dnsforward: stat empty queries
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries </s> remove {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
</s> add {num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
{num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
{num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
{num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
{num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)}, </s> remove Name: "example.com.",
</s> add Name: tc.domain, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/371261b2c66a0b9b64c8c3e2262eb11b982b8572 | internal/querylog/qlog_test.go |
// Stop DNS server:
// we close urlfilter object which in turn closes file descriptors to filter files.
// Otherwise, Windows won't allow us to remove the file which is being currently used.
_ = dnsServer.Stop()
| <mask> }
<mask>
<mask> // go through each element and delete if url matches
<mask> config.Lock()
<mask> newFilters := config.Filters[:0]
<mask> for _, filter := range config.Filters {
</s> - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped
Otherwise, os.Remove() will return with an error "file is being used". </s> remove return fmt.Errorf("Refusing to stop forwarding DNS server: not running")
</s> add return nil </s> remove return fmt.Errorf("Refusing to reconfigure forwarding DNS server: not running")
</s> add return nil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/375e410aa310c24ec0e95ee48ebd40675d5df1e7 | home/control.go |
config.Unlock() | <mask> err := os.Remove(filter.Path())
<mask> if err != nil && !os.IsNotExist(err) {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't remove the filter file: %s", err)
<mask> return
<mask> }
<mask> log.Debug("os.Remove(%s)", filter.Path())
</s> - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped
Otherwise, os.Remove() will return with an error "file is being used". </s> remove return fmt.Errorf("Refusing to stop forwarding DNS server: not running")
</s> add return nil </s> remove return fmt.Errorf("Refusing to reconfigure forwarding DNS server: not running")
</s> add return nil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/375e410aa310c24ec0e95ee48ebd40675d5df1e7 | home/control.go |
log.Debug("os.Remove(%s)", filter.Path()) | <mask> config.Unlock()
<mask> httpError(w, http.StatusInternalServerError, "Couldn't remove the filter file: %s", err)
<mask> return
<mask> }
<mask> }
<mask> }
<mask> // Update the configuration after removing filter files
<mask> config.Filters = newFilters
<mask> config.Unlock()
</s> - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped
Otherwise, os.Remove() will return with an error "file is being used". </s> remove return fmt.Errorf("Refusing to stop forwarding DNS server: not running")
</s> add return nil </s> remove return fmt.Errorf("Refusing to reconfigure forwarding DNS server: not running")
</s> add return nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/375e410aa310c24ec0e95ee48ebd40675d5df1e7 | home/control.go |
return nil | <mask> }
<mask>
<mask> func reconfigureDNSServer() error {
<mask> if !isRunning() {
<mask> return fmt.Errorf("Refusing to reconfigure forwarding DNS server: not running")
<mask> }
<mask>
<mask> config, err := generateServerConfig()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped
Otherwise, os.Remove() will return with an error "file is being used". </s> remove return fmt.Errorf("Refusing to stop forwarding DNS server: not running")
</s> add return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/375e410aa310c24ec0e95ee48ebd40675d5df1e7 | home/dns.go |
return nil | <mask> }
<mask>
<mask> func stopDNSServer() error {
<mask> if !isRunning() {
<mask> return fmt.Errorf("Refusing to stop forwarding DNS server: not running")
<mask> }
<mask>
<mask> err := dnsServer.Stop()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
</s> - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped
Otherwise, os.Remove() will return with an error "file is being used". </s> remove return fmt.Errorf("Refusing to reconfigure forwarding DNS server: not running")
</s> add return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/375e410aa310c24ec0e95ee48ebd40675d5df1e7 | home/dns.go |
// Go on processing the AAAA request despite the fact that we don't
// support it yet. The expected behavior here is to respond with an
// empty asnwer and not NXDOMAIN.
if q.Qtype != dns.TypeA && q.Qtype != dns.TypeAAAA { | <mask> // TODO(a.garipov): Adapt to AAAA as well.
<mask> func (s *Server) processInternalHosts(dctx *dnsContext) (rc resultCode) {
<mask> req := dctx.proxyCtx.Req
<mask> q := req.Question[0]
<mask> if q.Qtype != dns.TypeA {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> reqHost := strings.ToLower(q.Name)
<mask> host := strings.TrimSuffix(reqHost, s.autohostSuffix)
</s> Pull request: dnsforward: fix nxdomain for internal aaaa reqs
Updates #2393.
Squashed commit of the following:
commit 5ea4d3c2f217ed800da79c3d87184d8e0956e56c
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:01:08 2021 +0300
dnsforward: fix nxdomain for internal aaaa reqs </s> remove if tc.wantIP == nil {
</s> add if tc.qtyp == dns.TypeAAAA {
// TODO(a.garipov): Remove this special handling
// when we fully support AAAA.
require.NotNil(t, pctx.Res)
ans := pctx.Res.Answer
require.Len(t, ans, 0)
} else if tc.wantIP == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3764c1dfe497a150d09272257065ea5b5a49ecf6 | internal/dnsforward/dns.go |
}, {
name: "success_internal_aaaa",
host: "example.lan",
suffix: defaultAutohostSuffix,
wantErrMsg: "",
wantIP: nil,
qtyp: dns.TypeAAAA,
wantRes: resultCodeSuccess, | <mask> wantIP: nil,
<mask> qtyp: dns.TypeA,
<mask> wantRes: resultCodeSuccess,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s := &Server{
</s> Pull request: dnsforward: fix nxdomain for internal aaaa reqs
Updates #2393.
Squashed commit of the following:
commit 5ea4d3c2f217ed800da79c3d87184d8e0956e56c
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:01:08 2021 +0300
dnsforward: fix nxdomain for internal aaaa reqs </s> remove if tc.wantIP == nil {
</s> add if tc.qtyp == dns.TypeAAAA {
// TODO(a.garipov): Remove this special handling
// when we fully support AAAA.
require.NotNil(t, pctx.Res)
ans := pctx.Res.Answer
require.Len(t, ans, 0)
} else if tc.wantIP == nil { </s> remove if q.Qtype != dns.TypeA {
</s> add // Go on processing the AAAA request despite the fact that we don't
// support it yet. The expected behavior here is to respond with an
// empty asnwer and not NXDOMAIN.
if q.Qtype != dns.TypeA && q.Qtype != dns.TypeAAAA { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3764c1dfe497a150d09272257065ea5b5a49ecf6 | internal/dnsforward/dns_test.go |
if tc.qtyp == dns.TypeAAAA {
// TODO(a.garipov): Remove this special handling
// when we fully support AAAA.
require.NotNil(t, pctx.Res)
ans := pctx.Res.Answer
require.Len(t, ans, 0)
} else if tc.wantIP == nil { | <mask> assert.Equal(t, tc.wantErrMsg, dctx.err.Error())
<mask> }
<mask>
<mask> pctx := dctx.proxyCtx
<mask> if tc.wantIP == nil {
<mask> assert.Nil(t, pctx.Res)
<mask> } else {
<mask> require.NotNil(t, pctx.Res)
<mask>
<mask> ans := pctx.Res.Answer
</s> Pull request: dnsforward: fix nxdomain for internal aaaa reqs
Updates #2393.
Squashed commit of the following:
commit 5ea4d3c2f217ed800da79c3d87184d8e0956e56c
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:01:08 2021 +0300
dnsforward: fix nxdomain for internal aaaa reqs </s> remove if q.Qtype != dns.TypeA {
</s> add // Go on processing the AAAA request despite the fact that we don't
// support it yet. The expected behavior here is to respond with an
// empty asnwer and not NXDOMAIN.
if q.Qtype != dns.TypeA && q.Qtype != dns.TypeAAAA { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3764c1dfe497a150d09272257065ea5b5a49ecf6 | internal/dnsforward/dns_test.go |
/scripts/translations/node_modules
/scripts/translations/oneskyapp.json | <mask> /Corefile
<mask> /dnsfilter.txt
<mask> /querylog.json
<mask> /querylog.json.1
<mask> /client/src/helpers/translations/node_modules
<mask> /client/src/helpers/translations/oneskyapp.json
<mask>
<mask> # Test output
<mask> dnsfilter/dnsfilter.TestLotsOfRules*.pprof
<mask> tests/top-1m.csv
</s> Move translations script to scripts folder </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && </s> remove white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | .gitignore |
"dns_test_not_ok_toast": "Server \"{{key}}\": could not be used, please check that you've written it correctly", | <mask> "example_comment_hash": "# Also a comment",
<mask> "all_filters_up_to_date_toast": "All filters are already up-to-date",
<mask> "updated_upstream_dns_toast": "Updated the upstream DNS servers",
<mask> "dns_test_ok_toast": "Specified DNS servers are working correctly",
<mask> "dns_test_not_ok_toast": "Server '{{key}}': could not be used, please check that you've written it correctly",
<mask> "unblock_btn": "Unblock",
<mask> "block_btn": "Block",
<mask> "time_table_header": "Time",
<mask> "domain_name_table_header": "Domain name",
<mask> "type_table_header": "Type",
</s> Move translations script to scripts folder </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && </s> remove white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/__locales/en.json |
<Card type="card--full" bodyType="card-wrap"> | <mask>
<mask> return (
<mask> <div className="row">
<mask> <div className="col-sm-6 col-lg-3">
<mask> <Card bodyType="card-wrap">
<mask> <div className="card-body-stats">
<mask> <div className="card-value card-value-stats text-blue">
<mask> {dnsQueries}
<mask> </div>
<mask> <div className="card-title-stats">
</s> Move translations script to scripts folder </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Trans>blocked_by</Trans> <a href="#filters"><Trans>filters</Trans></a>
</s> add <Trans>blocked_by</Trans><a href="#filters"> <Trans>filters</Trans></a> </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Dashboard/Statistics.js |
<Card type="card--full" bodyType="card-wrap"> | <mask> </div>
<mask> </Card>
<mask> </div>
<mask> <div className="col-sm-6 col-lg-3">
<mask> <Card bodyType="card-wrap">
<mask> <div className="card-body-stats">
<mask> <div className="card-value card-value-stats text-red">
<mask> {blockedFiltering}
<mask> </div>
<mask> <div className="card-value card-value-percent text-red">
</s> Move translations script to scripts folder </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Trans>blocked_by</Trans> <a href="#filters"><Trans>filters</Trans></a>
</s> add <Trans>blocked_by</Trans><a href="#filters"> <Trans>filters</Trans></a> </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Dashboard/Statistics.js |
<Trans>blocked_by</Trans><a href="#filters"> <Trans>filters</Trans></a> | <mask> <div className="card-value card-value-percent text-red">
<mask> {getPercent(dnsQueries, blockedFiltering)}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> <Trans>blocked_by</Trans> <a href="#filters"><Trans>filters</Trans></a>
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={filteringData} color={STATUS_COLORS.red}/>
<mask> </div>
</s> Move translations script to scripts folder </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Dashboard/Statistics.js |
<Card type="card--full" bodyType="card-wrap"> | <mask> </div>
<mask> </Card>
<mask> </div>
<mask> <div className="col-sm-6 col-lg-3">
<mask> <Card bodyType="card-wrap">
<mask> <div className="card-body-stats">
<mask> <div className="card-value card-value-stats text-green">
<mask> {replacedSafebrowsing}
<mask> </div>
<mask> <div className="card-value card-value-percent text-green">
</s> Move translations script to scripts folder </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Trans>blocked_by</Trans> <a href="#filters"><Trans>filters</Trans></a>
</s> add <Trans>blocked_by</Trans><a href="#filters"> <Trans>filters</Trans></a> </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Dashboard/Statistics.js |
<Card type="card--full" bodyType="card-wrap"> | <mask> </div>
<mask> </Card>
<mask> </div>
<mask> <div className="col-sm-6 col-lg-3">
<mask> <Card bodyType="card-wrap">
<mask> <div className="card-body-stats">
<mask> <div className="card-value card-value-stats text-yellow">
<mask> {replacedParental}
<mask> </div>
<mask> <div className="card-value card-value-percent text-yellow">
</s> Move translations script to scripts folder </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Trans>blocked_by</Trans> <a href="#filters"><Trans>filters</Trans></a>
</s> add <Trans>blocked_by</Trans><a href="#filters"> <Trans>filters</Trans></a> </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Dashboard/Statistics.js |
font-size: 13px;
white-space: nowrap; | <mask> .nav-tabs .nav-link {
<mask> width: auto;
<mask> border-bottom: 1px solid transparent;
<mask> }
<mask>
<mask> .mobile-menu {
<mask> position: static;
<mask> display: flex;
<mask> padding: 0;
</s> Move translations script to scripts folder </s> remove white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Header/Header.css |
}
}
@media screen and (min-width: 1280px) {
.nav-tabs .nav-link {
font-size: 14px;
}
.nav-version { | <mask> .nav-version {
<mask> padding: 0;
<mask> font-size: 0.85rem;
<mask> }
<mask> }
<mask>
<mask> .dns-status {
</s> Move translations script to scripts folder </s> remove white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Header/Header.css |
'col-lg-6 mobile-menu': true, | <mask> };
<mask>
<mask> render() {
<mask> const menuClass = classnames({
<mask> 'col-lg mobile-menu': true,
<mask> 'mobile-menu--active': this.props.isMenuOpen,
<mask> });
<mask>
<mask> return (
<mask> <Fragment>
</s> Move translations script to scripts folder </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && </s> remove <ul className="nav nav-tabs border-0 flex-column flex-lg-row">
</s> add <ul className="nav nav-tabs border-0 flex-column flex-lg-row flex-nowrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Header/Menu.js |
<ul className="nav nav-tabs border-0 flex-column flex-lg-row flex-nowrap"> | <mask>
<mask> return (
<mask> <Fragment>
<mask> <div className={menuClass}>
<mask> <ul className="nav nav-tabs border-0 flex-column flex-lg-row">
<mask> <li className="nav-item border-bottom d-lg-none" onClick={this.toggleMenu}>
<mask> <div className="nav-link nav-link--back">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
<mask> <Trans>back</Trans>
<mask> </div>
</s> Move translations script to scripts folder </s> remove 'col-lg mobile-menu': true,
</s> add 'col-lg-6 mobile-menu': true, </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/Header/Menu.js |
font-size: 13px; | <mask>
<mask> .card-title-stats {
<mask> color: #9aa0ac;
<mask> }
<mask>
<mask> .card-body-stats {
<mask> position: relative;
<mask> flex: 1 1 auto;
</s> Move translations script to scripts folder </s> remove white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/ui/Card.css |
<mask> }
<mask>
<mask> .card-title-stats {
<mask> color: #9aa0ac;
<mask> white-space: nowrap;
<mask> text-overflow: ellipsis;
<mask> overflow: hidden;
<mask> }
<mask>
<mask> .card-body-stats {
<mask> position: relative;
<mask> flex: 1 1 auto;
</s> Move translations script to scripts folder | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/ui/Card.css |
|
height: calc(100% - 3rem); | <mask> position: relative;
<mask> flex: 1 1 auto;
<mask> margin: 0;
<mask> padding: 1rem 1.5rem;
<mask> }
<mask>
<mask> .card-value-stats {
<mask> display: block;
</s> Move translations script to scripts folder </s> remove white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/ui/Card.css |
<div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && | <mask>
<mask> import './Card.css';
<mask>
<mask> const Card = props => (
<mask> <div className="card">
<mask> { props.title &&
<mask> <div className="card-header with-border">
<mask> <div className="card-inner">
<mask> <div className="card-title">
<mask> {props.title}
<mask> </div>
</s> Move translations script to scripts folder </s> remove 'col-lg mobile-menu': true,
</s> add 'col-lg-6 mobile-menu': true, </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> </s> remove <Card bodyType="card-wrap">
</s> add <Card type="card--full" bodyType="card-wrap"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/ui/Card.js |
type: PropTypes.string, | <mask> Card.propTypes = {
<mask> title: PropTypes.string,
<mask> subtitle: PropTypes.string,
<mask> bodyType: PropTypes.string,
<mask> refresh: PropTypes.node,
<mask> children: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default Card;
</s> Move translations script to scripts folder </s> remove 'col-lg mobile-menu': true,
</s> add 'col-lg-6 mobile-menu': true, </s> remove <div className="card">
{ props.title &&
</s> add <div className={props.type ? `card ${props.type}` : 'card'}>
{props.title && </s> remove white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3779407291cb970719d6c4964dfa7d283edea5a1 | client/src/components/ui/Card.js |
state := request.Request{W: w, Req: r}
ip := state.IP() | <mask>
<mask> func (d *Plugin) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
<mask> start := time.Now()
<mask> requests.Inc()
<mask>
<mask> // capture the written answer
<mask> rrw := dnstest.NewRecorder(w)
<mask> rcode, err, result := d.serveDNSInternal(ctx, rrw, r)
<mask> if rcode > 0 {
</s> coredns plugin -- forgot to pass client's IP to querylog, fix that.
Closes #311 </s> remove state := request.Request{W: w, Req: r}
</s> add </s> remove logRequest(rrw.Msg, result, time.Since(start))
</s> add logRequest(rrw.Msg, result, time.Since(start), ip) </s> remove func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration) {
</s> add func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration, ip string) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/379e14c28b18c0632e42760aca94aa7b72b05885 | coredns_plugin/coredns_plugin.go |
<mask> rrw := dnstest.NewRecorder(w)
<mask> rcode, err, result := d.serveDNSInternal(ctx, rrw, r)
<mask> if rcode > 0 {
<mask> // actually send the answer if we have one
<mask> state := request.Request{W: w, Req: r}
<mask> answer := new(dns.Msg)
<mask> answer.SetRcode(r, rcode)
<mask> state.SizeAndDo(answer)
<mask> w.WriteMsg(answer)
<mask> }
</s> coredns plugin -- forgot to pass client's IP to querylog, fix that.
Closes #311 </s> remove func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration) {
</s> add func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration, ip string) { </s> remove logRequest(rrw.Msg, result, time.Since(start))
</s> add logRequest(rrw.Msg, result, time.Since(start), ip) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/379e14c28b18c0632e42760aca94aa7b72b05885 | coredns_plugin/coredns_plugin.go |
|
logRequest(rrw.Msg, result, time.Since(start), ip) | <mask> }
<mask>
<mask> // log
<mask> if d.QueryLogEnabled {
<mask> logRequest(rrw.Msg, result, time.Since(start))
<mask> }
<mask> return rcode, err
<mask> }
<mask>
<mask> func (d *Plugin) Name() string { return "dnsfilter" }
</s> coredns plugin -- forgot to pass client's IP to querylog, fix that.
Closes #311 </s> remove func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration) {
</s> add func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration, ip string) { </s> remove state := request.Request{W: w, Req: r}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/379e14c28b18c0632e42760aca94aa7b72b05885 | coredns_plugin/coredns_plugin.go |
IP string | <mask> Time time.Time
<mask> Elapsed time.Duration
<mask> }
<mask>
<mask> func init() {
<mask> logBuffer.SetCapacity(1000)
<mask> }
</s> coredns plugin -- forgot to pass client's IP to querylog, fix that.
Closes #311 </s> remove func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration) {
</s> add func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration, ip string) { </s> remove logRequest(rrw.Msg, result, time.Since(start))
</s> add logRequest(rrw.Msg, result, time.Since(start), ip) </s> remove state := request.Request{W: w, Req: r}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/379e14c28b18c0632e42760aca94aa7b72b05885 | coredns_plugin/querylog.go |
func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration, ip string) { | <mask> func init() {
<mask> logBuffer.SetCapacity(1000)
<mask> }
<mask>
<mask> func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration) {
<mask> entry := logEntry{
<mask> R: r,
<mask> Result: result,
<mask> Time: time.Now(),
<mask> Elapsed: elapsed,
</s> coredns plugin -- forgot to pass client's IP to querylog, fix that.
Closes #311 </s> remove logRequest(rrw.Msg, result, time.Since(start))
</s> add logRequest(rrw.Msg, result, time.Since(start), ip) </s> remove state := request.Request{W: w, Req: r}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/379e14c28b18c0632e42760aca94aa7b72b05885 | coredns_plugin/querylog.go |
IP: ip, | <mask> R: r,
<mask> Result: result,
<mask> Time: time.Now(),
<mask> Elapsed: elapsed,
<mask> }
<mask> logBuffer.Enqueue(entry)
<mask> }
<mask>
<mask> func handler(w http.ResponseWriter, r *http.Request) {
<mask> values := logBuffer.Values()
</s> coredns plugin -- forgot to pass client's IP to querylog, fix that.
Closes #311 </s> remove func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration) {
</s> add func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration, ip string) { </s> remove logRequest(rrw.Msg, result, time.Since(start))
</s> add logRequest(rrw.Msg, result, time.Since(start), ip) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/379e14c28b18c0632e42760aca94aa7b72b05885 | coredns_plugin/querylog.go |
"client": entry.IP, | <mask> jsonentry := map[string]interface{}{
<mask> "reason": entry.Result.Reason.String(),
<mask> "elapsed_ms": strconv.FormatFloat(entry.Elapsed.Seconds()*1000, 'f', -1, 64),
<mask> "time": entry.Time.Format(time.RFC3339),
<mask> }
<mask> question := map[string]interface{}{
<mask> "host": strings.ToLower(strings.TrimSuffix(entry.R.Question[0].Name, ".")),
<mask> "type": dns.Type(entry.R.Question[0].Qtype).String(),
<mask> "class": dns.Class(entry.R.Question[0].Qclass).String(),
<mask> }
</s> coredns plugin -- forgot to pass client's IP to querylog, fix that.
Closes #311 </s> remove state := request.Request{W: w, Req: r}
</s> add </s> remove func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration) {
</s> add func logRequest(r *dns.Msg, result dnsfilter.Result, elapsed time.Duration, ip string) { </s> remove logRequest(rrw.Msg, result, time.Since(start))
</s> add logRequest(rrw.Msg, result, time.Since(start), ip) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/379e14c28b18c0632e42760aca94aa7b72b05885 | coredns_plugin/querylog.go |
resp, err := client.Get("http://127.0.0.1:8618/stats")
if err != nil {
errortext := fmt.Sprintf("Couldn't get stats_top from coredns: %T %s\n", err, err)
log.Println(errortext)
http.Error(w, errortext, http.StatusBadGateway)
return
}
if resp != nil && resp.Body != nil {
defer resp.Body.Close() | <mask> // -----
<mask> // stats
<mask> // -----
<mask> func handleStats(w http.ResponseWriter, r *http.Request) {
<mask> histrical := generateMapFromStats(&statistics.PerHour, 0, 24)
<mask> // sum them up
<mask> summed := map[string]interface{}{}
<mask> for key, values := range histrical {
<mask> summedValue := 0.0
<mask> floats, ok := values.([]float64)
<mask> if !ok {
<mask> continue
<mask> }
<mask> for _, v := range floats {
<mask> summedValue += v
<mask> }
<mask> summed[key] = summedValue
<mask> }
<mask> summed["stats_period"] = "24 hours"
<mask>
<mask> json, err := json.Marshal(summed)
<mask> if err != nil {
</s> Implement online stats calculation in coredns plugin instead of scraping prometheus. </s> remove summed["stats_period"] = "24 hours"
</s> add </s> remove json, err := json.Marshal(summed)
</s> add // read the body entirely
body, err := ioutil.ReadAll(resp.Body) </s> remove errortext := fmt.Sprintf("Unable to marshal status json: %s", err)
</s> add errortext := fmt.Sprintf("Couldn't read response body: %s", err) </s> remove http.Error(w, errortext, 500)
return
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove // handle time unit and prepare our time window size
now := time.Now()
timeUnitString := r.URL.Query().Get("time_unit")
var stats *periodicStats
var timeUnit time.Duration
switch timeUnitString {
case "seconds":
timeUnit = time.Second
stats = &statistics.PerSecond
case "minutes":
timeUnit = time.Minute
stats = &statistics.PerMinute
case "hours":
timeUnit = time.Hour
stats = &statistics.PerHour
case "days":
timeUnit = time.Hour * 24
stats = &statistics.PerDay
default:
http.Error(w, "Must specify valid time_unit parameter", 400)
return
}
// parse start and end time
startTime, err := time.Parse(time.RFC3339, r.URL.Query().Get("start_time"))
if err != nil {
errortext := fmt.Sprintf("Must specify valid start_time parameter: %s", err)
log.Println(errortext)
http.Error(w, errortext, 400)
return
}
endTime, err := time.Parse(time.RFC3339, r.URL.Query().Get("end_time"))
</s> add resp, err := client.Get("http://127.0.0.1:8618/stats_history?" + r.URL.RawQuery) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/37f6d38c498740c7c3db59c31da031cd5c305694 | control.go |
<mask> summedValue += v
<mask> }
<mask> summed[key] = summedValue
<mask> }
<mask> summed["stats_period"] = "24 hours"
<mask>
<mask> json, err := json.Marshal(summed)
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errortext)
</s> Implement online stats calculation in coredns plugin instead of scraping prometheus. </s> remove json, err := json.Marshal(summed)
</s> add // read the body entirely
body, err := ioutil.ReadAll(resp.Body) </s> remove histrical := generateMapFromStats(&statistics.PerHour, 0, 24)
// sum them up
summed := map[string]interface{}{}
for key, values := range histrical {
summedValue := 0.0
floats, ok := values.([]float64)
if !ok {
continue
}
for _, v := range floats {
summedValue += v
}
summed[key] = summedValue
</s> add resp, err := client.Get("http://127.0.0.1:8618/stats")
if err != nil {
errortext := fmt.Sprintf("Couldn't get stats_top from coredns: %T %s\n", err, err)
log.Println(errortext)
http.Error(w, errortext, http.StatusBadGateway)
return
}
if resp != nil && resp.Body != nil {
defer resp.Body.Close() </s> remove errortext := fmt.Sprintf("Unable to marshal status json: %s", err)
</s> add errortext := fmt.Sprintf("Couldn't read response body: %s", err) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusBadGateway) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusBadGateway) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/37f6d38c498740c7c3db59c31da031cd5c305694 | control.go |
|
// read the body entirely
body, err := ioutil.ReadAll(resp.Body) | <mask> summed[key] = summedValue
<mask> }
<mask> summed["stats_period"] = "24 hours"
<mask>
<mask> json, err := json.Marshal(summed)
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, 500)
<mask> return
</s> Implement online stats calculation in coredns plugin instead of scraping prometheus. </s> remove summed["stats_period"] = "24 hours"
</s> add </s> remove errortext := fmt.Sprintf("Unable to marshal status json: %s", err)
</s> add errortext := fmt.Sprintf("Couldn't read response body: %s", err) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusBadGateway) </s> remove histrical := generateMapFromStats(&statistics.PerHour, 0, 24)
// sum them up
summed := map[string]interface{}{}
for key, values := range histrical {
summedValue := 0.0
floats, ok := values.([]float64)
if !ok {
continue
}
for _, v := range floats {
summedValue += v
}
summed[key] = summedValue
</s> add resp, err := client.Get("http://127.0.0.1:8618/stats")
if err != nil {
errortext := fmt.Sprintf("Couldn't get stats_top from coredns: %T %s\n", err, err)
log.Println(errortext)
http.Error(w, errortext, http.StatusBadGateway)
return
}
if resp != nil && resp.Body != nil {
defer resp.Body.Close() </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusBadGateway) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/37f6d38c498740c7c3db59c31da031cd5c305694 | control.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.