docstring_tokens stringlengths 18 16.9k | code_tokens stringlengths 75 1.81M | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|
keep keep add keep keep keep keep | <mask> ifeq ($(TAG_NAME),$(shell git describe --abbrev=4))
<mask> ifeq ($(CHANNEL),edge)
<mask> VERSION=$(SNAPSHOT_VERSION)
<mask> else
<mask> VERSION=$(RELEASE_VERSION)
<mask> endif
<mask> else
</s> Pull request: all: improve prerelease version selection
Merge in DNS/adguard-home from fix-prereleases to master
Squashed commit of the following:
commit 34424e41a0d4f1e22a0dede91e0de1b463d08a0a
Merge: 02e832fc0 6f50a4c96
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 17:46:43 2020 +0300
Merge branch 'master' into fix-prereleases
commit 02e832fc02dc197e40997bf566081b6d8f54420e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 23 17:27:37 2020 +0300
all: improve prerelease version selection </s> add TAG_NAME=$(shell git describe --abbrev=0)
PRERELEASE_VERSION=$(shell git describe --abbrev=0) </s> remove TAG_NAME=$(shell git describe --abbrev=0 | cut -c 1-8)
RELEASE_VERSION=$(TAG_NAME)
</s> add RELEASE_VERSION=$(shell git describe --abbrev=0 | cut -c 1-8) | https://github.com/AdguardTeam/AdGuardHome/commit/9fb6bf82c7cb7bb152ec5bfb4812720be549cd80 | Makefile |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // parseConfig loads configuration from the YAML file
<mask> func parseConfig() error {
<mask> configFile := config.getConfigFilename()
<mask> log.Tracef("Reading YAML file: %s", configFile)
<mask> yamlFile, err := readConfigFile()
<mask> if err != nil {
<mask> log.Printf("Couldn't read config file: %s", err)
<mask> return err
<mask> }
</s> Do not store last_updated in the config file anymore </s> remove return safeWriteFile(filterFilePath, body)
</s> add err := safeWriteFile(filterFilePath, body)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err </s> add // Re-load it from the disk before updating
if len(filter.Rules) == 0 {
err := filter.load()
if err != nil {
log.Printf("Failed to reload filter %s: %s", filter.URL, err)
continue
}
}
</s> remove // use the same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = time.Now()
</s> add </s> remove // TODO: Start starts rotators, stop stops rotators
once.Do(func() {
</s> add // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs") </s> add filter.LastUpdated = filter.LastTimeUpdated() </s> add once sync.Once | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | config.go |
keep add keep keep keep keep keep keep | <mask> queryLog *queryLog // Query log instance
<mask> stats *stats // General server statistics
<mask>
<mask> sync.RWMutex
<mask> ServerConfig
<mask> }
<mask>
<mask> // NewServer creates a new instance of the dnsforward.Server
</s> Do not store last_updated in the config file anymore </s> remove // TODO: Start starts rotators, stop stops rotators
once.Do(func() {
</s> add // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs") </s> remove LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"last_updated,omitempty"`
</s> add LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"-"` </s> add // Re-load it from the disk before updating
if len(filter.Rules) == 0 {
err := filter.load()
if err != nil {
log.Printf("Failed to reload filter %s: %s", filter.URL, err)
continue
}
}
</s> remove return safeWriteFile(filterFilePath, body)
</s> add err := safeWriteFile(filterFilePath, body)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err </s> remove // use the same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = time.Now()
</s> add </s> remove log.Tracef("Reading YAML file: %s", configFile)
</s> add log.Printf("Reading config file: %s", configFile) | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | dnsforward/dnsforward.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> if err != nil {
<mask> return errorx.Decorate(err, "failed to load stats from querylog")
<mask> }
<mask>
<mask> // TODO: Start starts rotators, stop stops rotators
<mask> once.Do(func() {
<mask> go s.queryLog.periodicQueryLogRotate()
<mask> go s.queryLog.runningTop.periodicHourlyTopRotate()
<mask> go s.stats.statsRotator()
<mask> })
<mask>
</s> Do not store last_updated in the config file anymore </s> add // Re-load it from the disk before updating
if len(filter.Rules) == 0 {
err := filter.load()
if err != nil {
log.Printf("Failed to reload filter %s: %s", filter.URL, err)
continue
}
}
</s> remove // use the same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = time.Now()
</s> add </s> remove log.Tracef("Reading YAML file: %s", configFile)
</s> add log.Printf("Reading config file: %s", configFile) </s> remove return safeWriteFile(filterFilePath, body)
</s> add err := safeWriteFile(filterFilePath, body)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err </s> add once sync.Once </s> add filter.LastUpdated = filter.LastTimeUpdated() | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | dnsforward/dnsforward.go |
keep keep keep keep replace replace | <mask> soa.Mbox += zone
<mask> }
<mask> return []dns.RR{&soa}
<mask> }
<mask>
<mask> var once sync.Once
</s> Do not store last_updated in the config file anymore </s> add once sync.Once </s> add filter.LastUpdated = filter.LastTimeUpdated() </s> remove return safeWriteFile(filterFilePath, body)
</s> add err := safeWriteFile(filterFilePath, body)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err </s> remove log.Tracef("Reading YAML file: %s", configFile)
</s> add log.Printf("Reading config file: %s", configFile) </s> add // Re-load it from the disk before updating
if len(filter.Rules) == 0 {
err := filter.load()
if err != nil {
log.Printf("Failed to reload filter %s: %s", filter.URL, err)
continue
}
}
</s> remove // use the same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = time.Now()
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Enabled bool `json:"enabled"`
<mask> URL string `json:"url"`
<mask> Name string `json:"name" yaml:"name"`
<mask> RulesCount int `json:"rulesCount" yaml:"-"`
<mask> LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"last_updated,omitempty"`
<mask>
<mask> dnsfilter.Filter `yaml:",inline"`
<mask> }
<mask>
<mask> // Creates a helper object for working with the user rules
</s> Do not store last_updated in the config file anymore </s> remove // use the same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = time.Now()
</s> add </s> add once sync.Once </s> remove return safeWriteFile(filterFilePath, body)
</s> add err := safeWriteFile(filterFilePath, body)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err </s> add filter.LastUpdated = filter.LastTimeUpdated() </s> add // Re-load it from the disk before updating
if len(filter.Rules) == 0 {
err := filter.load()
if err != nil {
log.Printf("Failed to reload filter %s: %s", filter.URL, err)
continue
}
}
</s> remove // TODO: Start starts rotators, stop stops rotators
once.Do(func() {
</s> add // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs") | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | filter.go |
keep keep keep add keep keep keep keep | <mask> if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
<mask> filter.ID = assignUniqueFilterID()
<mask> }
<mask>
<mask> updated, err := filter.update(force)
<mask> if err != nil {
<mask> log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
<mask> continue
</s> Do not store last_updated in the config file anymore </s> remove // use the same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = time.Now()
</s> add </s> remove log.Tracef("Reading YAML file: %s", configFile)
</s> add log.Printf("Reading config file: %s", configFile) </s> remove return safeWriteFile(filterFilePath, body)
</s> add err := safeWriteFile(filterFilePath, body)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err </s> remove // TODO: Start starts rotators, stop stops rotators
once.Do(func() {
</s> add // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs") </s> add once sync.Once </s> remove LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"last_updated,omitempty"`
</s> add LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"-"` | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | filter.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> log.Printf("Downloading update for filter %d from %s", filter.ID, filter.URL)
<mask>
<mask> // use the same update period for failed filter downloads to avoid flooding with requests
<mask> filter.LastUpdated = time.Now()
<mask>
<mask> resp, err := client.Get(filter.URL)
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close()
<mask> }
<mask> if err != nil {
</s> Do not store last_updated in the config file anymore </s> add // Re-load it from the disk before updating
if len(filter.Rules) == 0 {
err := filter.load()
if err != nil {
log.Printf("Failed to reload filter %s: %s", filter.URL, err)
continue
}
}
</s> remove return safeWriteFile(filterFilePath, body)
</s> add err := safeWriteFile(filterFilePath, body)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err </s> remove log.Tracef("Reading YAML file: %s", configFile)
</s> add log.Printf("Reading config file: %s", configFile) </s> remove // TODO: Start starts rotators, stop stops rotators
once.Do(func() {
</s> add // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs") </s> remove LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"last_updated,omitempty"`
</s> add LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"-"` </s> add filter.LastUpdated = filter.LastTimeUpdated() | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> filterFilePath := filter.Path()
<mask> log.Printf("Saving filter %d contents to: %s", filter.ID, filterFilePath)
<mask> body := []byte(strings.Join(filter.Rules, "\n"))
<mask>
<mask> return safeWriteFile(filterFilePath, body)
<mask> }
<mask>
<mask> // loads filter contents from the file in dataDir
<mask> func (filter *filter) load() error {
<mask> if !filter.Enabled {
</s> Do not store last_updated in the config file anymore </s> remove log.Tracef("Reading YAML file: %s", configFile)
</s> add log.Printf("Reading config file: %s", configFile) </s> remove // use the same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = time.Now()
</s> add </s> add // Re-load it from the disk before updating
if len(filter.Rules) == 0 {
err := filter.load()
if err != nil {
log.Printf("Failed to reload filter %s: %s", filter.URL, err)
continue
}
}
</s> remove // TODO: Start starts rotators, stop stops rotators
once.Do(func() {
</s> add // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs") </s> add once sync.Once </s> remove
var once sync.Once
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | filter.go |
keep keep add keep keep keep keep | <mask>
<mask> filter.RulesCount = rulesCount
<mask> filter.Rules = rules
<mask>
<mask> return nil
<mask> }
<mask>
</s> Do not store last_updated in the config file anymore </s> remove LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"last_updated,omitempty"`
</s> add LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"-"` </s> remove // use the same update period for failed filter downloads to avoid flooding with requests
filter.LastUpdated = time.Now()
</s> add </s> remove
var once sync.Once
</s> add </s> add // Re-load it from the disk before updating
if len(filter.Rules) == 0 {
err := filter.load()
if err != nil {
log.Printf("Failed to reload filter %s: %s", filter.URL, err)
continue
}
}
</s> remove return safeWriteFile(filterFilePath, body)
</s> add err := safeWriteFile(filterFilePath, body)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err </s> remove log.Tracef("Reading YAML file: %s", configFile)
</s> add log.Printf("Reading config file: %s", configFile) | https://github.com/AdguardTeam/AdGuardHome/commit/9ff420bb52e5f863dbd422e0ff7c7dd4e8f9fb6b | filter.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep | <mask> }
<mask> },
<mask> "WarnUnmatchedDirective": true,
<mask>
<mask> "DisableAll": true,
<mask> "Enable": [
<mask> "deadcode",
<mask> "gocyclo",
<mask> "gofmt",
<mask> "goimports",
<mask> "golint",
<mask> "gosimple",
<mask> "ineffassign",
<mask> "interfacer",
<mask> "lll",
<mask> "misspell",
<mask> "nakedret",
<mask> "unconvert",
<mask> "unparam",
<mask> "unused",
<mask> "vet"
<mask> ],
<mask>
<mask> "Cyclo": 20,
<mask> "LineLength": 200
<mask> } </s> Use EnableAll in gometalinter config </s> remove if rule.isImportant {
</s> add if r.isImportant { </s> remove } else if rule.isWhitelist {
</s> add } else if r.isWhitelist { </s> remove d.blackList.Add(&rule)
</s> add d.blackList.Add(&r) </s> remove err := rule.compile()
</s> add err := r.compile() </s> remove err := rule.parseOptions()
</s> add err := r.parseOptions() </s> remove rule := rule{
</s> add r := rule{ | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | .gometalinter.json |
keep replace keep keep replace | <mask> type formatHandler func(hashparam string) string
<mask> type handleBodyHandler func(body []byte, hashes map[string]bool) (Result, error)
<mask>
<mask> // real implementation of lookup/check
<mask> func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody handleBodyHandler) (Result, error) {
</s> Use EnableAll in gometalinter config </s> remove destination.Add(&rule)
</s> add destination.Add(&r) </s> remove if strings.HasPrefix(rule.text, "@@") {
rule.isWhitelist = true
rule.text = rule.text[2:]
</s> add if strings.HasPrefix(r.text, "@@") {
r.isWhitelist = true
r.text = r.text[2:] </s> remove value := currentValues[elapsed]
</s> add v := currentValues[elapsed] </s> remove if rule.isImportant {
</s> add if r.isImportant { </s> remove rule.extractShortcut()
</s> add r.extractShortcut() | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> // Start parsing the rule
<mask> rule := rule{
<mask> text: input, // will be modified
<mask> originalText: input,
<mask> listID: filterListID,
<mask> }
<mask>
</s> Use EnableAll in gometalinter config </s> remove rule := rule{
</s> add r := rule{ </s> remove d.blackList.Add(&rule)
</s> add d.blackList.Add(&r) </s> remove if strings.HasPrefix(rule.text, "@@") {
rule.isWhitelist = true
rule.text = rule.text[2:]
</s> add if strings.HasPrefix(r.text, "@@") {
r.isWhitelist = true
r.text = r.text[2:] </s> remove destination.Add(&rule)
</s> add destination.Add(&r) </s> remove err := rule.compile()
</s> add err := r.compile() </s> remove err := rule.parseOptions()
</s> add err := r.parseOptions() | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep keep keep replace replace replace keep keep replace | <mask> listID: filterListID,
<mask> }
<mask>
<mask> // Mark rule as whitelist if it starts with @@
<mask> if strings.HasPrefix(rule.text, "@@") {
<mask> rule.isWhitelist = true
<mask> rule.text = rule.text[2:]
<mask> }
<mask>
<mask> err := rule.parseOptions()
</s> Use EnableAll in gometalinter config </s> remove } else if rule.isWhitelist {
</s> add } else if r.isWhitelist { </s> remove rule := rule{
</s> add r := rule{ </s> remove if rule.isImportant {
</s> add if r.isImportant { </s> remove rule := rule{
</s> add r := rule{ </s> remove err := rule.compile()
</s> add err := r.compile() | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> rule.extractShortcut()
<mask>
<mask> if !enableDelayedCompilation {
<mask> err := rule.compile()
<mask> if err != nil {
<mask> return err
</s> Use EnableAll in gometalinter config </s> remove err := rule.compile()
</s> add err := r.compile() </s> remove err := rule.parseOptions()
</s> add err := r.parseOptions() </s> remove if strings.HasPrefix(rule.text, "@@") {
rule.isWhitelist = true
rule.text = rule.text[2:]
</s> add if strings.HasPrefix(r.text, "@@") {
r.isWhitelist = true
r.text = r.text[2:] </s> remove if rule.isImportant {
</s> add if r.isImportant { </s> remove } else if rule.isWhitelist {
</s> add } else if r.isWhitelist { </s> remove destination.Add(&rule)
</s> add destination.Add(&r) | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> rule.extractShortcut()
<mask>
<mask> if !enableDelayedCompilation {
<mask> err := rule.compile()
<mask> if err != nil {
<mask> return err
<mask> }
<mask> }
<mask>
</s> Use EnableAll in gometalinter config </s> remove rule.extractShortcut()
</s> add r.extractShortcut() </s> remove err := rule.parseOptions()
</s> add err := r.parseOptions() </s> remove if strings.HasPrefix(rule.text, "@@") {
rule.isWhitelist = true
rule.text = rule.text[2:]
</s> add if strings.HasPrefix(r.text, "@@") {
r.isWhitelist = true
r.text = r.text[2:] </s> remove if rule.isImportant {
</s> add if r.isImportant { </s> remove } else if rule.isWhitelist {
</s> add } else if r.isWhitelist { </s> remove destination.Add(&rule)
</s> add destination.Add(&r) | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep replace keep keep keep keep keep keep keep keep replace keep keep keep | <mask>
<mask> destination := d.blackList
<mask> if rule.isImportant {
<mask> destination = d.important
<mask> } else if rule.isWhitelist {
<mask> destination = d.whiteList
<mask> }
<mask>
<mask> destination := d.blackList
<mask> if rule.isImportant {
<mask> destination = d.important
<mask> } else if rule.isWhitelist {
<mask> destination = d.whiteList
<mask> }
<mask>
</s> Use EnableAll in gometalinter config </s> remove if strings.HasPrefix(rule.text, "@@") {
rule.isWhitelist = true
rule.text = rule.text[2:]
</s> add if strings.HasPrefix(r.text, "@@") {
r.isWhitelist = true
r.text = r.text[2:] </s> remove err := rule.parseOptions()
</s> add err := r.parseOptions() </s> remove err := rule.compile()
</s> add err := r.compile() </s> remove rule.extractShortcut()
</s> add r.extractShortcut() </s> remove value := currentValues[elapsed]
</s> add v := currentValues[elapsed] | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> d.storageMutex.Lock()
<mask> d.storage[input] = true
<mask> d.storageMutex.Unlock()
<mask> destination.Add(&rule)
<mask> return nil
<mask> }
<mask>
<mask> // Parses the hosts-syntax rules. Returns false if the input string is not of hosts-syntax.
<mask> func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool {
</s> Use EnableAll in gometalinter config </s> remove func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody handleBodyHandler) (Result, error) {
</s> add func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) { </s> remove type handleBodyHandler func(body []byte, hashes map[string]bool) (Result, error)
</s> add type bodyHandler func(body []byte, hashes map[string]bool) (Result, error) </s> remove } else if rule.isWhitelist {
</s> add } else if r.isWhitelist { </s> remove rule := rule{
</s> add r := rule{ </s> remove rule := rule{
</s> add r := rule{ </s> remove d.blackList.Add(&rule)
</s> add d.blackList.Add(&r) | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> d.storage[input] = true
<mask> d.storageMutex.Unlock()
<mask>
<mask> for _, host := range fields[1:] {
<mask> rule := rule{
<mask> text: host,
<mask> originalText: input,
<mask> listID: filterListID,
<mask> ip: addr,
<mask> }
</s> Use EnableAll in gometalinter config </s> remove rule := rule{
</s> add r := rule{ </s> remove d.blackList.Add(&rule)
</s> add d.blackList.Add(&r) </s> remove if strings.HasPrefix(rule.text, "@@") {
rule.isWhitelist = true
rule.text = rule.text[2:]
</s> add if strings.HasPrefix(r.text, "@@") {
r.isWhitelist = true
r.text = r.text[2:] </s> remove } else if rule.isWhitelist {
</s> add } else if r.isWhitelist { </s> remove destination.Add(&rule)
</s> add destination.Add(&r) </s> remove err := rule.parseOptions()
</s> add err := r.parseOptions() | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> originalText: input,
<mask> listID: filterListID,
<mask> ip: addr,
<mask> }
<mask> d.blackList.Add(&rule)
<mask> }
<mask> return true
<mask> }
<mask>
<mask> // matchHost is a low-level way to check only if hostname is filtered by rules, skipping expensive safebrowsing and parental lookups
</s> Use EnableAll in gometalinter config </s> remove rule := rule{
</s> add r := rule{ </s> remove rule := rule{
</s> add r := rule{ </s> remove destination.Add(&rule)
</s> add destination.Add(&r) </s> remove if strings.HasPrefix(rule.text, "@@") {
rule.isWhitelist = true
rule.text = rule.text[2:]
</s> add if strings.HasPrefix(r.text, "@@") {
r.isWhitelist = true
r.text = r.text[2:] </s> remove err := rule.parseOptions()
</s> add err := r.parseOptions() </s> remove } else if rule.isWhitelist {
</s> add } else if r.isWhitelist { | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsfilter/dnsfilter.go |
keep keep replace keep replace replace keep keep keep keep | <mask> countname := name + "_count"
<mask> currentValues := p.Entries[countname]
<mask> value := currentValues[elapsed]
<mask> // log.Tracef("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1)
<mask> value++
<mask> currentValues[elapsed] = value
<mask> p.Entries[countname] = currentValues
<mask> }
<mask> {
<mask> totalname := name + "_sum"
</s> Use EnableAll in gometalinter config </s> remove err := rule.parseOptions()
</s> add err := r.parseOptions() </s> remove if rule.isImportant {
</s> add if r.isImportant { </s> remove rule := rule{
</s> add r := rule{ </s> remove } else if rule.isWhitelist {
</s> add } else if r.isWhitelist { </s> remove if strings.HasPrefix(rule.text, "@@") {
rule.isWhitelist = true
rule.text = rule.text[2:]
</s> add if strings.HasPrefix(r.text, "@@") {
r.isWhitelist = true
r.text = r.text[2:] | https://github.com/AdguardTeam/AdGuardHome/commit/a0157e39c6d580f5dbea968dd32e820420c686d7 | dnsforward/stats.go |
keep keep keep keep replace keep keep keep keep keep | <mask> <li>
<mask> <code>sdns://...</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_sdns') }} />
<mask> </li>
<mask> <li>
<mask> <code>[/host.com/]1.1.1.1</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_reserved') }} />
<mask> </li>
<mask> </ol>
<mask> </div>
<mask> );
<mask>
</s> * control, client: fix issues from review </s> remove return
</s> add return defaultUpstream, nil </s> remove return
</s> add return defaultUpstream, nil </s> remove return
</s> add return defaultUpstream, err </s> remove defaultUpstream = true
u, defaultUpstream, err = separateUpstream(u)
</s> add u, defaultUpstream, err := separateUpstream(u) </s> remove func validateUpstream(u string) (defaultUpstream bool, err error) {
</s> add func validateUpstream(u string) (bool, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a01ba5dd4d04bd722cfca2cee950411f3deaabff | client/src/components/Settings/Upstream/Examples.js |
keep replace keep replace replace keep keep | <mask>
<mask> func validateUpstream(u string) (defaultUpstream bool, err error) {
<mask> // Check if user tries to specify upstream for domain
<mask> defaultUpstream = true
<mask> u, defaultUpstream, err = separateUpstream(u)
<mask> if err != nil {
<mask> return
</s> * control, client: fix issues from review </s> remove return
</s> add return defaultUpstream, nil </s> remove return
</s> add return defaultUpstream, nil </s> remove return
</s> add return defaultUpstream, err </s> remove <code>[/host.com/]1.1.1.1</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_reserved') }} />
</s> add <code>[/example.local/]1.1.1.1</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_reserved') }} /> | https://github.com/AdguardTeam/AdGuardHome/commit/a01ba5dd4d04bd722cfca2cee950411f3deaabff | control.go |
keep keep keep replace keep keep keep keep replace keep keep keep | <mask> defaultUpstream = true
<mask> u, defaultUpstream, err = separateUpstream(u)
<mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> // The special server address '#' means "use the default servers"
<mask> if u == "#" && !defaultUpstream {
<mask> return
<mask> }
<mask>
<mask> // Check if the upstream has a valid protocol prefix
</s> * control, client: fix issues from review </s> remove return
</s> add return defaultUpstream, nil </s> remove defaultUpstream = true
u, defaultUpstream, err = separateUpstream(u)
</s> add u, defaultUpstream, err := separateUpstream(u) </s> remove func validateUpstream(u string) (defaultUpstream bool, err error) {
</s> add func validateUpstream(u string) (bool, error) { </s> remove <code>[/host.com/]1.1.1.1</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_reserved') }} />
</s> add <code>[/example.local/]1.1.1.1</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_reserved') }} /> | https://github.com/AdguardTeam/AdGuardHome/commit/a01ba5dd4d04bd722cfca2cee950411f3deaabff | control.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // Check if the upstream has a valid protocol prefix
<mask> for _, proto := range protocols {
<mask> if strings.HasPrefix(u, proto) {
<mask> return
<mask> }
<mask> }
<mask>
<mask> // Return error if the upstream contains '://' without any valid protocol
<mask> if strings.Contains(u, "://") {
</s> * control, client: fix issues from review </s> remove return
</s> add return defaultUpstream, nil </s> remove return
</s> add return defaultUpstream, err </s> remove defaultUpstream = true
u, defaultUpstream, err = separateUpstream(u)
</s> add u, defaultUpstream, err := separateUpstream(u) </s> remove func validateUpstream(u string) (defaultUpstream bool, err error) {
</s> add func validateUpstream(u string) (bool, error) { </s> remove <code>[/host.com/]1.1.1.1</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_reserved') }} />
</s> add <code>[/example.local/]1.1.1.1</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_reserved') }} /> | https://github.com/AdguardTeam/AdGuardHome/commit/a01ba5dd4d04bd722cfca2cee950411f3deaabff | control.go |
keep keep keep keep replace replace keep keep keep keep replace keep keep keep | <mask> // Array with IP networks for this network interface.
<mask> Subnets []*net.IPNet `json:"-"`
<mask> }
<mask>
<mask> // MarshalJSON implements the json.Marshaler interface for *NetInterface.
<mask> func (iface *NetInterface) MarshalJSON() ([]byte, error) {
<mask> type netInterface NetInterface
<mask> return json.Marshal(&struct {
<mask> HardwareAddr string `json:"hardware_address"`
<mask> Flags string `json:"flags"`
<mask> *netInterface
<mask> }{
<mask> HardwareAddr: iface.HardwareAddr.String(),
<mask> Flags: iface.Flags.String(),
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove // MarshalJSON implements the json.Marshaler interface for *Lease.
func (l *Lease) MarshalJSON() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for Lease.
func (l Lease) MarshalJSON() ([]byte, error) { </s> remove netInterface: (*netInterface)(iface),
</s> add netInterface: netInterface(iface), </s> remove HWAddr string `json:"mac"`
</s> add </s> remove lease: (*lease)(l),
</s> add lease: lease(l), </s> remove *lease
</s> add lease | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/aghnet/net.go |
keep keep keep keep replace keep keep keep keep keep | <mask> *netInterface
<mask> }{
<mask> HardwareAddr: iface.HardwareAddr.String(),
<mask> Flags: iface.Flags.String(),
<mask> netInterface: (*netInterface)(iface),
<mask> })
<mask> }
<mask>
<mask> // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only
<mask> // we do not return link-local addresses here
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove *netInterface
</s> add netInterface </s> remove lease: (*lease)(l),
</s> add lease: lease(l), </s> remove // MarshalJSON implements the json.Marshaler interface for *NetInterface.
func (iface *NetInterface) MarshalJSON() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalJSON() ([]byte, error) { </s> remove // LastTimeUpdated returns the time when the filter was last time updated
func (filter *filter) LastTimeUpdated() time.Time {
filterFilePath := filter.Path()
s, err := os.Stat(filterFilePath)
if os.IsNotExist(err) {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
if err != nil {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
// filter file modified time
return s.ModTime()
}
</s> add </s> remove func upgradeSchema1to2(diskConf yobj) error {
</s> add func upgradeSchema1to2(diskConf yobj) (err error) { </s> remove func upgradeSchema0to1(diskConf yobj) error {
</s> add func upgradeSchema0to1(diskConf yobj) (err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/aghnet/net.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> func (l *Lease) IsStatic() (ok bool) {
<mask> return l != nil && l.Expiry.Unix() == leaseExpireStatic
<mask> }
<mask>
<mask> // MarshalJSON implements the json.Marshaler interface for *Lease.
<mask> func (l *Lease) MarshalJSON() ([]byte, error) {
<mask> var expiryStr string
<mask> if !l.IsStatic() {
<mask> // The front-end is waiting for RFC 3999 format of the time
<mask> // value. It also shouldn't got an Expiry field for static
<mask> // leases.
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove // MarshalJSON implements the json.Marshaler interface for *NetInterface.
func (iface *NetInterface) MarshalJSON() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalJSON() ([]byte, error) { </s> remove lease: (*lease)(l),
</s> add lease: lease(l), </s> remove HWAddr string `json:"mac"`
</s> add </s> remove // LastTimeUpdated returns the time when the filter was last time updated
func (filter *filter) LastTimeUpdated() time.Time {
filterFilePath := filter.Path()
s, err := os.Stat(filterFilePath)
if os.IsNotExist(err) {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
if err != nil {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
// filter file modified time
return s.ModTime()
}
</s> add </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { </s> remove func (f *Filtering) load(filter *filter) error {
</s> add func (f *Filtering) load(filter *filter) (err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/dhcpd/dhcpd.go |
keep replace keep keep keep replace keep | <mask> Expiry string `json:"expires,omitempty"`
<mask> *lease
<mask> }{
<mask> HWAddr: l.HWAddr.String(),
<mask> Expiry: expiryStr,
<mask> lease: (*lease)(l),
<mask> })
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> add HWAddr string `json:"mac"` </s> remove HWAddr string `json:"mac"`
</s> add </s> remove *netInterface
</s> add netInterface </s> remove netInterface: (*netInterface)(iface),
</s> add netInterface: netInterface(iface), </s> remove // MarshalJSON implements the json.Marshaler interface for *Lease.
func (l *Lease) MarshalJSON() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for Lease.
func (l Lease) MarshalJSON() ([]byte, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/dhcpd/dhcpd.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // UnmarshalJSON implements the json.Unmarshaler interface for *Lease.
<mask> func (l *Lease) UnmarshalJSON(data []byte) (err error) {
<mask> type lease Lease
<mask> aux := struct {
<mask> HWAddr string `json:"mac"`
<mask> *lease
<mask> }{
<mask> lease: (*lease)(l),
<mask> }
<mask> if err = json.Unmarshal(data, &aux); err != nil {
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> add HWAddr string `json:"mac"` </s> remove lease: (*lease)(l),
</s> add lease: lease(l), </s> remove *lease
</s> add lease </s> remove // MarshalJSON implements the json.Marshaler interface for *Lease.
func (l *Lease) MarshalJSON() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for Lease.
func (l Lease) MarshalJSON() ([]byte, error) { </s> remove // MarshalJSON implements the json.Marshaler interface for *NetInterface.
func (iface *NetInterface) MarshalJSON() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalJSON() ([]byte, error) { </s> remove func (f *Filtering) load(filter *filter) error {
</s> add func (f *Filtering) load(filter *filter) (err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/dhcpd/dhcpd.go |
keep keep add keep keep keep keep | <mask> type lease Lease
<mask> aux := struct {
<mask> *lease
<mask> }{
<mask> lease: (*lease)(l),
<mask> }
<mask> if err = json.Unmarshal(data, &aux); err != nil {
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove HWAddr string `json:"mac"`
</s> add </s> remove *lease
</s> add lease </s> remove lease: (*lease)(l),
</s> add lease: lease(l), </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/dhcpd/dhcpd.go |
keep keep add keep keep keep keep keep keep | <mask>
<mask> import (
<mask> "bufio"
<mask> "fmt"
<mask> "hash/crc32"
<mask> "io"
<mask> "io/ioutil"
<mask> "net/http"
<mask> "os"
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> add "errors" </s> add "errors" </s> remove if _, err := os.Stat(coreFilePath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil {
log.Printf("Cannot remove %s due to %s", coreFilePath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. </s> remove st, _ := file.Stat()
</s> add </s> remove *netInterface
</s> add netInterface </s> remove netInterface: (*netInterface)(iface),
</s> add netInterface: netInterface(iface), | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return updated, nil
<mask> }
<mask>
<mask> // loads filter contents from the file in dataDir
<mask> func (f *Filtering) load(filter *filter) error {
<mask> filterFilePath := filter.Path()
<mask> log.Tracef("Loading filter %d contents to: %s", filter.ID, filterFilePath)
<mask>
<mask> if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
<mask> // do nothing, file doesn't exist
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove log.Tracef("Loading filter %d contents to: %s", filter.ID, filterFilePath)
</s> add </s> remove if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
// do nothing, file doesn't exist
return err
}
</s> add log.Tracef("filtering: loading filter %d contents to: %s", filter.ID, filterFilePath) </s> remove // LastTimeUpdated returns the time when the filter was last time updated
func (filter *filter) LastTimeUpdated() time.Time {
filterFilePath := filter.Path()
s, err := os.Stat(filterFilePath)
if os.IsNotExist(err) {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
if err != nil {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
// filter file modified time
return s.ModTime()
}
</s> add </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
</s> add st, err := file.Stat()
if err != nil {
return fmt.Errorf("getting filter file stat: %w", err)
}
log.Tracef("filtering: File %s, id %d, length %d", filterFilePath, filter.ID, st.Size())
</s> remove func upgradeSchema0to1(diskConf yobj) error {
</s> add func upgradeSchema0to1(diskConf yobj) (err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/filter.go |
keep keep keep replace keep replace replace replace replace keep keep | <mask> // loads filter contents from the file in dataDir
<mask> func (f *Filtering) load(filter *filter) error {
<mask> filterFilePath := filter.Path()
<mask> log.Tracef("Loading filter %d contents to: %s", filter.ID, filterFilePath)
<mask>
<mask> if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
<mask> // do nothing, file doesn't exist
<mask> return err
<mask> }
<mask>
<mask> file, err := os.Open(filterFilePath)
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove func (f *Filtering) load(filter *filter) error {
</s> add func (f *Filtering) load(filter *filter) (err error) { </s> remove // LastTimeUpdated returns the time when the filter was last time updated
func (filter *filter) LastTimeUpdated() time.Time {
filterFilePath := filter.Path()
s, err := os.Stat(filterFilePath)
if os.IsNotExist(err) {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
if err != nil {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
// filter file modified time
return s.ModTime()
}
</s> add </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
</s> add st, err := file.Stat()
if err != nil {
return fmt.Errorf("getting filter file stat: %w", err)
}
log.Tracef("filtering: File %s, id %d, length %d", filterFilePath, filter.ID, st.Size())
</s> remove func upgradeSchema0to1(diskConf yobj) error {
</s> add func upgradeSchema0to1(diskConf yobj) (err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/filter.go |
keep keep keep replace replace keep keep replace | <mask> }
<mask>
<mask> file, err := os.Open(filterFilePath)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> defer file.Close()
<mask> st, _ := file.Stat()
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
</s> add st, err := file.Stat()
if err != nil {
return fmt.Errorf("getting filter file stat: %w", err)
}
log.Tracef("filtering: File %s, id %d, length %d", filterFilePath, filter.ID, st.Size())
</s> remove if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
// do nothing, file doesn't exist
return err
}
</s> add log.Tracef("filtering: loading filter %d contents to: %s", filter.ID, filterFilePath) </s> remove if _, err := os.Stat(dnsFilterPath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil {
log.Printf("Cannot remove %s due to %s", dnsFilterPath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. </s> remove data = []byte(psdata)
</s> add </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/filter.go |
keep keep keep replace replace keep keep keep keep replace keep keep | <mask> defer file.Close()
<mask> st, _ := file.Stat()
<mask>
<mask> log.Tracef("File %s, id %d, length %d",
<mask> filterFilePath, filter.ID, st.Size())
<mask> rulesCount, checksum, _ := f.parseFilterContents(file)
<mask>
<mask> filter.RulesCount = rulesCount
<mask> filter.checksum = checksum
<mask> filter.LastUpdated = filter.LastTimeUpdated()
<mask>
<mask> return nil
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove st, _ := file.Stat()
</s> add </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
// do nothing, file doesn't exist
return err
}
</s> add log.Tracef("filtering: loading filter %d contents to: %s", filter.ID, filterFilePath) </s> remove log.Error("Can't find AdGuardHome process: %s code:%d", err, code)
</s> add log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> remove func (f *Filtering) load(filter *filter) error {
</s> add func (f *Filtering) load(filter *filter) (err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/filter.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> func (filter *filter) Path() string {
<mask> return filepath.Join(Context.getDataDir(), filterDir, strconv.FormatInt(filter.ID, 10)+".txt")
<mask> }
<mask>
<mask> // LastTimeUpdated returns the time when the filter was last time updated
<mask> func (filter *filter) LastTimeUpdated() time.Time {
<mask> filterFilePath := filter.Path()
<mask> s, err := os.Stat(filterFilePath)
<mask> if os.IsNotExist(err) {
<mask> // if the filter file does not exist, return 0001-01-01
<mask> return time.Time{}
<mask> }
<mask>
<mask> if err != nil {
<mask> // if the filter file does not exist, return 0001-01-01
<mask> return time.Time{}
<mask> }
<mask>
<mask> // filter file modified time
<mask> return s.ModTime()
<mask> }
<mask>
<mask> func enableFilters(async bool) {
<mask> var whiteFilters []dnsfilter.Filter
<mask> filters := []dnsfilter.Filter{{
<mask> Data: []byte(strings.Join(config.UserRules, "\n")),
<mask> }}
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove log.Tracef("Loading filter %d contents to: %s", filter.ID, filterFilePath)
</s> add </s> remove func (f *Filtering) load(filter *filter) error {
</s> add func (f *Filtering) load(filter *filter) (err error) { </s> remove if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
// do nothing, file doesn't exist
return err
}
</s> add log.Tracef("filtering: loading filter %d contents to: %s", filter.ID, filterFilePath) </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove // MarshalJSON implements the json.Marshaler interface for *Lease.
func (l *Lease) MarshalJSON() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for Lease.
func (l Lease) MarshalJSON() ([]byte, error) { </s> remove if _, err := os.Stat(dnsFilterPath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil {
log.Printf("Cannot remove %s due to %s", dnsFilterPath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/filter.go |
keep add keep keep keep keep keep keep | <mask>
<mask> import (
<mask> "fmt"
<mask> "io/ioutil"
<mask> "os"
<mask> "runtime"
<mask> "strconv"
<mask> "strings"
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> add "errors" </s> add "errors" </s> remove if _, err := os.Stat(coreFilePath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil {
log.Printf("Cannot remove %s due to %s", coreFilePath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. </s> remove st, _ := file.Stat()
</s> add </s> remove *netInterface
</s> add netInterface </s> remove netInterface: (*netInterface)(iface),
</s> add netInterface: netInterface(iface), | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Send SIGHUP to a process with ID taken from our pid-file
<mask> // If pid-file doesn't exist, find our PID using 'ps' command
<mask> func sendSigReload() {
<mask> if runtime.GOOS == "windows" {
<mask> log.Error("Not implemented on Windows")
<mask> return
<mask> }
<mask>
<mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
<mask> data, err := ioutil.ReadFile(pidfile)
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove if os.IsNotExist(err) {
</s> add if errors.Is(err, os.ErrNotExist) { </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { </s> remove log.Tracef("Loading filter %d contents to: %s", filter.ID, filterFilePath)
</s> add </s> remove // LastTimeUpdated returns the time when the filter was last time updated
func (filter *filter) LastTimeUpdated() time.Time {
filterFilePath := filter.Path()
s, err := os.Stat(filterFilePath)
if os.IsNotExist(err) {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
if err != nil {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
// filter file modified time
return s.ModTime()
}
</s> add </s> remove func (f *Filtering) load(filter *filter) error {
</s> add func (f *Filtering) load(filter *filter) (err error) { </s> remove if _, err := os.Stat(dnsFilterPath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil {
log.Printf("Cannot remove %s due to %s", dnsFilterPath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/service.go |
keep keep keep keep replace keep keep keep keep replace keep | <mask> }
<mask>
<mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
<mask> data, err := ioutil.ReadFile(pidfile)
<mask> if os.IsNotExist(err) {
<mask> var code int
<mask> var psdata string
<mask> code, psdata, err = aghos.RunCommand("ps", "-C", serviceName, "-o", "pid=")
<mask> if err != nil || code != 0 {
<mask> log.Error("Can't find AdGuardHome process: %s code:%d", err, code)
<mask> return
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove data = []byte(psdata)
</s> add </s> remove log.Error("Not implemented on Windows")
</s> add log.Error("not implemented on windows")
</s> remove log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add log.Error("reading pid file %s: %s", pidfile, err)
</s> remove // LastTimeUpdated returns the time when the filter was last time updated
func (filter *filter) LastTimeUpdated() time.Time {
filterFilePath := filter.Path()
s, err := os.Stat(filterFilePath)
if os.IsNotExist(err) {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
if err != nil {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
// filter file modified time
return s.ModTime()
}
</s> add </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil || code != 0 {
<mask> log.Error("Can't find AdGuardHome process: %s code:%d", err, code)
<mask> return
<mask> }
<mask> data = []byte(psdata)
<mask>
<mask> } else if err != nil {
<mask> log.Error("Can't read PID file %s: %s", pidfile, err)
<mask> return
<mask> }
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove log.Error("Can't find AdGuardHome process: %s code:%d", err, code)
</s> add log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> remove log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add log.Error("reading pid file %s: %s", pidfile, err)
</s> remove if os.IsNotExist(err) {
</s> add if errors.Is(err, os.ErrNotExist) { </s> add data = []byte(psdata) </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/service.go |
keep add keep keep keep keep keep | <mask> }
<mask>
<mask> } else if err != nil {
<mask> log.Error("reading pid file %s: %s", pidfile, err)
<mask>
<mask> return
<mask> }
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add log.Error("reading pid file %s: %s", pidfile, err)
</s> remove data = []byte(psdata)
</s> add </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { </s> remove log.Error("Can't find AdGuardHome process: %s code:%d", err, code)
</s> add log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> remove if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
// do nothing, file doesn't exist
return err
}
</s> add log.Tracef("filtering: loading filter %d contents to: %s", filter.ID, filterFilePath) | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> data = []byte(psdata)
<mask>
<mask> } else if err != nil {
<mask> log.Error("Can't read PID file %s: %s", pidfile, err)
<mask> return
<mask> }
<mask>
<mask> parts := strings.SplitN(string(data), "\n", 2)
<mask> if len(parts) == 0 {
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove data = []byte(psdata)
</s> add </s> add data = []byte(psdata) </s> remove log.Error("Can't find AdGuardHome process: %s code:%d", err, code)
</s> add log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove if os.IsNotExist(err) {
</s> add if errors.Is(err, os.ErrNotExist) { </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/service.go |
keep replace keep keep keep keep replace keep | <mask> err = os.Remove(launchdStdoutPath)
<mask> if err != nil && !os.IsNotExist(err) {
<mask> log.Printf("removing stdout file: %s", err)
<mask> }
<mask>
<mask> err = os.Remove(launchdStderrPath)
<mask> if err != nil && !os.IsNotExist(err) {
<mask> log.Printf("removing stderr file: %s", err)
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove if _, err := os.Stat(dnsFilterPath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil {
log.Printf("Cannot remove %s due to %s", dnsFilterPath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. </s> remove if _, err := os.Stat(coreFilePath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil {
log.Printf("Cannot remove %s due to %s", coreFilePath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. </s> remove if err != nil {
return err
</s> add if errors.Is(err, os.ErrNotExist) {
// Do nothing, file doesn't exist.
return nil
} else if err != nil {
return fmt.Errorf("opening filter file: %w", err) </s> remove data = []byte(psdata)
</s> add </s> add data = []byte(psdata) | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/service.go |
keep add keep keep keep keep keep keep | <mask>
<mask> import (
<mask> "fmt"
<mask> "net/url"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
<mask> "runtime"
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> add "errors" </s> add "errors" </s> remove if _, err := os.Stat(coreFilePath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil {
log.Printf("Cannot remove %s due to %s", coreFilePath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. </s> remove st, _ := file.Stat()
</s> add </s> remove *netInterface
</s> add netInterface </s> remove netInterface: (*netInterface)(iface),
</s> add netInterface: netInterface(iface), | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/upgrade.go |
keep keep replace keep keep keep replace replace replace replace replace replace replace keep keep | <mask> // The first schema upgrade:
<mask> // No more "dnsfilter.txt", filters are now kept in data/filters/
<mask> func upgradeSchema0to1(diskConf yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> dnsFilterPath := filepath.Join(Context.workDir, "dnsfilter.txt")
<mask> if _, err := os.Stat(dnsFilterPath); !os.IsNotExist(err) {
<mask> log.Printf("Deleting %s as we don't need it anymore", dnsFilterPath)
<mask> err = os.Remove(dnsFilterPath)
<mask> if err != nil {
<mask> log.Printf("Cannot remove %s due to %s", dnsFilterPath, err)
<mask> // not fatal, move on
<mask> }
<mask> }
<mask>
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove if _, err := os.Stat(coreFilePath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil {
log.Printf("Cannot remove %s due to %s", coreFilePath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", coreFilePath)
err = os.Remove(coreFilePath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. </s> remove func upgradeSchema1to2(diskConf yobj) error {
</s> add func upgradeSchema1to2(diskConf yobj) (err error) { </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { </s> remove // LastTimeUpdated returns the time when the filter was last time updated
func (filter *filter) LastTimeUpdated() time.Time {
filterFilePath := filter.Path()
s, err := os.Stat(filterFilePath)
if os.IsNotExist(err) {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
if err != nil {
// if the filter file does not exist, return 0001-01-01
return time.Time{}
}
// filter file modified time
return s.ModTime()
}
</s> add </s> remove if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
// do nothing, file doesn't exist
return err
}
</s> add log.Tracef("filtering: loading filter %d contents to: %s", filter.ID, filterFilePath) | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/upgrade.go |
keep keep keep replace keep keep keep replace replace replace replace replace replace replace | <mask> // Second schema upgrade:
<mask> // coredns is now dns in config
<mask> // delete 'Corefile', since we don't use that anymore
<mask> func upgradeSchema1to2(diskConf yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> coreFilePath := filepath.Join(Context.workDir, "Corefile")
<mask> if _, err := os.Stat(coreFilePath); !os.IsNotExist(err) {
<mask> log.Printf("Deleting %s as we don't need it anymore", coreFilePath)
<mask> err = os.Remove(coreFilePath)
<mask> if err != nil {
<mask> log.Printf("Cannot remove %s due to %s", coreFilePath, err)
<mask> // not fatal, move on
<mask> }
</s> Pull request: home: imp err handling, marshalling
Merge in DNS/adguard-home from imp-code to master
Squashed commit of the following:
commit 9433fb9b0154a1cfaf804edbfa8531efbbcbf68a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 14 19:24:32 2021 +0300
home: imp err handling, marshalling </s> remove if _, err := os.Stat(dnsFilterPath); !os.IsNotExist(err) {
log.Printf("Deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil {
log.Printf("Cannot remove %s due to %s", dnsFilterPath, err)
// not fatal, move on
}
</s> add log.Printf("deleting %s as we don't need it anymore", dnsFilterPath)
err = os.Remove(dnsFilterPath)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Info("warning: %s", err)
// Go on. </s> remove func upgradeSchema0to1(diskConf yobj) error {
</s> add func upgradeSchema0to1(diskConf yobj) (err error) { </s> remove if err != nil && !os.IsNotExist(err) {
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) { </s> remove log.Tracef("Loading filter %d contents to: %s", filter.ID, filterFilePath)
</s> add </s> remove if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
// do nothing, file doesn't exist
return err
}
</s> add log.Tracef("filtering: loading filter %d contents to: %s", filter.ID, filterFilePath) | https://github.com/AdguardTeam/AdGuardHome/commit/a031cae447e5f77a88f9d7a8c2c1d1dcb1fda11c | internal/home/upgrade.go |
keep keep keep keep replace keep keep keep keep keep | <mask> </Trans>
<mask> </div>
<mask> )}
<mask> <Statistics
<mask> interval={stats.interval}
<mask> dnsQueries={stats.dnsQueries}
<mask> blockedFiltering={stats.blockedFiltering}
<mask> replacedSafebrowsing={stats.replacedSafebrowsing}
<mask> replacedParental={stats.replacedParental}
<mask> numDnsQueries={stats.numDnsQueries}
</s> Pull request 1792: 5633-invalid-date
Updates #5633.
Squashed commit of the following:
commit 889bc7acb82472d72d7b3103554e70342513a567
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 30 14:31:42 2023 +0300
client: fix dashboard date </s> remove const interval = useSelector((state) => state.stats.interval);
</s> add const interval = msToDays(useSelector((state) => state.stats.interval)); </s> add import { msToDays } from '../../helpers/helpers'; | https://github.com/AdguardTeam/AdGuardHome/commit/a0349b6c7ea64bc3fe117f4e432e22f98ca1577f | client/src/components/Dashboard/index.js |
keep keep keep add keep keep keep keep keep keep | <mask> import round from 'lodash/round';
<mask> import { useSelector } from 'react-redux';
<mask> import PropTypes from 'prop-types';
<mask> import './Line.css';
<mask>
<mask> const Line = ({
<mask> data, color = 'black',
<mask> }) => {
<mask> const interval = msToDays(useSelector((state) => state.stats.interval));
<mask>
</s> Pull request 1792: 5633-invalid-date
Updates #5633.
Squashed commit of the following:
commit 889bc7acb82472d72d7b3103554e70342513a567
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 30 14:31:42 2023 +0300
client: fix dashboard date </s> remove const interval = useSelector((state) => state.stats.interval);
</s> add const interval = msToDays(useSelector((state) => state.stats.interval)); </s> remove interval={stats.interval}
</s> add interval={msToDays(stats.interval)} | https://github.com/AdguardTeam/AdGuardHome/commit/a0349b6c7ea64bc3fe117f4e432e22f98ca1577f | client/src/components/ui/Line.js |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> const Line = ({
<mask> data, color = 'black',
<mask> }) => {
<mask> const interval = useSelector((state) => state.stats.interval);
<mask>
<mask> return <ResponsiveLine
<mask> enableArea
<mask> animate
<mask> enableSlices="x"
</s> Pull request 1792: 5633-invalid-date
Updates #5633.
Squashed commit of the following:
commit 889bc7acb82472d72d7b3103554e70342513a567
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 30 14:31:42 2023 +0300
client: fix dashboard date </s> add import { msToDays } from '../../helpers/helpers'; </s> remove interval={stats.interval}
</s> add interval={msToDays(stats.interval)} | https://github.com/AdguardTeam/AdGuardHome/commit/a0349b6c7ea64bc3fe117f4e432e22f98ca1577f | client/src/components/ui/Line.js |
keep keep keep keep replace keep keep keep keep keep | <mask> )
<mask>
<mask> const (
<mask> defaultDiscoverTime = time.Second * 3
<mask> leaseExpireStatic = 1
<mask> )
<mask>
<mask> var webHandlersRegistered = false
<mask>
<mask> // Lease contains the necessary information about a DHCP lease
</s> Pull request: 2692 time format
Merge in DNS/adguard-home from 2692-time-format to master
Closes #2692.
Squashed commit of the following:
commit a77e3ffc1e2ca7ad1eb4b56641eee787595268e9
Merge: 5262c0b9 1122e71c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:58:29 2021 +0300
Merge branch 'master' into 2692-time-format
commit 5262c0b95979a6c7a01bdd56e9476c4cdf217119
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:50:38 2021 +0300
dhcpd: imp docs
commit 3744338d51dd003a0052672ceffa260c70f5738d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Feb 17 21:10:37 2021 +0300
dhcpd: fix lease time format </s> remove // Leases returns the list of current DHCP leases (thread-safe)
func (s *Server) Leases(flags int) []Lease {
result := s.srv4.GetLeases(flags)
v6leases := s.srv6.GetLeases(flags)
result = append(result, v6leases...)
return result
</s> add // Leases returns the list of active IPv4 and IPv6 DHCP leases. It's safe for
// concurrent use.
func (s *Server) Leases(flags int) (leases []Lease) {
return append(s.srv4.GetLeases(flags), s.srv6.GetLeases(flags)...) </s> add var expiryStr string
if expiry := l.Expiry; expiry.Unix() != leaseExpireStatic {
// The front-end is waiting for RFC 3999 format of the time
// value. It also shouldn't got an Expiry field for static
// leases.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2692.
expiryStr = expiry.Format(time.RFC3339)
}
</s> add Expiry string `json:"expires,omitempty"` </s> add Expiry: expiryStr, | https://github.com/AdguardTeam/AdGuardHome/commit/a0abad6644d1cbe80d9293b6742e38c4c6ddc282 | internal/dhcpd/dhcpd.go |
keep add keep keep keep keep keep keep | <mask> // MarshalJSON implements the json.Marshaler interface for *Lease.
<mask> func (l *Lease) MarshalJSON() ([]byte, error) {
<mask> type lease Lease
<mask> return json.Marshal(&struct {
<mask> HWAddr string `json:"mac"`
<mask> Expiry string `json:"expires,omitempty"`
<mask> *lease
<mask> }{
</s> Pull request: 2692 time format
Merge in DNS/adguard-home from 2692-time-format to master
Closes #2692.
Squashed commit of the following:
commit a77e3ffc1e2ca7ad1eb4b56641eee787595268e9
Merge: 5262c0b9 1122e71c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:58:29 2021 +0300
Merge branch 'master' into 2692-time-format
commit 5262c0b95979a6c7a01bdd56e9476c4cdf217119
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:50:38 2021 +0300
dhcpd: imp docs
commit 3744338d51dd003a0052672ceffa260c70f5738d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Feb 17 21:10:37 2021 +0300
dhcpd: fix lease time format </s> add Expiry string `json:"expires,omitempty"` </s> remove // Leases returns the list of current DHCP leases (thread-safe)
func (s *Server) Leases(flags int) []Lease {
result := s.srv4.GetLeases(flags)
v6leases := s.srv6.GetLeases(flags)
result = append(result, v6leases...)
return result
</s> add // Leases returns the list of active IPv4 and IPv6 DHCP leases. It's safe for
// concurrent use.
func (s *Server) Leases(flags int) (leases []Lease) {
return append(s.srv4.GetLeases(flags), s.srv6.GetLeases(flags)...) </s> remove leaseExpireStatic = 1
</s> add // leaseExpireStatic is used to define the Expiry field for static
// leases.
//
// TODO(e.burkov): Remove it when static leases determining mechanism
// will be improved.
leaseExpireStatic = 1 </s> add Expiry: expiryStr, | https://github.com/AdguardTeam/AdGuardHome/commit/a0abad6644d1cbe80d9293b6742e38c4c6ddc282 | internal/dhcpd/dhcpd.go |
keep keep keep add keep keep keep keep keep keep | <mask>
<mask> type lease Lease
<mask> return json.Marshal(&struct {
<mask> HWAddr string `json:"mac"`
<mask> *lease
<mask> }{
<mask> HWAddr: l.HWAddr.String(),
<mask> Expiry: expiryStr,
<mask> lease: (*lease)(l),
<mask> })
</s> Pull request: 2692 time format
Merge in DNS/adguard-home from 2692-time-format to master
Closes #2692.
Squashed commit of the following:
commit a77e3ffc1e2ca7ad1eb4b56641eee787595268e9
Merge: 5262c0b9 1122e71c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:58:29 2021 +0300
Merge branch 'master' into 2692-time-format
commit 5262c0b95979a6c7a01bdd56e9476c4cdf217119
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:50:38 2021 +0300
dhcpd: imp docs
commit 3744338d51dd003a0052672ceffa260c70f5738d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Feb 17 21:10:37 2021 +0300
dhcpd: fix lease time format </s> add Expiry: expiryStr, </s> add var expiryStr string
if expiry := l.Expiry; expiry.Unix() != leaseExpireStatic {
// The front-end is waiting for RFC 3999 format of the time
// value. It also shouldn't got an Expiry field for static
// leases.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2692.
expiryStr = expiry.Format(time.RFC3339)
}
</s> remove // Leases returns the list of current DHCP leases (thread-safe)
func (s *Server) Leases(flags int) []Lease {
result := s.srv4.GetLeases(flags)
v6leases := s.srv6.GetLeases(flags)
result = append(result, v6leases...)
return result
</s> add // Leases returns the list of active IPv4 and IPv6 DHCP leases. It's safe for
// concurrent use.
func (s *Server) Leases(flags int) (leases []Lease) {
return append(s.srv4.GetLeases(flags), s.srv6.GetLeases(flags)...) </s> remove leaseExpireStatic = 1
</s> add // leaseExpireStatic is used to define the Expiry field for static
// leases.
//
// TODO(e.burkov): Remove it when static leases determining mechanism
// will be improved.
leaseExpireStatic = 1 | https://github.com/AdguardTeam/AdGuardHome/commit/a0abad6644d1cbe80d9293b6742e38c4c6ddc282 | internal/dhcpd/dhcpd.go |
keep add keep keep keep keep | <mask> }{
<mask> HWAddr: l.HWAddr.String(),
<mask> lease: (*lease)(l),
<mask> })
<mask> }
<mask>
</s> Pull request: 2692 time format
Merge in DNS/adguard-home from 2692-time-format to master
Closes #2692.
Squashed commit of the following:
commit a77e3ffc1e2ca7ad1eb4b56641eee787595268e9
Merge: 5262c0b9 1122e71c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:58:29 2021 +0300
Merge branch 'master' into 2692-time-format
commit 5262c0b95979a6c7a01bdd56e9476c4cdf217119
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:50:38 2021 +0300
dhcpd: imp docs
commit 3744338d51dd003a0052672ceffa260c70f5738d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Feb 17 21:10:37 2021 +0300
dhcpd: fix lease time format </s> add Expiry string `json:"expires,omitempty"` </s> add var expiryStr string
if expiry := l.Expiry; expiry.Unix() != leaseExpireStatic {
// The front-end is waiting for RFC 3999 format of the time
// value. It also shouldn't got an Expiry field for static
// leases.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2692.
expiryStr = expiry.Format(time.RFC3339)
}
</s> remove // Leases returns the list of current DHCP leases (thread-safe)
func (s *Server) Leases(flags int) []Lease {
result := s.srv4.GetLeases(flags)
v6leases := s.srv6.GetLeases(flags)
result = append(result, v6leases...)
return result
</s> add // Leases returns the list of active IPv4 and IPv6 DHCP leases. It's safe for
// concurrent use.
func (s *Server) Leases(flags int) (leases []Lease) {
return append(s.srv4.GetLeases(flags), s.srv6.GetLeases(flags)...) </s> remove leaseExpireStatic = 1
</s> add // leaseExpireStatic is used to define the Expiry field for static
// leases.
//
// TODO(e.burkov): Remove it when static leases determining mechanism
// will be improved.
leaseExpireStatic = 1 | https://github.com/AdguardTeam/AdGuardHome/commit/a0abad6644d1cbe80d9293b6742e38c4c6ddc282 | internal/dhcpd/dhcpd.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> LeasesStatic = 2
<mask> LeasesAll = LeasesDynamic | LeasesStatic
<mask> )
<mask>
<mask> // Leases returns the list of current DHCP leases (thread-safe)
<mask> func (s *Server) Leases(flags int) []Lease {
<mask> result := s.srv4.GetLeases(flags)
<mask>
<mask> v6leases := s.srv6.GetLeases(flags)
<mask> result = append(result, v6leases...)
<mask>
<mask> return result
<mask> }
<mask>
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
<mask> func (s *Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
<mask> if ip.To4() != nil {
</s> Pull request: 2692 time format
Merge in DNS/adguard-home from 2692-time-format to master
Closes #2692.
Squashed commit of the following:
commit a77e3ffc1e2ca7ad1eb4b56641eee787595268e9
Merge: 5262c0b9 1122e71c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:58:29 2021 +0300
Merge branch 'master' into 2692-time-format
commit 5262c0b95979a6c7a01bdd56e9476c4cdf217119
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 18 13:50:38 2021 +0300
dhcpd: imp docs
commit 3744338d51dd003a0052672ceffa260c70f5738d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Feb 17 21:10:37 2021 +0300
dhcpd: fix lease time format </s> add var expiryStr string
if expiry := l.Expiry; expiry.Unix() != leaseExpireStatic {
// The front-end is waiting for RFC 3999 format of the time
// value. It also shouldn't got an Expiry field for static
// leases.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2692.
expiryStr = expiry.Format(time.RFC3339)
}
</s> remove leaseExpireStatic = 1
</s> add // leaseExpireStatic is used to define the Expiry field for static
// leases.
//
// TODO(e.burkov): Remove it when static leases determining mechanism
// will be improved.
leaseExpireStatic = 1 </s> add Expiry string `json:"expires,omitempty"` </s> add Expiry: expiryStr, | https://github.com/AdguardTeam/AdGuardHome/commit/a0abad6644d1cbe80d9293b6742e38c4c6ddc282 | internal/dhcpd/dhcpd.go |
keep keep keep add keep keep keep keep keep keep | <mask> import (
<mask> "fmt"
<mask> "net"
<mask> "os"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
</s> + clients: find DNS client's hostname by IP using rDNS </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> add "github.com/miekg/dns" </s> add const (
rdnsTimeout = 3 * time.Second // max time to wait for rDNS response
)
type dnsContext struct {
rdnsChannel chan string // pass data from DNS request handling thread to rDNS thread
// contains IP addresses of clients to be resolved by rDNS
// if IP address couldn't be resolved, it stays here forever to prevent further attempts to resolve the same IP
rdnsIP map[string]bool
rdnsLock sync.Mutex // synchronize access to rdnsIP
upstream upstream.Upstream // Upstream object for our own DNS server
}
var dnsctx dnsContext
</s> add if s.conf.OnDNSRequest != nil {
s.conf.OnDNSRequest(d)
}
</s> add OnDNSRequest func(d *proxy.DNSContext) </s> add newconfig.OnDNSRequest = onDNSRequest | https://github.com/AdguardTeam/AdGuardHome/commit/a12f01793ff97e0ea53bc6f751bee758d1df6bb2 | dns.go |
keep keep add keep keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> var dnsServer *dnsforward.Server
</s> + clients: find DNS client's hostname by IP using rDNS </s> add "github.com/miekg/dns" </s> add "strings"
"sync"
"time" </s> add const (
rdnsTimeout = 3 * time.Second // max time to wait for rDNS response
)
type dnsContext struct {
rdnsChannel chan string // pass data from DNS request handling thread to rDNS thread
// contains IP addresses of clients to be resolved by rDNS
// if IP address couldn't be resolved, it stays here forever to prevent further attempts to resolve the same IP
rdnsIP map[string]bool
rdnsLock sync.Mutex // synchronize access to rdnsIP
upstream upstream.Upstream // Upstream object for our own DNS server
}
var dnsctx dnsContext
</s> add if s.conf.OnDNSRequest != nil {
s.conf.OnDNSRequest(d)
}
</s> add OnDNSRequest func(d *proxy.DNSContext) </s> add newconfig.OnDNSRequest = onDNSRequest | https://github.com/AdguardTeam/AdGuardHome/commit/a12f01793ff97e0ea53bc6f751bee758d1df6bb2 | dns.go |
keep keep add keep keep keep keep | <mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dnsServer *dnsforward.Server
<mask>
</s> + clients: find DNS client's hostname by IP using rDNS </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> add "strings"
"sync"
"time" </s> add const (
rdnsTimeout = 3 * time.Second // max time to wait for rDNS response
)
type dnsContext struct {
rdnsChannel chan string // pass data from DNS request handling thread to rDNS thread
// contains IP addresses of clients to be resolved by rDNS
// if IP address couldn't be resolved, it stays here forever to prevent further attempts to resolve the same IP
rdnsIP map[string]bool
rdnsLock sync.Mutex // synchronize access to rdnsIP
upstream upstream.Upstream // Upstream object for our own DNS server
}
var dnsctx dnsContext
</s> add if s.conf.OnDNSRequest != nil {
s.conf.OnDNSRequest(d)
}
</s> add OnDNSRequest func(d *proxy.DNSContext) </s> add newconfig.OnDNSRequest = onDNSRequest | https://github.com/AdguardTeam/AdGuardHome/commit/a12f01793ff97e0ea53bc6f751bee758d1df6bb2 | dns.go |
keep keep add keep keep keep keep | <mask>
<mask> var dnsServer *dnsforward.Server
<mask>
<mask> // initDNSServer creates an instance of the dnsforward.Server
<mask> // Please note that we must do it even if we don't start it
<mask> // so that we had access to the query log and the stats
<mask> func initDNSServer(baseDir string) {
</s> + clients: find DNS client's hostname by IP using rDNS </s> add OnDNSRequest func(d *proxy.DNSContext) </s> add "github.com/miekg/dns" </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> add if s.conf.OnDNSRequest != nil {
s.conf.OnDNSRequest(d)
}
</s> add newconfig.OnDNSRequest = onDNSRequest </s> add bindhost := config.DNS.BindHost
if config.DNS.BindHost == "0.0.0.0" {
bindhost = "127.0.0.1"
}
resolverAddress := fmt.Sprintf("%s:%d", bindhost, config.DNS.Port)
opts := upstream.Options{
Timeout: rdnsTimeout,
}
dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
if err != nil {
log.Error("upstream.AddressToUpstream: %s", err)
return
}
dnsctx.rdnsChannel = make(chan string, 256)
go asyncRDNSLoop() | https://github.com/AdguardTeam/AdGuardHome/commit/a12f01793ff97e0ea53bc6f751bee758d1df6bb2 | dns.go |
keep keep keep add keep keep keep keep keep keep | <mask> log.Fatalf("Cannot create DNS data dir at %s: %s", baseDir, err)
<mask> }
<mask>
<mask> dnsServer = dnsforward.NewServer(baseDir)
<mask> }
<mask>
<mask> func isRunning() bool {
<mask> return dnsServer != nil && dnsServer.IsRunning()
<mask> }
<mask>
</s> + clients: find DNS client's hostname by IP using rDNS </s> add if s.conf.OnDNSRequest != nil {
s.conf.OnDNSRequest(d)
}
</s> add newconfig.OnDNSRequest = onDNSRequest </s> add const (
rdnsTimeout = 3 * time.Second // max time to wait for rDNS response
)
type dnsContext struct {
rdnsChannel chan string // pass data from DNS request handling thread to rDNS thread
// contains IP addresses of clients to be resolved by rDNS
// if IP address couldn't be resolved, it stays here forever to prevent further attempts to resolve the same IP
rdnsIP map[string]bool
rdnsLock sync.Mutex // synchronize access to rdnsIP
upstream upstream.Upstream // Upstream object for our own DNS server
}
var dnsctx dnsContext
</s> add OnDNSRequest func(d *proxy.DNSContext) </s> add "github.com/miekg/dns" </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a12f01793ff97e0ea53bc6f751bee758d1df6bb2 | dns.go |
keep keep add keep keep keep keep keep keep | <mask> newconfig.DomainsReservedUpstreams = upstreamConfig.DomainReservedUpstreams
<mask> newconfig.AllServers = config.DNS.AllServers
<mask> newconfig.FilterHandler = applyClientSettings
<mask> return newconfig
<mask> }
<mask>
<mask> // If a client has his own settings, apply them
<mask> func applyClientSettings(clientAddr string, setts *dnsfilter.RequestFilteringSettings) {
<mask> c, ok := clientFind(clientAddr)
</s> + clients: find DNS client's hostname by IP using rDNS </s> add bindhost := config.DNS.BindHost
if config.DNS.BindHost == "0.0.0.0" {
bindhost = "127.0.0.1"
}
resolverAddress := fmt.Sprintf("%s:%d", bindhost, config.DNS.Port)
opts := upstream.Options{
Timeout: rdnsTimeout,
}
dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
if err != nil {
log.Error("upstream.AddressToUpstream: %s", err)
return
}
dnsctx.rdnsChannel = make(chan string, 256)
go asyncRDNSLoop() </s> add if s.conf.OnDNSRequest != nil {
s.conf.OnDNSRequest(d)
}
</s> add const (
rdnsTimeout = 3 * time.Second // max time to wait for rDNS response
)
type dnsContext struct {
rdnsChannel chan string // pass data from DNS request handling thread to rDNS thread
// contains IP addresses of clients to be resolved by rDNS
// if IP address couldn't be resolved, it stays here forever to prevent further attempts to resolve the same IP
rdnsIP map[string]bool
rdnsLock sync.Mutex // synchronize access to rdnsIP
upstream upstream.Upstream // Upstream object for our own DNS server
}
var dnsctx dnsContext
</s> add OnDNSRequest func(d *proxy.DNSContext) </s> add "github.com/miekg/dns" </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a12f01793ff97e0ea53bc6f751bee758d1df6bb2 | dns.go |
keep keep keep add keep keep keep keep keep keep | <mask> TCPListenAddr *net.TCPAddr // TCP listen address
<mask> Upstreams []upstream.Upstream // Configured upstreams
<mask> DomainsReservedUpstreams map[string][]upstream.Upstream // Map of domains and lists of configured upstreams
<mask> Filters []dnsfilter.Filter // A list of filters to use
<mask>
<mask> FilteringConfig
<mask> TLSConfig
<mask> }
<mask>
<mask> // if any of ServerConfig values are zero, then default values from below are used
</s> + clients: find DNS client's hostname by IP using rDNS </s> add const (
rdnsTimeout = 3 * time.Second // max time to wait for rDNS response
)
type dnsContext struct {
rdnsChannel chan string // pass data from DNS request handling thread to rDNS thread
// contains IP addresses of clients to be resolved by rDNS
// if IP address couldn't be resolved, it stays here forever to prevent further attempts to resolve the same IP
rdnsIP map[string]bool
rdnsLock sync.Mutex // synchronize access to rdnsIP
upstream upstream.Upstream // Upstream object for our own DNS server
}
var dnsctx dnsContext
</s> add if s.conf.OnDNSRequest != nil {
s.conf.OnDNSRequest(d)
}
</s> add bindhost := config.DNS.BindHost
if config.DNS.BindHost == "0.0.0.0" {
bindhost = "127.0.0.1"
}
resolverAddress := fmt.Sprintf("%s:%d", bindhost, config.DNS.Port)
opts := upstream.Options{
Timeout: rdnsTimeout,
}
dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
if err != nil {
log.Error("upstream.AddressToUpstream: %s", err)
return
}
dnsctx.rdnsChannel = make(chan string, 256)
go asyncRDNSLoop() </s> add newconfig.OnDNSRequest = onDNSRequest </s> add "github.com/miekg/dns" </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a12f01793ff97e0ea53bc6f751bee758d1df6bb2 | dnsforward/dnsforward.go |
keep keep add keep keep keep keep keep keep | <mask> func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
<mask> start := time.Now()
<mask>
<mask> // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
<mask> res, err := s.filterDNSRequest(d)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
</s> + clients: find DNS client's hostname by IP using rDNS </s> add bindhost := config.DNS.BindHost
if config.DNS.BindHost == "0.0.0.0" {
bindhost = "127.0.0.1"
}
resolverAddress := fmt.Sprintf("%s:%d", bindhost, config.DNS.Port)
opts := upstream.Options{
Timeout: rdnsTimeout,
}
dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
if err != nil {
log.Error("upstream.AddressToUpstream: %s", err)
return
}
dnsctx.rdnsChannel = make(chan string, 256)
go asyncRDNSLoop() </s> add OnDNSRequest func(d *proxy.DNSContext) </s> add newconfig.OnDNSRequest = onDNSRequest </s> add const (
rdnsTimeout = 3 * time.Second // max time to wait for rDNS response
)
type dnsContext struct {
rdnsChannel chan string // pass data from DNS request handling thread to rDNS thread
// contains IP addresses of clients to be resolved by rDNS
// if IP address couldn't be resolved, it stays here forever to prevent further attempts to resolve the same IP
rdnsIP map[string]bool
rdnsLock sync.Mutex // synchronize access to rdnsIP
upstream upstream.Upstream // Upstream object for our own DNS server
}
var dnsctx dnsContext
</s> add "github.com/miekg/dns" </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a12f01793ff97e0ea53bc6f751bee758d1df6bb2 | dnsforward/dnsforward.go |
keep keep add keep keep keep keep keep keep | <mask> LeaseChangedAdded = iota
<mask> LeaseChangedAddedStatic
<mask> LeaseChangedRemovedStatic
<mask>
<mask> LeaseChangedDBStore
<mask> )
<mask>
<mask> // Server - the current state of the DHCP server
<mask> type Server struct {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> add // hostToIPTable is an alias for the type of Server.tableHostToIP.
type hostToIPTable = map[string]net.IP
// ipToHostTable is an alias for the type of Server.tableIPToHost.
//
// TODO(a.garipov): Define an IPMap type in aghnet and use here and in other
// places?
type ipToHostTable = map[string]string
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should reload the DHCP clients.
s.conf.notify(LeaseChangedAdded)
</s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
| https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/dhcpd.go |
keep keep add keep keep keep keep keep | <mask> log.Debug("dhcpv4: srv.Serve: %s", err)
<mask> }()
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // Stop - stop server
<mask> func (s *v4Server) Stop() {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> add func (s *Server) setTableHostToIP(t hostToIPTable) {
s.tableHostToIPLock.Lock()
defer s.tableHostToIPLock.Unlock()
s.tableHostToIP = t
}
func (s *Server) setTableIPToHost(t ipToHostTable) {
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock()
s.tableIPToHost = t
}
</s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> add LeaseChangedRemovedAll | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4.go |
keep keep keep keep replace keep keep keep keep keep | <mask> err := s.srv.Close()
<mask> if err != nil {
<mask> log.Error("dhcpv4: srv.Close: %s", err)
<mask> }
<mask> // now s.srv.Serve() will return
<mask> s.srv = nil
<mask> }
<mask>
<mask> // Create DHCPv4 server
<mask> func v4Create(conf V4ServerConf) (srv DHCPServer, err error) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove clients.addFromDHCP()
</s> add clients.updateFromDHCP(true) </s> add // Signal to the clients containers in packages home and dnsforward that
// it should reload the DHCP clients.
s.conf.notify(LeaseChangedAdded)
</s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4.go |
keep keep keep keep replace keep keep keep keep keep | <mask> GatewayIP: net.IP{192, 168, 10, 1},
<mask> SubnetMask: net.IP{255, 255, 255, 0},
<mask> notify: notify4,
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Empty(t, ls)
<mask>
<mask> // Add static lease.
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove }))
</s> add })
assert.Error(t, err) </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ </s> remove assert.Len(t, ls, 1)
</s> add require.Len(t, ls, 1)
| https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> l := Lease{
<mask> IP: net.IP{192, 168, 10, 150},
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask> require.Nil(t, s.AddStaticLease(l))
<mask> assert.NotNil(t, s.AddStaticLease(l))
<mask>
<mask> ls = s.GetLeases(LeasesStatic)
<mask> require.Len(t, ls, 1)
<mask> assert.True(t, l.IP.Equal(ls[0].IP))
<mask> assert.Equal(t, l.HWAddr, ls[0].HWAddr)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove }))
</s> add })
assert.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Len(t, ls, 1)
</s> add require.Len(t, ls, 1)
| https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep replace keep keep keep keep | <mask> assert.Equal(t, l.HWAddr, ls[0].HWAddr)
<mask> assert.True(t, ls[0].IsStatic())
<mask>
<mask> // Try to remove static lease.
<mask> assert.NotNil(t, s.RemoveStaticLease(Lease{
<mask> IP: net.IP{192, 168, 10, 110},
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }))
<mask>
<mask> // Remove static lease.
<mask> require.Nil(t, s.RemoveStaticLease(l))
<mask> ls = s.GetLeases(LeasesStatic)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }))
<mask>
<mask> // Remove static lease.
<mask> require.Nil(t, s.RemoveStaticLease(l))
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Empty(t, ls)
<mask> }
<mask>
<mask> func TestV4_AddReplace(t *testing.T) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove }))
</s> add })
assert.Error(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> GatewayIP: net.IP{192, 168, 10, 1},
<mask> SubnetMask: net.IP{255, 255, 255, 0},
<mask> notify: notify4,
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> s, ok := sIface.(*v4Server)
<mask> require.True(t, ok)
<mask>
<mask> dynLeases := []Lease{{
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Len(t, ls, 1)
</s> add require.Len(t, ls, 1)
</s> remove }))
</s> add })
assert.Error(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }}
<mask>
<mask> for i := range dynLeases {
<mask> err = s.addLease(&dynLeases[i])
<mask> require.Nil(t, err)
<mask> }
<mask>
<mask> stLeases := []Lease{{
<mask> IP: net.IP{192, 168, 10, 150},
<mask> HWAddr: net.HardwareAddr{0x33, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ </s> remove }))
</s> add })
assert.Error(t, err) </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }}
<mask>
<mask> for _, l := range stLeases {
<mask> require.Nil(t, s.AddStaticLease(l))
<mask> }
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> require.Len(t, ls, 2)
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) </s> remove }))
</s> add })
assert.Error(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> GatewayIP: net.IP{192, 168, 10, 1},
<mask> SubnetMask: net.IP{255, 255, 255, 0},
<mask> notify: notify4,
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> s, ok := sIface.(*v4Server)
<mask> require.True(t, ok)
<mask> s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}}
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Len(t, ls, 1)
</s> add require.Len(t, ls, 1)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove }))
</s> add })
assert.Error(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> l := Lease{
<mask> IP: net.IP{192, 168, 10, 150},
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask> require.Nil(t, s.AddStaticLease(l))
<mask>
<mask> var req, resp *dhcpv4.DHCPv4
<mask> mac := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
<mask>
<mask> t.Run("discover", func(t *testing.T) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ </s> remove }))
</s> add })
assert.Error(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> var req, resp *dhcpv4.DHCPv4
<mask> mac := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
<mask>
<mask> t.Run("discover", func(t *testing.T) {
<mask> var terr error
<mask>
<mask> req, terr = dhcpv4.NewDiscovery(mac)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> t.Run("discover", func(t *testing.T) {
<mask> var terr error
<mask>
<mask> req, terr = dhcpv4.NewDiscovery(mac)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep replace replace keep keep replace | <mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep replace keep keep replace keep | <mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> req, err = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, 1, s.process(req, resp))
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> resp, err = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("ack", func(t *testing.T) {
<mask> assert.Equal(t, dhcpv4.MessageTypeAck, resp.MessageType())
<mask> assert.Equal(t, mac, resp.ClientHWAddr)
<mask> assert.True(t, l.IP.Equal(resp.YourIPAddr))
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add // Don't continue if we got any errors in the previous subtest.
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "81 hex 303132",
<mask> "82 ip 1.2.3.4",
<mask> },
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> s, ok := sIface.(*v4Server)
<mask> require.True(t, ok)
<mask> s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}}
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} </s> remove m[l.IP.String()] = lowhost
</s> add lowhost := strings.ToLower(l.Hostname) </s> remove ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
}
</s> add ipToHost[l.IP.String()] = lowhost </s> remove }))
</s> add })
assert.Error(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep replace keep keep replace keep keep keep | <mask> req, err = dhcpv4.NewDiscovery(mac)
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask>
<mask> // Don't continue if we got any errors in the previous subtest.
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("offer", func(t *testing.T) {
<mask> assert.Equal(t, dhcpv4.MessageTypeOffer, resp.MessageType())
<mask> assert.Equal(t, mac, resp.ClientHWAddr)
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, err)
</s> add // Don't continue if we got any errors in the previous subtest.
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Equal(t, net.IP{1, 2, 3, 4}, net.IP(resp.RelayAgentInfo().ToBytes()))
<mask> })
<mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> var terr error
<mask>
<mask> req, terr = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> var terr error
<mask>
<mask> req, terr = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove var terr error
</s> add req, err = dhcpv4.NewDiscovery(mac)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep replace replace keep keep replace keep keep | <mask> req, terr = dhcpv4.NewRequestFromOffer(resp)
<mask> require.Nil(t, terr)
<mask>
<mask> resp, terr = dhcpv4.NewReplyFromRequest(req)
<mask> require.Nil(t, terr)
<mask> assert.Equal(t, 1, s.process(req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("ack", func(t *testing.T) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove req, terr = dhcpv4.NewRequestFromOffer(resp)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove resp, terr = dhcpv4.NewReplyFromRequest(req)
require.Nil(t, terr)
</s> add </s> remove req, terr = dhcpv4.NewDiscovery(mac)
require.Nil(t, terr)
</s> add resp, err = dhcpv4.NewReplyFromRequest(req)
require.NoError(t, err) </s> remove var terr error
</s> add req, err = dhcpv4.NewRequestFromOffer(resp)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // check lease
<mask> t.Run("check_lease", func(t *testing.T) {
<mask> ls := s.GetLeases(LeasesDynamic)
<mask> assert.Len(t, ls, 1)
<mask> assert.True(t, net.IP{192, 168, 10, 100}.Equal(ls[0].IP))
<mask> assert.Equal(t, mac, ls[0].HWAddr)
<mask> })
<mask> }
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove require.Nil(t, s.AddStaticLease(l))
assert.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err)
err = s.AddStaticLease(l)
assert.Error(t, err) </s> remove assert.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(Lease{ </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add // Don't continue if we got any errors in the previous subtest.
require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dhcpd/v4_test.go |
keep keep keep add keep keep keep keep keep keep | <mask> }
<mask> return true
<mask> }
<mask>
<mask> func (s *Server) onDHCPLeaseChanged(flags int) {
<mask> add := true
<mask> switch flags {
<mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> add add := true </s> remove //
</s> add // Go on.
case dhcpd.LeaseChangedRemovedAll:
add = false </s> remove clients.addFromDHCP()
</s> add clients.updateFromDHCP(true)
case dhcpd.LeaseChangedRemovedAll:
clients.updateFromDHCP(false) </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep add keep keep keep keep keep | <mask>
<mask> func (s *Server) onDHCPLeaseChanged(flags int) {
<mask> switch flags {
<mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
<mask> // Go on.
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> add func (s *Server) setTableHostToIP(t hostToIPTable) {
s.tableHostToIPLock.Lock()
defer s.tableHostToIPLock.Unlock()
s.tableHostToIP = t
}
func (s *Server) setTableIPToHost(t ipToHostTable) {
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock()
s.tableIPToHost = t
}
</s> remove //
</s> add // Go on.
case dhcpd.LeaseChangedRemovedAll:
add = false </s> remove clients.addFromDHCP()
</s> add clients.updateFromDHCP(true)
case dhcpd.LeaseChangedRemovedAll:
clients.updateFromDHCP(false) </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() </s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep keep keep replace keep keep keep keep replace replace replace replace keep keep | <mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
<mask> //
<mask> default:
<mask> return
<mask> }
<mask>
<mask> hostToIP := make(map[string]net.IP)
<mask> m := make(map[string]string)
<mask>
<mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
<mask>
<mask> for _, l := range ll {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove clients.addFromDHCP()
</s> add clients.updateFromDHCP(true)
case dhcpd.LeaseChangedRemovedAll:
clients.updateFromDHCP(false) </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> add add := true </s> add func (s *Server) setTableHostToIP(t hostToIPTable) {
s.tableHostToIPLock.Lock()
defer s.tableHostToIPLock.Unlock()
s.tableHostToIP = t
}
func (s *Server) setTableIPToHost(t ipToHostTable) {
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock()
s.tableIPToHost = t
}
| https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep keep keep keep replace replace replace replace keep replace keep | <mask> m := make(map[string]string)
<mask>
<mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
<mask>
<mask> for _, l := range ll {
<mask> if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
<mask> continue
<mask> }
<mask>
<mask> lowhost := strings.ToLower(l.Hostname)
<mask>
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) </s> add if !add {
return
}
</s> remove m[l.IP.String()] = lowhost
</s> add lowhost := strings.ToLower(l.Hostname) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep keep replace keep replace replace replace replace | <mask> lowhost := strings.ToLower(l.Hostname)
<mask>
<mask> m[l.IP.String()] = lowhost
<mask>
<mask> ip := make(net.IP, 4)
<mask> copy(ip, l.IP.To4())
<mask> hostToIP[lowhost] = ip
<mask> }
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove s.tableHostToIPLock.Lock()
s.tableHostToIP = hostToIP
s.tableHostToIPLock.Unlock()
</s> add log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost))
} | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep keep replace keep replace replace replace keep keep keep | <mask> }
<mask>
<mask> log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
<mask>
<mask> s.tableHostToIPLock.Lock()
<mask> s.tableHostToIP = hostToIP
<mask> s.tableHostToIPLock.Unlock()
<mask>
<mask> s.tablePTRLock.Lock()
<mask> s.tablePTR = m
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
}
</s> add ipToHost[l.IP.String()] = lowhost </s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) </s> add func (s *Server) setTableHostToIP(t hostToIPTable) {
s.tableHostToIPLock.Lock()
defer s.tableHostToIPLock.Unlock()
s.tableHostToIP = t
}
func (s *Server) setTableIPToHost(t ipToHostTable) {
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock()
s.tableIPToHost = t
}
</s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) </s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> s.tableHostToIPLock.Lock()
<mask> s.tableHostToIP = hostToIP
<mask> s.tableHostToIPLock.Unlock()
<mask>
<mask> s.tablePTRLock.Lock()
<mask> s.tablePTR = m
<mask> s.tablePTRLock.Unlock()
<mask> }
<mask>
<mask> // processDetermineLocal determines if the client's IP address is from
<mask> // locally-served network and saves the result into the context.
<mask> func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove s.tableHostToIPLock.Lock()
s.tableHostToIP = hostToIP
s.tableHostToIPLock.Unlock()
</s> add log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost))
} </s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> add func (s *Server) setTableHostToIP(t hostToIPTable) {
s.tableHostToIPLock.Lock()
defer s.tableHostToIPLock.Unlock()
s.tableHostToIP = t
}
func (s *Server) setTableIPToHost(t ipToHostTable) {
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock()
s.tableIPToHost = t
}
</s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove log.Debug("dns: added %d A/PTR entries from DHCP", len(m))
</s> add ip := make(net.IP, 4)
copy(ip, l.IP.To4())
hostToIP[lowhost] = ip
} </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep keep keep keep replace replace keep replace keep keep | <mask>
<mask> // ipToHost tries to get a hostname leased by DHCP. It's safe for concurrent
<mask> // use.
<mask> func (s *Server) ipToHost(ip net.IP) (host string, ok bool) {
<mask> s.tablePTRLock.Lock()
<mask> defer s.tablePTRLock.Unlock()
<mask>
<mask> if s.tablePTR == nil {
<mask> return "", false
<mask> }
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> add func (s *Server) setTableHostToIP(t hostToIPTable) {
s.tableHostToIPLock.Lock()
defer s.tableHostToIPLock.Unlock()
s.tableHostToIP = t
}
func (s *Server) setTableIPToHost(t ipToHostTable) {
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock()
s.tableIPToHost = t
}
</s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP </s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if s.tablePTR == nil {
<mask> return "", false
<mask> }
<mask>
<mask> host, ok = s.tablePTR[ip.String()]
<mask>
<mask> return host, ok
<mask> }
<mask>
<mask> // Respond to PTR requests if the target IP is leased by our DHCP server and the
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() </s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) </s> add // Signal to the clients containers in packages home and dnsforward that
// it should reload the DHCP clients.
s.conf.notify(LeaseChangedAdded)
</s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s := &Server{
<mask> autohostSuffix: defaultAutohostSuffix,
<mask> tableHostToIP: map[string]net.IP{
<mask> "example": knownIP,
<mask> },
<mask> }
<mask>
<mask> req := &dns.Msg{
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ </s> add if !add {
return
}
</s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s := &Server{
<mask> autohostSuffix: tc.suffix,
<mask> tableHostToIP: map[string]net.IP{
<mask> "example": knownIP,
<mask> },
<mask> }
<mask>
<mask> req := &dns.Msg{
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ </s> add if !add {
return
}
</s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dns_test.go |
keep keep keep add keep keep keep keep keep keep | <mask> var defaultBlockedHosts = []string{"version.bind", "id.server", "hostname.bind"}
<mask>
<mask> var webRegistered bool
<mask>
<mask> // Server is the main way to start a DNS server.
<mask> //
<mask> // Example:
<mask> // s := dnsforward.Server{}
<mask> // err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
<mask> // err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove tablePTR map[string]string // "IP -> hostname" table for reverse lookup
tablePTRLock sync.Mutex
</s> add tableIPToHost ipToHostTable
tableIPToHostLock sync.Mutex </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP </s> add LeaseChangedRemovedAll </s> add // Signal to the clients containers in packages home and dnsforward that
// it should reload the DHCP clients.
s.conf.notify(LeaseChangedAdded)
</s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dnsforward.go |
keep keep replace keep keep keep keep keep keep keep keep replace replace keep keep keep | <mask> localResolvers *proxy.Proxy
<mask>
<mask> tableHostToIP map[string]net.IP // "hostname -> IP" table for internal addresses (DHCP)
<mask> tableHostToIPLock sync.Mutex
<mask>
<mask> tablePTR map[string]string // "IP -> hostname" table for reverse lookup
<mask> tablePTRLock sync.Mutex
<mask>
<mask> tableHostToIP map[string]net.IP // "hostname -> IP" table for internal addresses (DHCP)
<mask> tableHostToIPLock sync.Mutex
<mask>
<mask> tablePTR map[string]string // "IP -> hostname" table for reverse lookup
<mask> tablePTRLock sync.Mutex
<mask>
<mask> // DNS proxy instance for internal usage
<mask> // We don't Start() it and so no listen port is required.
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> add // hostToIPTable is an alias for the type of Server.tableHostToIP.
type hostToIPTable = map[string]net.IP
// ipToHostTable is an alias for the type of Server.tableIPToHost.
//
// TODO(a.garipov): Define an IPMap type in aghnet and use here and in other
// places?
type ipToHostTable = map[string]string
</s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() </s> add // Signal to the clients containers in packages home and dnsforward that
// it should reload the DHCP clients.
s.conf.notify(LeaseChangedAdded)
</s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove s.tablePTRLock.Lock()
s.tablePTR = m
s.tablePTRLock.Unlock()
</s> add s.setTableHostToIP(hostToIP)
s.setTableIPToHost(ipToHost) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/dnsforward/dnsforward.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.