docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
func periodicallyRefreshFilters() {
for range time.Tick(time.Minute) {
refreshFiltersIfNeccessary(false)
} | <mask> fmt.Fprintf(w, "OK %d filters updated\n", updated)
<mask> }
<mask>
<mask> // Sets up a timer that will be checking for filters updates periodically
<mask> func runFiltersUpdatesTimer() {
<mask> go func() {
<mask> for range time.Tick(time.Minute) {
<mask> checkFiltersUpdates(false)
<mask> }
<m... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70c5afd6a5065ad827b038954dba1ade503a5246 | control.go |
func refreshFiltersIfNeccessary(force bool) int { | <mask> }
<mask>
<mask> // Checks filters updates if necessary
<mask> // If force is true, it ignores the filter.LastUpdated field value
<mask> func checkFiltersUpdates(force bool) int {
<mask> config.Lock()
<mask>
<mask> // fetch URLs
<mask> updateCount := 0
<mask> for i := range config.Filters {
</s> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70c5afd6a5065ad827b038954dba1ade503a5246 | control.go |
github.com/mdlayher/packet v1.0.0 | <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
<mask> github.com/mdlayher/netlink v1.6.0
<mask> // TODO(a.garipov): This package is deprecated; find a new one or use
<mask> // our own code for that.
<mask> github.com/mdlayher/raw v0.1.0 // indirect
<mask> github.com/miekg/dns v1.1.50... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | go.mod |
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e | <mask> go.etcd.io/bbolt v1.3.6
<mask> golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
<mask> golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
<mask> golang.org/x/sys v0.0.0-20220731174439-a90be440212d
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v3 v3.0.1
</s> Pull request:... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | go.mod |
gopkg.in/yaml.v3 v3.0.1 | <mask> golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
<mask> golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
<mask> golang.org/x/sys v0.0.0-20220731174439-a90be440212d
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> howett.net/plist v1.0.0
<mask> )
<mask>
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | go.mod |
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> howett.net/plist v1.0.0
<mask> )
<mask>
<mask> require (
<mask> github.com/mdlayher/packet v1.0.0
<mask> golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
<mask> )
<mask>
<mask> require (
<mask> github.com/BurntSushi/toml v1.1.0 // indirect
<mask> github.com/a... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | go.mod | |
<mask> golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
<mask> golang.org/x/text v0.3.7 // indirect
<mask> golang.org/x/tools v0.1.12 // indirect
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | go.mod | |
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | <mask> gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | go.sum |
"bytes" | <mask> package home
<mask>
<mask> import (
<mask> "fmt"
<mask> "net"
<mask> "os"
<mask> "path/filepath"
<mask> "sync"
<mask>
</s> Pull request: upd-yaml
Merge in DNS/adguard-home from upd-yaml to master
Squashed commit of the following:
commit f0c3a1896e7eba73b1c8a02533637cdabc89909b
Author: Ainar G... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
yaml "gopkg.in/yaml.v3" | <mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/google/renameio/maybe"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const (
<mask> dataDir = "data" // data storage
<mask> filterDir... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
// logSettings are the logging settings part of the configuration file.
//
// TODO(a.garipov): Put them into a separate object. | <mask> dataDir = "data" // data storage
<mask> filterDir = "filters" // cache location for downloaded filters, it's under DataDir
<mask> )
<mask>
<mask> // logSettings
<mask> type logSettings struct {
<mask> LogCompress bool `yaml:"log_compress"` // Compress determines if the rotated log files sh... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
// File is the path to the log file. If empty, logs are written to stdout.
// If "syslog", logs are written to syslog.
File string `yaml:"log_file"`
// MaxBackups is the maximum number of old log files to retain.
//
// NOTE: MaxAge may still cause them to get deleted.
MaxBackups int `yaml:"log_max_backups"`
... | <mask> )
<mask>
<mask> // logSettings
<mask> type logSettings struct {
<mask> LogCompress bool `yaml:"log_compress"` // Compress determines if the rotated log files should be compressed using gzip (default: false)
<mask> LogLocalTime bool `yaml:"log_localtime"` // If the time used for formatting th... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
Compress: false,
LocalTime: false,
MaxBackups: 0,
MaxSize: 100,
MaxAge: 3, | <mask> HostsFile: true,
<mask> },
<mask> },
<mask> logSettings: logSettings{
<mask> LogCompress: false,
<mask> LogLocalTime: false,
<mask> LogMaxBackups: 0,
<mask> LogMaxSize: 100,
<mask> LogMaxAge: 3,
<mask> },
<mask> OSConfig: &osConfig{},
<mask> SchemaVersion: currentSc... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
func (c *configuration) write() (err error) { | <mask> return os.ReadFile(name)
<mask> }
<mask>
<mask> // Saves configuration to the YAML file and also saves the user filter contents to a file
<mask> func (c *configuration) write() error {
<mask> c.Lock()
<mask> defer c.Unlock()
<mask>
<mask> if Context.auth != nil {
<mask> config.Users = Context.a... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
log.Debug("writing config file %q", configFile) | <mask>
<mask> config.Clients.Persistent = Context.clients.forConfig()
<mask>
<mask> configFile := config.getConfigFilename()
<mask> log.Debug("Writing YAML file: %s", configFile)
<mask> yamlText, err := yaml.Marshal(&config)
<mask> if err != nil {
<mask> log.Error("Couldn't generate YAML file: %s", err... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
buf := &bytes.Buffer{}
enc := yaml.NewEncoder(buf)
enc.SetIndent(2) | <mask> yamlText, err := yaml.Marshal(&config)
<mask> if err != nil {
<mask> log.Error("Couldn't generate YAML file: %s", err)
<mask>
<mask> return err
<mask> }
<mask>
<mask> err = maybe.WriteFile(configFile, yamlText, 0o644)
<mask> if err != nil {
<mask> log.Error("Couldn't save YAML config: %s",... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
err = enc.Encode(config) | <mask>
<mask> return err
<mask> }
<mask>
<mask> err = maybe.WriteFile(configFile, yamlText, 0o644)
<mask> if err != nil {
<mask> log.Error("Couldn't save YAML config: %s", err)
<mask>
<mask> return err
<mask> }
</s> Pull request: upd-yaml
Merge in DNS/adguard-home from upd-yaml to master
Squas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
return fmt.Errorf("generating config file: %w", err)
} | <mask> }
<mask>
<mask> err = maybe.WriteFile(configFile, yamlText, 0o644)
<mask> if err != nil {
<mask> log.Error("Couldn't save YAML config: %s", err)
<mask>
<mask> return err
<mask> }
<mask>
<mask> return nil
</s> Pull request: upd-yaml
Merge in DNS/adguard-home from upd-yaml to master
Squash... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
err = maybe.WriteFile(configFile, buf.Bytes(), 0o644)
if err != nil {
return fmt.Errorf("writing config file: %w", err) | <mask> err = maybe.WriteFile(configFile, yamlText, 0o644)
<mask> if err != nil {
<mask> log.Error("Couldn't save YAML config: %s", err)
<mask>
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Pull request: upd-yaml
Merge in DNS/adguard-home from upd-yaml to master
Squashed commit ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/config.go |
yaml "gopkg.in/yaml.v3" | <mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/ameshkov/dnscrypt/v2"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> // Default ports.
<mask> const (
<mask> defaultPortDNS = 53
</s> Pull... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/dns.go |
ls.File = args.logFile
} else if config.File != "" {
ls.File = config.File | <mask> if args.verbose || config.Verbose {
<mask> ls.Verbose = true
<mask> }
<mask> if args.logFile != "" {
<mask> ls.LogFile = args.logFile
<mask> } else if config.LogFile != "" {
<mask> ls.LogFile = config.LogFile
<mask> }
<mask>
<mask> // Handle default log settings overrides
<mask> ls.LogCo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/home.go |
ls.Compress = config.Compress
ls.LocalTime = config.LocalTime
ls.MaxBackups = config.MaxBackups
ls.MaxSize = config.MaxSize
ls.MaxAge = config.MaxAge | <mask> ls.LogFile = config.LogFile
<mask> }
<mask>
<mask> // Handle default log settings overrides
<mask> ls.LogCompress = config.LogCompress
<mask> ls.LogLocalTime = config.LogLocalTime
<mask> ls.LogMaxBackups = config.LogMaxBackups
<mask> ls.LogMaxSize = config.LogMaxSize
<mask> ls.LogMaxAge = conf... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/home.go |
if args.runningAsService && ls.File == "" && runtime.GOOS == "windows" { | <mask> // Make sure that we see the microseconds in logs, as networking stuff can
<mask> // happen pretty quickly.
<mask> log.SetFlags(log.LstdFlags | log.Lmicroseconds)
<mask>
<mask> if args.runningAsService && ls.LogFile == "" && runtime.GOOS == "windows" {
<mask> // When running as a Windows service, us... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/home.go |
ls.File = configSyslog | <mask>
<mask> if args.runningAsService && ls.LogFile == "" && runtime.GOOS == "windows" {
<mask> // When running as a Windows service, use eventlog by default if nothing
<mask> // else is configured. Otherwise, we'll simply lose the log output.
<mask> ls.LogFile = configSyslog
<mask> }
<mask>
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/home.go |
if ls.File == "" { | <mask> ls.LogFile = configSyslog
<mask> }
<mask>
<mask> // logs are written to stdout (default)
<mask> if ls.LogFile == "" {
<mask> return
<mask> }
<mask>
<mask> if ls.LogFile == configSyslog {
<mask> // Use syslog where it is possible and eventlog on Windows
</s> Pull request: upd-yaml
Merge i... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/home.go |
if ls.File == configSyslog { | <mask> if ls.LogFile == "" {
<mask> return
<mask> }
<mask>
<mask> if ls.LogFile == configSyslog {
<mask> // Use syslog where it is possible and eventlog on Windows
<mask> err := aghos.ConfigureSyslog(serviceName)
<mask> if err != nil {
<mask> log.Fatalf("cannot initialize syslog: %s", err)
<mas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/home.go |
logFilePath := filepath.Join(Context.workDir, ls.File)
if filepath.IsAbs(ls.File) {
logFilePath = ls.File | <mask> if err != nil {
<mask> log.Fatalf("cannot initialize syslog: %s", err)
<mask> }
<mask> } else {
<mask> logFilePath := filepath.Join(Context.workDir, ls.LogFile)
<mask> if filepath.IsAbs(ls.LogFile) {
<mask> logFilePath = ls.LogFile
<mask> }
<mask>
<mask> _, err := os.OpenFile(logFil... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/home.go |
Compress: ls.Compress, // disabled by default
LocalTime: ls.LocalTime,
MaxBackups: ls.MaxBackups,
MaxSize: ls.MaxSize, // megabytes
MaxAge: ls.MaxAge, // days | <mask> }
<mask>
<mask> log.SetOutput(&lumberjack.Logger{
<mask> Filename: logFilePath,
<mask> Compress: ls.LogCompress, // disabled by default
<mask> LocalTime: ls.LogLocalTime,
<mask> MaxBackups: ls.LogMaxBackups,
<mask> MaxSize: ls.LogMaxSize, // megabytes
<mask> MaxAge: ls... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/home.go |
"bytes" | <mask>
<mask> import (
<mask> "fmt"
<mask> "net/url"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
</s> Pull request: upd-yaml
Merge in DNS/adguard-home from upd-yaml to master
Squashed commit of the following:
commit f0c3a1896e7eba73b1c8a02533637cdabc89909b
Author: Ainar Garipov <A.Garipov@AdGuard.... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/upgrade.go |
yaml "gopkg.in/yaml.v3" | <mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/google/renameio/maybe"
<mask> "golang.org/x/crypto/bcrypt"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> // currentSchemaVersion is the current schema version.
<mask> const currentSch... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/upgrade.go |
buf := &bytes.Buffer{}
enc := yaml.NewEncoder(buf)
enc.SetIndent(2)
err = enc.Encode(diskConf) | <mask> if n == 0 {
<mask> return fmt.Errorf("unknown configuration schema version %d", oldVersion)
<mask> }
<mask>
<mask> body, err := yaml.Marshal(diskConf)
<mask> if err != nil {
<mask> return fmt.Errorf("generating new config: %w", err)
<mask> }
<mask>
<mask> config.fileData = body
</s> Pull r... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/upgrade.go |
config.fileData = buf.Bytes() | <mask> if err != nil {
<mask> return fmt.Errorf("generating new config: %w", err)
<mask> }
<mask>
<mask> config.fileData = body
<mask> confFile := config.getConfigFilename()
<mask> err = maybe.WriteFile(confFile, body, 0o644)
<mask> if err != nil {
<mask> return fmt.Errorf("saving new config: %w", e... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/upgrade.go |
err = maybe.WriteFile(confFile, config.fileData, 0o644) | <mask> }
<mask>
<mask> config.fileData = body
<mask> confFile := config.getConfigFilename()
<mask> err = maybe.WriteFile(confFile, body, 0o644)
<mask> if err != nil {
<mask> return fmt.Errorf("saving new config: %w", err)
<mask> }
<mask>
<mask> return nil
</s> Pull request: upd-yaml
Merge in DNS/... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/upgrade.go |
return fmt.Errorf("writing new config: %w", err) | <mask> config.fileData = body
<mask> confFile := config.getConfigFilename()
<mask> err = maybe.WriteFile(confFile, body, 0o644)
<mask> if err != nil {
<mask> return fmt.Errorf("saving new config: %w", err)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request: upd-yaml
Merge in DNS/a... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/upgrade.go |
// testDNSConf creates a DNS config for test the way gopkg.in/yaml.v3 would | <mask>
<mask> return diskConf
<mask> }
<mask>
<mask> // testDNSConf creates a DNS config for test the way gopkg.in/yaml.v2 would
<mask> // unmarshal it. In YAML, keys aren't guaranteed to always only be strings.
<mask> func testDNSConf(schemaVersion int) (dnsConf yobj) {
<mask> dnsConf = yobj{
<mask> "p... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/home/upgrade_test.go |
github.com/kisielk/errcheck v1.6.2 | <mask> require (
<mask> github.com/fzipp/gocyclo v0.6.0
<mask> github.com/golangci/misspell v0.3.5
<mask> github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8
<mask> github.com/kisielk/errcheck v1.6.1
<mask> github.com/kyoh86/looppointer v0.1.7
<mask> github.com/securego/gosec/v2 v2.12.0
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/tools/go.mod |
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect | <mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220722155223-a9213eeb770e // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/tools/go.mod |
github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c=
github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= | <mask> github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
<mask> github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
<mask> github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkag... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/tools/go.sum |
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 h1:9vYwv7OjYaky/tlAeD7C4oC9EsPTlaFl1H2jS++V+ME=
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/70f85fca210aee4d2f43f26bba9743a300d19e1c | internal/tools/go.sum |
<mask> const (
<mask> LeaseChangedAdded = iota
<mask> LeaseChangedAddedStatic
<mask> LeaseChangedRemovedStatic
<mask> LeaseChangedBlacklisted
<mask>
<mask> LeaseChangedDBStore
<mask> )
<mask>
<mask> // Server - the current state of the DHCP server
</s> * DHCP: don't replace the host name from static l... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/719ef16b93e149d18558401aa87a7544b2b1cd31 | dhcpd/dhcpd.go | |
<mask> }
<mask>
<mask> s.conf.notify(LeaseChangedDBStore)
<mask>
<mask> // s.conf.notify(LeaseChangedBlacklisted)
<mask>
<mask> } else {
<mask> reqIP := req.Options.Get(dhcpv4.OptionRequestedIPAddress)
<mask> if len(reqIP) != 0 &&
<mask> !bytes.Equal(reqIP, lease.IP) {
<mask> log.Debug("D... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/719ef16b93e149d18558401aa87a7544b2b1cd31 | dhcpd/v4.go | |
<mask> log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP)
<mask> }
<mask> }
<mask>
<mask> hostname := req.Options.Get(dhcpv4.OptionHostName)
<mask> lease.Hostname = string(hostname)
<mask>
<mask> resp.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer))
<mask> return leas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/719ef16b93e149d18558401aa87a7544b2b1cd31 | dhcpd/v4.go | |
<mask> log.Debug("DHCPv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac)
<mask> return nil, true
<mask> }
<mask>
<mask> if !bytes.Equal([]byte(l.Hostname), hostname) {
<mask> s.leasesLock.Unlock()
<mask> log.Debug("DHCPv4: Mismatched OptionHostName in Request message ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/719ef16b93e149d18558401aa87a7544b2b1cd31 | dhcpd/v4.go | |
lease.Hostname = string(hostname) | <mask>
<mask> if lease.Expiry.Unix() != leaseExpireStatic {
<mask> s.commitLease(lease)
<mask> } else if len(lease.Hostname) != 0 {
<mask> o := &optFQDN{
<mask> name: string(lease.Hostname),
<mask> }
</s> * DHCP: don't replace the host name from static lease
When a static lease contains a host name... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/719ef16b93e149d18558401aa87a7544b2b1cd31 | dhcpd/v4.go |
} else if len(lease.Hostname) != 0 {
o := &optFQDN{
name: string(lease.Hostname),
}
fqdn := dhcpv4.Option{
Code: dhcpv4.OptionFQDN,
Value: o,
}
resp.UpdateOption(fqdn) | <mask>
<mask> if lease.Expiry.Unix() != leaseExpireStatic {
<mask> lease.Hostname = string(hostname)
<mask> s.commitLease(lease)
<mask> }
<mask>
<mask> resp.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeAck))
<mask> return lease, true
<mask> }
</s> * DHCP: don't replace the host name from sta... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/719ef16b93e149d18558401aa87a7544b2b1cd31 | dhcpd/v4.go |
// FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
func (s *Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
now := time.Now().Unix()
s.leasesLock.RLock()
defer s.leasesLock.RUnlock()
for _, l := range s.leases {
if l.Expiry.Unix() > now && l.IP.Equal(ip) {
return l.HWAddr... | <mask> }
<mask>
<mask> // Reset internal state
<mask> func (s *Server) reset() {
<mask> s.leasesLock.Lock()
<mask> s.leases = nil
<mask> s.IPpool = make(map[[4]byte]net.HardwareAddr)
<mask> s.leasesLock.Unlock()
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for con... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | dhcpd/dhcpd.go |
"bytes" | <mask> package home
<mask>
<mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for config read/write
* clients: move HTTP handlers </s> remove "net/http"... | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "os/exec"
<mask> "runtime"
<mask> "strings"
<mask> "sync"
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for config read/write
* clients: move HTTP handle... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go | |
IDs []string | <mask> )
<mask>
<mask> // Client information
<mask> type Client struct {
<mask> IP string
<mask> MAC string
<mask> Name string
<mask> UseOwnSettings bool // false: use global settings
<mask> FilteringEnabled bool
<mask> SafeSearchEnabled bool
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
<mask> UseOwnBlockedServices bool // false: use global settings
<mask> BlockedServices []string
<mask> }
<mask>
<mask> type clientJSON struct {
<mask> IP string `json:"ip"`
<mask> MAC string `json:"mac"`
<mask> Name string `json:"name"`
<mask> UseGlo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go | |
idIndex map[string]*Client // IP -> client | <mask> }
<mask>
<mask> type clientsContainer struct {
<mask> list map[string]*Client // name -> client
<mask> ipIndex map[string]*Client // IP -> client
<mask> ipHost map[string]*ClientHost // IP -> Hostname
<mask> lock sync.Mutex
<mask> }
<mask>
<mask> // Init initializes clients contain... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
func (clients *clientsContainer) Init(objects []clientObject) { | <mask> }
<mask>
<mask> // Init initializes clients container
<mask> // Note: this function must be called only once
<mask> func (clients *clientsContainer) Init() {
<mask> if clients.list != nil {
<mask> log.Fatal("clients.list != nil")
<mask> }
<mask> clients.list = make(map[string]*Client)
<mask> cli... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
clients.idIndex = make(map[string]*Client) | <mask> if clients.list != nil {
<mask> log.Fatal("clients.list != nil")
<mask> }
<mask> clients.list = make(map[string]*Client)
<mask> clients.ipIndex = make(map[string]*Client)
<mask> clients.ipHost = make(map[string]*ClientHost)
<mask>
<mask> go clients.periodicUpdate()
<mask> }
<mask>
</s> * cli... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
clients.addFromConfig(objects) | <mask> }
<mask> clients.list = make(map[string]*Client)
<mask> clients.idIndex = make(map[string]*Client)
<mask> clients.ipHost = make(map[string]*ClientHost)
<mask>
<mask> go clients.periodicUpdate()
<mask> }
<mask>
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
_, ok := clients.idIndex[ip] | <mask> func (clients *clientsContainer) Exists(ip string, source clientSource) bool {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> _, ok := clients.ipIndex[ip]
<mask> if ok {
<mask> return true
<mask> }
<mask>
<mask> ch, ok := clients.ipHost[ip]
</s> * clients: multip... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
ipAddr := net.ParseIP(ip)
if ipAddr == nil {
return Client{}, false
}
| <mask> // Find searches for a client by IP
<mask> func (clients *clientsContainer) Find(ip string) (Client, bool) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> c, ok := clients.idIndex[ip]
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code f... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
c, ok := clients.idIndex[ip] | <mask> func (clients *clientsContainer) Find(ip string) (Client, bool) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> c, ok := clients.ipIndex[ip]
<mask> if ok {
<mask> return *c, true
<mask> }
<mask>
<mask> for _, c = range clients.list {
</s> * clients: multiple IP,... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
for _, id := range c.IDs {
_, ipnet, err := net.ParseCIDR(id) | <mask> return *c, true
<mask> }
<mask>
<mask> for _, c = range clients.list {
<mask> if len(c.MAC) != 0 {
<mask> mac, err := net.ParseMAC(c.MAC)
<mask> if err != nil {
<mask> continue
<mask> }
<mask> ipAddr := config.dhcpServer.FindIPbyMAC(mac)
<mask> if ipAddr == nil {
</s> * clie... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
if ipnet.Contains(ipAddr) {
return *c, true
}
}
}
macFound := config.dhcpServer.FindMACbyIP(ipAddr)
if macFound == nil {
return Client{}, false
}
for _, c = range clients.list {
for _, id := range c.IDs {
hwAddr, err := net.ParseMAC(id)
if err != nil { | <mask> mac, err := net.ParseMAC(c.MAC)
<mask> if err != nil {
<mask> continue
<mask> }
<mask> ipAddr := config.dhcpServer.FindIPbyMAC(mac)
<mask> if ipAddr == nil {
<mask> continue
<mask> }
<mask> if ip == ipAddr.String() {
<mask> return *c, true
<mask> }
</s> * clients: ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
if bytes.Equal(hwAddr, macFound) { | <mask> ipAddr := config.dhcpServer.FindIPbyMAC(mac)
<mask> if ipAddr == nil {
<mask> continue
<mask> }
<mask> if ip == ipAddr.String() {
<mask> return *c, true
<mask> }
<mask> }
<mask> }
<mask>
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code f... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
if len(c.IDs) == 0 {
return fmt.Errorf("ID required") | <mask> if len(c.Name) == 0 {
<mask> return fmt.Errorf("Invalid Name")
<mask> }
<mask>
<mask> if (len(c.IP) == 0 && len(c.MAC) == 0) ||
<mask> (len(c.IP) != 0 && len(c.MAC) != 0) {
<mask> return fmt.Errorf("IP or MAC required")
<mask> }
<mask>
<mask> if len(c.IP) != 0 {
<mask> ip := net.ParseIP... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
for i, id := range c.IDs {
ip := net.ParseIP(id)
if ip != nil {
c.IDs[i] = ip.String() // normalize IP address
continue | <mask> (len(c.IP) != 0 && len(c.MAC) != 0) {
<mask> return fmt.Errorf("IP or MAC required")
<mask> }
<mask>
<mask> if len(c.IP) != 0 {
<mask> ip := net.ParseIP(c.IP)
<mask> if ip == nil {
<mask> return fmt.Errorf("Invalid IP")
<mask> }
<mask> c.IP = ip.String()
<mask> } else {
<mask> _,... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
_, _, err := net.ParseCIDR(id)
if err == nil {
continue
}
_, err = net.ParseMAC(id)
if err == nil {
continue | <mask> ip := net.ParseIP(c.IP)
<mask> if ip == nil {
<mask> return fmt.Errorf("Invalid IP")
<mask> }
<mask> c.IP = ip.String()
<mask> } else {
<mask> _, err := net.ParseMAC(c.MAC)
<mask> if err != nil {
<mask> return fmt.Errorf("Invalid MAC: %s", err)
<mask> }
<mask> }
<mask> return n... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
return fmt.Errorf("Invalid ID: %s", id) | <mask> _, err = net.ParseMAC(id)
<mask> if err == nil {
<mask> continue
<mask> }
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Add a new client object
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for config read/write
* clients: move HTTP handlers <... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
// check ID index
for _, id := range c.IDs {
c2, ok := clients.idIndex[id] | <mask> if ok {
<mask> return false, nil
<mask> }
<mask>
<mask> // check IP index
<mask> if len(c.IP) != 0 {
<mask> c2, ok := clients.ipIndex[c.IP]
<mask> if ok {
<mask> return false, fmt.Errorf("Another client uses the same IP address: %s", c2.Name)
<mask> }
<mask> }
<mask>
</s> * clients... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
return false, fmt.Errorf("Another client uses the same ID (%s): %s", id, c2.Name) | <mask> // check IP index
<mask> if len(c.IP) != 0 {
<mask> c2, ok := clients.ipIndex[c.IP]
<mask> if ok {
<mask> return false, fmt.Errorf("Another client uses the same IP address: %s", c2.Name)
<mask> }
<mask> }
<mask>
<mask> ch, ok := clients.ipHost[c.IP]
<mask> if ok {
</s> * clients: multip... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
// remove auto-clients with the same IP address, keeping WHOIS info if possible
for _, id := range c.IDs {
ch, ok := clients.ipHost[id]
if ok {
if len(c.WhoisInfo) == 0 {
c.WhoisInfo = ch.WhoisInfo
}
delete(clients.ipHost, id)
} | <mask> return false, fmt.Errorf("Another client uses the same IP address: %s", c2.Name)
<mask> }
<mask> }
<mask>
<mask> ch, ok := clients.ipHost[c.IP]
<mask> if ok {
<mask> c.WhoisInfo = ch.WhoisInfo
<mask> delete(clients.ipHost, c.IP)
<mask> }
<mask>
<mask> clients.list[c.Name] = &c
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
// update Name index | <mask> }
<mask>
<mask> clients.list[c.Name] = &c
<mask>
<mask> // update ID index
<mask> for _, id := range c.IDs {
<mask> clients.idIndex[id] = &c
<mask> }
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for config read/write
* clients: move HTTP handlers </s> r... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
// update ID index
for _, id := range c.IDs {
clients.idIndex[id] = &c | <mask> delete(clients.ipHost, c.IP)
<mask> }
<mask>
<mask> clients.list[c.Name] = &c
<mask> if len(c.IP) != 0 {
<mask> clients.ipIndex[c.IP] = &c
<mask> }
<mask>
<mask> log.Tracef("'%s': '%s' | '%s' -> [%d]", c.Name, c.IP, c.MAC, len(clients.list))
<mask> return true, nil
<mask> }
</s> * clients... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
log.Tracef("'%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list)) | <mask> if len(c.IP) != 0 {
<mask> clients.ipIndex[c.IP] = &c
<mask> }
<mask>
<mask> log.Tracef("'%s': '%s' | '%s' -> [%d]", c.Name, c.IP, c.MAC, len(clients.list))
<mask> return true, nil
<mask> }
<mask>
<mask> // Del removes a client
<mask> func (clients *clientsContainer) Del(name string) bool {
</... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
// update Name index | <mask> return false
<mask> }
<mask>
<mask> delete(clients.list, name)
<mask>
<mask> // update ID index
<mask> for _, id := range c.IDs {
<mask> delete(clients.idIndex, id)
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for config read/write
* clients: move HTTP... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
// update ID index
for _, id := range c.IDs {
delete(clients.idIndex, id)
}
return true
}
// Return TRUE if arrays are equal
func arraysEqual(a, b []string) bool {
if len(a) != len(b) {
return false
}
for i := 0; i != len(a); i++ {
if a[i] != b[i] {
return false
}
} | <mask> return false
<mask> }
<mask>
<mask> delete(clients.list, name)
<mask> delete(clients.ipIndex, c.IP)
<mask> return true
<mask> }
<mask>
<mask> // Update a client
<mask> func (clients *clientsContainer) Update(name string, c Client) error {
</s> * clients: multiple IP, CIDR, MAC addresses
+ /cl... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
if !arraysEqual(old.IDs, c.IDs) {
for _, id := range c.IDs {
c2, ok := clients.idIndex[id]
if ok && c2 != old {
return fmt.Errorf("Another client uses the same ID (%s): %s", id, c2.Name)
}
}
// update ID index
for _, id := range old.IDs {
delete(clients.idIndex, id)
}
for _, id := range c.... | <mask> }
<mask> }
<mask>
<mask> // check IP index
<mask> if old.IP != c.IP && len(c.IP) != 0 {
<mask> c2, ok := clients.ipIndex[c.IP]
<mask> if ok {
<mask> return fmt.Errorf("Another client uses the same IP address: %s", c2.Name)
<mask> }
<mask> }
<mask>
<mask> // update Name index
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
clients.list[c.Name] = old | <mask>
<mask> // update Name index
<mask> if old.Name != c.Name {
<mask> delete(clients.list, old.Name)
<mask> }
<mask> clients.list[c.Name] = &c
<mask>
<mask> // update IP index
<mask> if old.IP != c.IP {
<mask> delete(clients.ipIndex, old.IP)
<mask> }
<mask> if len(c.IP) != 0 {
<mask> cli... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
*old = c | <mask> delete(clients.list, old.Name)
<mask> clients.list[c.Name] = old
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // SetWhoisInfo - associate WHOIS information with a client
<mask> func (clients *clientsContainer) SetWhoisInfo(ip string, info [][]string) {
</s> * clients: multiple IP, C... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
c, ok := clients.idIndex[ip] | <mask> func (clients *clientsContainer) SetWhoisInfo(ip string, info [][]string) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> c, ok := clients.ipIndex[ip]
<mask> if ok {
<mask> c.WhoisInfo = info
<mask> log.Debug("Clients: set WHOIS info for client %s: %v", c.Name, c.Wh... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
_, ok := clients.idIndex[ip] | <mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> // check index
<mask> _, ok := clients.ipIndex[ip]
<mask> if ok {
<mask> return false, nil
<mask> }
<mask>
<mask> // check auto-clients index
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: mov... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go |
<mask> }
<mask> }
<mask> log.Debug("Added %d client aliases from DHCP", n)
<mask> }
<mask>
<mask> type clientHostJSON struct {
<mask> IP string `json:"ip"`
<mask> Name string `json:"name"`
<mask> Source string `json:"source"`
<mask>
<mask> WhoisInfo map[string]interface{} `json:"whois_info"`
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients.go | |
clients.Init(nil) | <mask> var e error
<mask> var b bool
<mask> clients := clientsContainer{}
<mask>
<mask> clients.Init()
<mask>
<mask> // add
<mask> c = Client{
<mask> IP: "1.1.1.1",
<mask> Name: "client1",
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for config read/wri... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
IDs: []string{"1.1.1.1", "aa:aa:aa:aa:aa:aa"}, | <mask> clients.Init()
<mask>
<mask> // add
<mask> c = Client{
<mask> IP: "1.1.1.1",
<mask> Name: "client1",
<mask> }
<mask> b, e = clients.Add(c)
<mask> if !b || e != nil {
<mask> t.Fatalf("Add #1")
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for conf... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
IDs: []string{"2.2.2.2"}, | <mask> }
<mask>
<mask> // add #2
<mask> c = Client{
<mask> IP: "2.2.2.2",
<mask> Name: "client2",
<mask> }
<mask> b, e = clients.Add(c)
<mask> if !b || e != nil {
<mask> t.Fatalf("Add #2")
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code for config read/wr... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
IDs: []string{"1.2.3.5"}, | <mask> }
<mask>
<mask> // failed add - name in use
<mask> c = Client{
<mask> IP: "1.2.3.5",
<mask> Name: "client1",
<mask> }
<mask> b, _ = clients.Add(c)
<mask> if b {
<mask> t.Fatalf("Add - name in use")
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code fo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
IDs: []string{"2.2.2.2"}, | <mask> }
<mask>
<mask> // failed add - ip in use
<mask> c = Client{
<mask> IP: "2.2.2.2",
<mask> Name: "client3",
<mask> }
<mask> b, e = clients.Add(c)
<mask> if b || e == nil {
<mask> t.Fatalf("Add - ip in use")
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
c.IDs = []string{"1.2.3.0"} | <mask> assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile))
<mask>
<mask> // failed update - no such name
<mask> c.IP = "1.2.3.0"
<mask> c.Name = "client3"
<mask> if clients.Update("client3", c) == nil {
<mask> t.Fatalf... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
c.IDs = []string{"1.2.3.0"} | <mask> t.Fatalf("Update")
<mask> }
<mask>
<mask> // failed update - name in use
<mask> c.IP = "1.2.3.0"
<mask> c.Name = "client2"
<mask> if clients.Update("client1", c) == nil {
<mask> t.Fatalf("Update - name in use")
<mask> }
<mask>
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/fi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
c.IDs = []string{"2.2.2.2"} | <mask> t.Fatalf("Update - name in use")
<mask> }
<mask>
<mask> // failed update - ip in use
<mask> c.IP = "2.2.2.2"
<mask> c.Name = "client1"
<mask> if clients.Update("client1", c) == nil {
<mask> t.Fatalf("Update - ip in use")
<mask> }
<mask>
</s> * clients: multiple IP, CIDR, MAC addresses
+ /... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
c.IDs = []string{"1.1.1.2"} | <mask> t.Fatalf("Update - ip in use")
<mask> }
<mask>
<mask> // update
<mask> c.IP = "1.1.1.2"
<mask> c.Name = "client1"
<mask> if clients.Update("client1", c) != nil {
<mask> t.Fatalf("Update")
<mask> }
<mask>
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move code... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
assert.True(t, clients.Exists("1.1.1.2", ClientSourceHostsFile))
// update - rename
c.IDs = []string{"1.1.1.2"}
c.Name = "client1-renamed"
c.UseOwnSettings = true
assert.True(t, clients.Update("client1", c) == nil)
c = Client{}
c, b = clients.F... | <mask> t.Fatalf("Update")
<mask> }
<mask>
<mask> // get after update
<mask> assert.True(t, !(clients.Exists("1.1.1.1", ClientSourceHostsFile) || !clients.Exists("1.1.1.2", ClientSourceHostsFile)))
<mask>
<mask> // failed remove - no such name
<mask> if clients.Del("client3") {
<mask> t.Fatalf("Del -... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
assert.True(t, !(!clients.Del("client1-renamed") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) | <mask> t.Fatalf("Del - no such name")
<mask> }
<mask>
<mask> // remove
<mask> assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile)))
<mask>
<mask> // add host client
<mask> b, e = clients.AddHost("1.1.1.1", "host", ClientSourceARP)
<mask> if !b || e != nil {
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
clients.Init(nil) | <mask>
<mask> func TestClientsWhois(t *testing.T) {
<mask> var c Client
<mask> clients := clientsContainer{}
<mask> clients.Init()
<mask>
<mask> whois := [][]string{{"orgname", "orgname-val"}, {"country", "country-val"}}
<mask> // set whois info on new client
<mask> clients.SetWhoisInfo("1.1.1.255", wh... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
IDs: []string{"1.1.1.2"}, | <mask> assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
<mask>
<mask> // set whois info on existing client
<mask> c = Client{
<mask> IP: "1.1.1.2",
<mask> Name: "client1",
<mask> }
<mask> _, _ = clients.Add(c)
<mask> clients.SetWhoisInfo("1.1.1.2", whois)
<mask> assert.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
assert.True(t, clients.idIndex["1.1.1.2"].WhoisInfo[0][1] == "orgname-val") | <mask> Name: "client1",
<mask> }
<mask> _, _ = clients.Add(c)
<mask> clients.SetWhoisInfo("1.1.1.2", whois)
<mask> assert.True(t, clients.ipIndex["1.1.1.2"].WhoisInfo[0][1] == "orgname-val")
<mask> _ = clients.Del("client1")
<mask> }
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* cli... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/clients_test.go |
<mask> LogFile string `yaml:"log_file"` // Path to the log file. If empty, write to stdout. If "syslog", writes to syslog
<mask> Verbose bool `yaml:"verbose"` // If true, verbose logging is enabled
<mask> }
<mask>
<mask> type clientObject struct {
<mask> Name string `yaml:"name"`
<mask> IP... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/config.go | |
<mask> if !checkFiltersUpdateIntervalHours(config.DNS.FiltersUpdateIntervalHours) {
<mask> config.DNS.FiltersUpdateIntervalHours = 24
<mask> }
<mask>
<mask> for _, cy := range config.Clients {
<mask> cli := Client{
<mask> Name: cy.Name,
<mask> IP: cy.IP,
<mask> ... | [
"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",
"ke... | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/config.go | |
config.clients.WriteDiskConfig(&config.Clients) | <mask> func (c *configuration) write() error {
<mask> c.Lock()
<mask> defer c.Unlock()
<mask>
<mask> clientsList := config.clients.GetList()
<mask> for _, cli := range clientsList {
<mask> ip := cli.IP
<mask> if len(cli.MAC) != 0 {
<mask> ip = ""
<mask> }
<mask> cy := clientObject{
<mask> ... | [
"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",
"ke... | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/config.go |
<mask> os.Exit(0)
<mask> }()
<mask>
<mask> initConfig()
<mask> config.clients.Init()
<mask> initServices()
<mask>
<mask> if !config.firstRun {
<mask> // Do the upgrade if necessary
<mask> err := upgradeConfig()
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: move cod... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/home.go | |
config.clients.Init(config.Clients)
config.Clients = nil
| <mask> }
<mask>
<mask> if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
<mask> config.RlimitNoFile != 0 {
<mask> setRlimit(config.RlimitNoFile)
<mask> }
<mask>
<mask> // override bind host/port from the console
</s> * clients: multiple IP, CIDR, MAC addresses
+ /clients/find
* clients: mo... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/71ce0c6da9117440e55be3cb796781508a4a8a55 | home/home.go |
for _, ip := range Context.stats.TopClientsIP(topClientsNumber) { | <mask> Context.stats.Start()
<mask> Context.queryLog.Start()
<mask>
<mask> const topClientsNumber = 100 // the number of clients to get
<mask> for _, ip := range Context.stats.GetTopClientsIP(topClientsNumber) {
<mask> if ip == nil {
<mask> continue
<mask> }
<mask>
<mask> srcs := config.Clients... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/72098d22551313c3a76b7dcf36594bc09188db86 | internal/home/dns.go |
err := Context.stats.Close()
if err != nil {
log.Debug("closing stats: %s", err)
}
// TODO(e.burkov): Find out if it's safe. | <mask> Context.dnsFilter = nil
<mask> }
<mask>
<mask> if Context.stats != nil {
<mask> Context.stats.Close()
<mask> Context.stats = nil
<mask> }
<mask>
<mask> if Context.queryLog != nil {
<mask> Context.queryLog.Close()
</s> Pull request: 4358 stats races
Merge in DNS/adguard-home from 4358-st... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/72098d22551313c3a76b7dcf36594bc09188db86 | internal/home/dns.go |
"sync/atomic" | <mask>
<mask> import (
<mask> "encoding/json"
<mask> "net/http"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> Pull request: 4358 stats races
Merge in DNS/adguard-home from 4358-stats-races to master
... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/72098d22551313c3a76b7dcf36594bc09188db86 | internal/stats/http.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.