docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
a.lock.RLock()
defer a.lock.RUnlock() | <mask> }
<mask>
<mask> ipStr := ipReal.String()
<mask>
<mask> a.lock.Lock()
<mask> defer a.lock.Unlock()
<mask>
<mask> hosts = a.tableReverse[ipStr]
<mask>
<mask> if len(hosts) == 0 {
<mask> return nil // not found
</s> Use a RWMutex instead of a Mutex for authosts </s> remove a.lock.Lock()
</s> add a.lock.RLock() </s> remove a.lock.Lock()
defer a.lock.Unlock()
</s> add a.lock.RLock()
defer a.lock.RUnlock() </s> remove a.lock.Unlock()
</s> add a.lock.RUnlock() </s> remove lock sync.Mutex
</s> add lock sync.RWMutex | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f893df7e642b1ee3dd29adddd028c123f8a0f73b | internal/util/autohosts.go |
a.lock.RLock()
defer a.lock.RUnlock() | <mask> }
<mask>
<mask> // List returns an IP-to-hostnames table. It is safe for concurrent use.
<mask> func (a *AutoHosts) List() (ipToHosts map[string][]string) {
<mask> a.lock.Lock()
<mask> defer a.lock.Unlock()
<mask>
<mask> ipToHosts = make(map[string][]string, len(a.tableReverse))
<mask> for k, v := range a.tableReverse {
<mask> ipToHosts[k] = v
<mask> }
</s> Use a RWMutex instead of a Mutex for authosts </s> remove a.lock.Lock()
defer a.lock.Unlock()
</s> add a.lock.RLock()
defer a.lock.RUnlock() </s> remove a.lock.Lock()
</s> add a.lock.RLock() </s> remove a.lock.Unlock()
</s> add a.lock.RUnlock() </s> remove lock sync.Mutex
</s> add lock sync.RWMutex | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f893df7e642b1ee3dd29adddd028c123f8a0f73b | internal/util/autohosts.go |
var resolver *proxy.Proxy | <mask> Req: req,
<mask> StartTime: time.Now(),
<mask> }
<mask>
<mask> resolver := s.internalProxy
<mask> if s.privateNets.Contains(ip) {
<mask> if !s.conf.UsePrivateRDNS {
<mask> return "", nil
<mask> }
<mask>
</s> Pull request: 3142 swap arp and rdns priority
Merge in DNS/adguard-home from 3142-fix-clients to master
Updates #3142.
Updates #3597.
Squashed commit of the following:
commit 4dcabedbfb1a4e4a0aaba588f708e4625442fce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 15:13:15 2022 +0300
all: imp log of changes
commit 481088d05eecac1109daf378e0b4d5f6b2cf099b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 14:36:44 2022 +0300
all: swap arp and rdns priority </s> remove }
if host == "" {
</s> add } else if host == "" { </s> remove // Don't handle any errors since AddHost doesn't return non-nil
// errors for now.
</s> add // Don't handle any errors since AddHost doesn't return non-nil errors
// for now. </s> remove ok = clients.addHostLocked(ip, host, src)
return ok, nil
</s> add return clients.addHostLocked(ip, host, src), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f8e45c13f3c0968b261235c34dc13d309c57de17 | internal/dnsforward/dnsforward.go |
} else {
resolver = s.internalProxy | <mask>
<mask> resolver = s.localResolvers
<mask> s.recDetector.add(*req)
<mask> }
<mask>
<mask> if err = resolver.Resolve(ctx); err != nil {
<mask> return "", err
<mask> }
</s> Pull request: 3142 swap arp and rdns priority
Merge in DNS/adguard-home from 3142-fix-clients to master
Updates #3142.
Updates #3597.
Squashed commit of the following:
commit 4dcabedbfb1a4e4a0aaba588f708e4625442fce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 15:13:15 2022 +0300
all: imp log of changes
commit 481088d05eecac1109daf378e0b4d5f6b2cf099b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 14:36:44 2022 +0300
all: swap arp and rdns priority </s> remove resolver := s.internalProxy
</s> add var resolver *proxy.Proxy </s> remove }
if host == "" {
</s> add } else if host == "" { </s> remove ok = clients.addHostLocked(ip, host, src)
return ok, nil
</s> add return clients.addHostLocked(ip, host, src), nil </s> remove // Don't handle any errors since AddHost doesn't return non-nil
// errors for now.
</s> add // Don't handle any errors since AddHost doesn't return non-nil errors
// for now. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f8e45c13f3c0968b261235c34dc13d309c57de17 | internal/dnsforward/dnsforward.go |
<mask>
<mask> // Client sources. The order determines the priority.
<mask> const (
<mask> ClientSourceWHOIS clientSource = iota
<mask> ClientSourceRDNS
<mask> ClientSourceARP
<mask> ClientSourceDHCP
<mask> ClientSourceHostsFile
<mask> )
<mask>
</s> Pull request: 3142 swap arp and rdns priority
Merge in DNS/adguard-home from 3142-fix-clients to master
Updates #3142.
Updates #3597.
Squashed commit of the following:
commit 4dcabedbfb1a4e4a0aaba588f708e4625442fce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 15:13:15 2022 +0300
all: imp log of changes
commit 481088d05eecac1109daf378e0b4d5f6b2cf099b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 14:36:44 2022 +0300
all: swap arp and rdns priority </s> remove // Don't handle any errors since AddHost doesn't return non-nil
// errors for now.
</s> add // Don't handle any errors since AddHost doesn't return non-nil errors
// for now. </s> remove ok = clients.addHostLocked(ip, host, src)
return ok, nil
</s> add return clients.addHostLocked(ip, host, src), nil </s> remove }
if host == "" {
</s> add } else if host == "" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f8e45c13f3c0968b261235c34dc13d309c57de17 | internal/home/clients.go | |
ClientSourceRDNS | <mask> // Client sources. The order determines the priority.
<mask> const (
<mask> ClientSourceWHOIS clientSource = iota
<mask> ClientSourceARP
<mask> ClientSourceDHCP
<mask> ClientSourceHostsFile
<mask> )
<mask>
</s> Pull request: 3142 swap arp and rdns priority
Merge in DNS/adguard-home from 3142-fix-clients to master
Updates #3142.
Updates #3597.
Squashed commit of the following:
commit 4dcabedbfb1a4e4a0aaba588f708e4625442fce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 15:13:15 2022 +0300
all: imp log of changes
commit 481088d05eecac1109daf378e0b4d5f6b2cf099b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 14:36:44 2022 +0300
all: swap arp and rdns priority </s> remove ClientSourceRDNS
</s> add </s> remove // Don't handle any errors since AddHost doesn't return non-nil
// errors for now.
</s> add // Don't handle any errors since AddHost doesn't return non-nil errors
// for now. </s> remove ok = clients.addHostLocked(ip, host, src)
return ok, nil
</s> add return clients.addHostLocked(ip, host, src), nil </s> remove }
if host == "" {
</s> add } else if host == "" { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f8e45c13f3c0968b261235c34dc13d309c57de17 | internal/home/clients.go |
return clients.addHostLocked(ip, host, src), nil | <mask> func (clients *clientsContainer) AddHost(ip net.IP, host string, src clientSource) (ok bool, err error) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> ok = clients.addHostLocked(ip, host, src)
<mask>
<mask> return ok, nil
<mask> }
<mask>
<mask> // addHostLocked adds a new IP-hostname pairing. For internal use only.
<mask> func (clients *clientsContainer) addHostLocked(ip net.IP, host string, src clientSource) (ok bool) {
<mask> var rc *RuntimeClient
</s> Pull request: 3142 swap arp and rdns priority
Merge in DNS/adguard-home from 3142-fix-clients to master
Updates #3142.
Updates #3597.
Squashed commit of the following:
commit 4dcabedbfb1a4e4a0aaba588f708e4625442fce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 15:13:15 2022 +0300
all: imp log of changes
commit 481088d05eecac1109daf378e0b4d5f6b2cf099b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 14:36:44 2022 +0300
all: swap arp and rdns priority </s> remove // Don't handle any errors since AddHost doesn't return non-nil
// errors for now.
</s> add // Don't handle any errors since AddHost doesn't return non-nil errors
// for now. </s> remove }
if host == "" {
</s> add } else if host == "" { </s> remove resolver := s.internalProxy
</s> add var resolver *proxy.Proxy | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f8e45c13f3c0968b261235c34dc13d309c57de17 | internal/home/clients.go |
} else if host == "" { | <mask> if err != nil {
<mask> log.Debug("rdns: resolving %q: %s", ip, err)
<mask>
<mask> continue
<mask> }
<mask>
<mask> if host == "" {
<mask> continue
<mask> }
<mask>
<mask> // Don't handle any errors since AddHost doesn't return non-nil
<mask> // errors for now.
</s> Pull request: 3142 swap arp and rdns priority
Merge in DNS/adguard-home from 3142-fix-clients to master
Updates #3142.
Updates #3597.
Squashed commit of the following:
commit 4dcabedbfb1a4e4a0aaba588f708e4625442fce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 15:13:15 2022 +0300
all: imp log of changes
commit 481088d05eecac1109daf378e0b4d5f6b2cf099b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 14:36:44 2022 +0300
all: swap arp and rdns priority </s> remove // Don't handle any errors since AddHost doesn't return non-nil
// errors for now.
</s> add // Don't handle any errors since AddHost doesn't return non-nil errors
// for now. </s> remove resolver := s.internalProxy
</s> add var resolver *proxy.Proxy </s> remove ok = clients.addHostLocked(ip, host, src)
return ok, nil
</s> add return clients.addHostLocked(ip, host, src), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f8e45c13f3c0968b261235c34dc13d309c57de17 | internal/home/rdns.go |
// Don't handle any errors since AddHost doesn't return non-nil errors
// for now. | <mask> if host == "" {
<mask> continue
<mask> }
<mask>
<mask> // Don't handle any errors since AddHost doesn't return non-nil
<mask> // errors for now.
<mask> _, _ = r.clients.AddHost(ip, host, ClientSourceRDNS)
<mask> }
<mask> }
</s> Pull request: 3142 swap arp and rdns priority
Merge in DNS/adguard-home from 3142-fix-clients to master
Updates #3142.
Updates #3597.
Squashed commit of the following:
commit 4dcabedbfb1a4e4a0aaba588f708e4625442fce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 15:13:15 2022 +0300
all: imp log of changes
commit 481088d05eecac1109daf378e0b4d5f6b2cf099b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 14:36:44 2022 +0300
all: swap arp and rdns priority </s> remove }
if host == "" {
</s> add } else if host == "" { </s> remove ok = clients.addHostLocked(ip, host, src)
return ok, nil
</s> add return clients.addHostLocked(ip, host, src), nil </s> remove resolver := s.internalProxy
</s> add var resolver *proxy.Proxy | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f8e45c13f3c0968b261235c34dc13d309c57de17 | internal/home/rdns.go |
"io" | <mask>
<mask> import (
<mask> "encoding/base64"
<mask> "encoding/json"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
</s> add if err := handler(val, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return </s> remove value, err := dec.Token()
</s> add if !ok {
continue
}
val, err := dec.Token() </s> remove log.Debug("decodeLogEntry err: %s", err)
</s> add if err != io.EOF {
log.Debug("decodeLogEntry err: %s", err)
} </s> remove for dec.More() {
</s> add dec.UseNumber()
for { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
v, ok := t.(bool) | <mask> ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
<mask> return err
<mask> },
<mask> "IsFiltered": func(t json.Token, ent *logEntry) error {
<mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
<mask> b, err := strconv.ParseBool(v)
<mask> if err != nil {
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
ent.Result.IsFiltered = v | <mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
<mask> b, err := strconv.ParseBool(v)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> ent.Result.IsFiltered = b
<mask> return nil
<mask> },
<mask> "Rule": func(t json.Token, ent *logEntry) error {
<mask> v, ok := t.(string)
<mask> if !ok {
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove v, ok := t.(string)
</s> add v, ok := t.(bool) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
v, ok := t.(json.Number) | <mask> ent.Result.Rule = v
<mask> return nil
<mask> },
<mask> "FilterID": func(t json.Token, ent *logEntry) error {
<mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
<mask> i, err := strconv.Atoi(v)
<mask> if err != nil {
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
i, err := v.Int64() | <mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
<mask> i, err := strconv.Atoi(v)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> ent.Result.FilterID = int64(i)
<mask> return nil
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove ent.Result.FilterID = int64(i)
</s> add ent.Result.FilterID = i </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
ent.Result.FilterID = i | <mask> i, err := strconv.Atoi(v)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> ent.Result.FilterID = int64(i)
<mask> return nil
<mask> },
<mask> "Reason": func(t json.Token, ent *logEntry) error {
<mask> v, ok := t.(string)
<mask> if !ok {
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
v, ok := t.(json.Number) | <mask> ent.Result.FilterID = int64(i)
<mask> return nil
<mask> },
<mask> "Reason": func(t json.Token, ent *logEntry) error {
<mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
<mask> i, err := strconv.Atoi(v)
<mask> if err != nil {
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove ent.Result.FilterID = int64(i)
</s> add ent.Result.FilterID = i </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
i, err := v.Int64() | <mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
<mask> i, err := strconv.Atoi(v)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> ent.Result.Reason = dnsfilter.Reason(i)
<mask> return nil
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
v, ok := t.(json.Number) | <mask> ent.Upstream = v
<mask> return nil
<mask> },
<mask> "Elapsed": func(t json.Token, ent *logEntry) error {
<mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
<mask> i, err := strconv.Atoi(v)
<mask> if err != nil {
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
i, err := v.Int64() | <mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
<mask> i, err := strconv.Atoi(v)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> ent.Elapsed = time.Duration(i)
<mask> return nil
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
"Result": func(json.Token, *logEntry) error {
return nil
}, | <mask> }
<mask> ent.Elapsed = time.Duration(i)
<mask> return nil
<mask> },
<mask> "Question": func(t json.Token, ent *logEntry) error {
<mask> v, ok := t.(string)
<mask> if !ok {
<mask> return nil
<mask> }
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
</s> add ent.Result.IsFiltered = v </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) </s> remove v, ok := t.(string)
</s> add v, ok := t.(json.Number) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
dec.UseNumber()
for { | <mask> }
<mask>
<mask> func decodeLogEntry(ent *logEntry, str string) {
<mask> dec := json.NewDecoder(strings.NewReader(str))
<mask> for dec.More() {
<mask> keyToken, err := dec.Token()
<mask> if err != nil {
<mask> log.Debug("decodeLogEntry err: %s", err)
<mask> return
<mask> }
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove log.Debug("decodeLogEntry err: %s", err)
</s> add if err != io.EOF {
log.Debug("decodeLogEntry err: %s", err)
} </s> remove if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
</s> add if err := handler(val, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return </s> remove value, err := dec.Token()
</s> add if !ok {
continue
}
val, err := dec.Token() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
if err != io.EOF {
log.Debug("decodeLogEntry err: %s", err)
} | <mask> dec := json.NewDecoder(strings.NewReader(str))
<mask> for dec.More() {
<mask> keyToken, err := dec.Token()
<mask> if err != nil {
<mask> log.Debug("decodeLogEntry err: %s", err)
<mask> return
<mask> }
<mask> if _, ok := keyToken.(json.Delim); ok {
<mask> continue
<mask> }
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove for dec.More() {
</s> add dec.UseNumber()
for { </s> remove if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
</s> add if err := handler(val, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return </s> remove value, err := dec.Token()
</s> add if !ok {
continue
}
val, err := dec.Token() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
if !ok {
continue
}
val, err := dec.Token() | <mask> continue
<mask> }
<mask> key := keyToken.(string)
<mask> handler, ok := logEntryHandlers[key]
<mask> value, err := dec.Token()
<mask> if err != nil {
<mask> return
<mask> }
<mask> if ok {
<mask> if err := handler(value, ent); err != nil {
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
</s> add if err := handler(val, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return </s> remove log.Debug("decodeLogEntry err: %s", err)
</s> add if err != io.EOF {
log.Debug("decodeLogEntry err: %s", err)
} </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
if err := handler(val, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return | <mask> value, err := dec.Token()
<mask> if err != nil {
<mask> return
<mask> }
<mask> if ok {
<mask> if err := handler(value, ent); err != nil {
<mask> log.Debug("decodeLogEntry err: %s", err)
<mask> return
<mask> }
<mask> }
<mask> }
<mask> }
<mask>
<mask> // Get value from "key":"value"
</s> Pull request: fix querylog bug
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345.
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug </s> remove log.Debug("decodeLogEntry err: %s", err)
</s> add if err != io.EOF {
log.Debug("decodeLogEntry err: %s", err)
} </s> remove value, err := dec.Token()
</s> add if !ok {
continue
}
val, err := dec.Token() </s> remove for dec.More() {
</s> add dec.UseNumber()
for { </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() </s> remove i, err := strconv.Atoi(v)
</s> add i, err := v.Int64() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f9e4e7b024f87566223792c71578c097f35d4089 | internal/querylog/decode.go |
'GO_VERSION': '1.18.8' | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18.7'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 2 14:09:46 2022 +0300
all: upd go, tools </s> remove 'GO_VERSION': '1.18.7'
</s> add 'GO_VERSION': '1.18.8' </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI=
golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa0fd90ddd9755cd168f1af4a10882a93f3aaca8 | .github/workflows/build.yml |
'GO_VERSION': '1.18.8' | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18.7'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 2 14:09:46 2022 +0300
all: upd go, tools </s> remove 'GO_VERSION': '1.18.7'
</s> add 'GO_VERSION': '1.18.8' </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI=
golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa0fd90ddd9755cd168f1af4a10882a93f3aaca8 | .github/workflows/lint.yml |
'dockerGo': 'adguard/golang-ubuntu:5.3' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.2'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 2 14:09:46 2022 +0300
all: upd go, tools </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI=
golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa0fd90ddd9755cd168f1af4a10882a93f3aaca8 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.3' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.2'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 2 14:09:46 2022 +0300
all: upd go, tools </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI=
golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa0fd90ddd9755cd168f1af4a10882a93f3aaca8 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.3' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 2 14:09:46 2022 +0300
all: upd go, tools </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI=
golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa0fd90ddd9755cd168f1af4a10882a93f3aaca8 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.3' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.2'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 2 14:09:46 2022 +0300
all: upd go, tools </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI=
golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa0fd90ddd9755cd168f1af4a10882a93f3aaca8 | bamboo-specs/test.yaml |
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect | <mask> github.com/gookit/color v1.5.2 // indirect
<mask> github.com/kyoh86/nolint v0.0.1 // indirect
<mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
<mask> golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect
<mask> golang.org/x/mod v0.6.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/sys v0.1.0 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> )
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 2 14:09:46 2022 +0300
all: upd go, tools </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI=
golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE=
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa0fd90ddd9755cd168f1af4a10882a93f3aaca8 | internal/tools/go.mod |
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4=
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= | <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI=
<mask> golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<mask> golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE=
<mask> golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
<mask> golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 2 14:09:46 2022 +0300
all: upd go, tools </s> remove golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect
golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect
</s> add golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.3' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa0fd90ddd9755cd168f1af4a10882a93f3aaca8 | internal/tools/go.sum |
<mask> if !config.DHCP.Enabled {
<mask> return nil
<mask> }
<mask>
<mask> if !dhcpServer.Enabled {
<mask> return nil
<mask> }
<mask>
<mask> err := dhcpServer.Stop()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't stop DHCP server")
<mask> }
<mask>
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName) </s> remove subnet, err := parseIPv4(s.SubnetMask)
</s> add subnet, err := parseIPv4(config.SubnetMask) </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(s.conf.InterfaceName) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", config.InterfaceName) </s> remove s.ServerConfig = config
</s> add s.conf = config | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcp.go | |
leasesLock sync.RWMutex | <mask> stopping bool // Set if the worker thread should be stopped
<mask>
<mask> // leases
<mask> leases []*Lease
<mask> leaseStart net.IP // parsed from config RangeStart
<mask> leaseStop net.IP // parsed from config RangeEnd
<mask> leaseTime time.Duration // parsed from config LeaseDuration
<mask> leaseOptions dhcp4.Options // parsed from config GatewayIP and SubnetMask
<mask>
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove pinger.Timeout = time.Duration(s.ICMPTimeout) * time.Millisecond
</s> add pinger.Timeout = time.Duration(s.conf.ICMPTimeout) * time.Millisecond </s> remove s.ServerConfig = config
</s> add s.conf = config </s> remove s.RLock()
defer s.RUnlock()
</s> add s.leasesLock.RLock()
defer s.leasesLock.RUnlock() </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(config.InterfaceName) </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
conf ServerConfig | <mask>
<mask> // IP address pool -- if entry is in the pool, then it's attached to a lease
<mask> IPpool map[[4]byte]net.HardwareAddr
<mask>
<mask> ServerConfig
<mask> sync.RWMutex
<mask> }
<mask>
<mask> // Print information about the available network interfaces
<mask> func printInterfaces() {
<mask> ifaces, _ := net.Interfaces()
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove if s.ICMPTimeout == 0 {
</s> add if s.conf.ICMPTimeout == 0 { </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.leasesLock.RLock()
defer s.leasesLock.RUnlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.conf = config | <mask> return nil
<mask> }
<mask>
<mask> func (s *Server) setConfig(config ServerConfig) error {
<mask> s.ServerConfig = config
<mask>
<mask> iface, err := net.InterfaceByName(s.InterfaceName)
<mask> if err != nil {
<mask> printInterfaces()
<mask> return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(config.InterfaceName) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", config.InterfaceName) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName) </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(s.conf.InterfaceName) </s> remove if !dhcpServer.Enabled {
return nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
iface, err := net.InterfaceByName(config.InterfaceName) | <mask>
<mask> func (s *Server) setConfig(config ServerConfig) error {
<mask> s.ServerConfig = config
<mask>
<mask> iface, err := net.InterfaceByName(s.InterfaceName)
<mask> if err != nil {
<mask> printInterfaces()
<mask> return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
<mask> }
<mask>
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.ServerConfig = config
</s> add s.conf = config </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", config.InterfaceName) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName) </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(s.conf.InterfaceName) </s> remove return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
</s> add return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", config.InterfaceName, iface) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
return wrapErrPrint(err, "Couldn't find interface by name %s", config.InterfaceName) | <mask>
<mask> iface, err := net.InterfaceByName(s.InterfaceName)
<mask> if err != nil {
<mask> printInterfaces()
<mask> return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
<mask> }
<mask>
<mask> // get ipv4 address of an interface
<mask> s.ipnet = getIfaceIPv4(iface)
<mask> if s.ipnet == nil {
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
</s> add return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", config.InterfaceName, iface) </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(config.InterfaceName) </s> remove s.ServerConfig = config
</s> add s.conf = config </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName) </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(s.conf.InterfaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", config.InterfaceName, iface) | <mask>
<mask> // get ipv4 address of an interface
<mask> s.ipnet = getIfaceIPv4(iface)
<mask> if s.ipnet == nil {
<mask> return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
<mask> }
<mask>
<mask> if s.LeaseDuration == 0 {
<mask> s.leaseTime = time.Hour * 2
<mask> s.LeaseDuration = uint(s.leaseTime.Seconds())
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove if s.LeaseDuration == 0 {
</s> add if config.LeaseDuration == 0 { </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", config.InterfaceName) </s> remove s.LeaseDuration = uint(s.leaseTime.Seconds())
</s> add </s> remove s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
</s> add s.leaseTime = time.Second * time.Duration(config.LeaseDuration) </s> remove router, err := parseIPv4(s.GatewayIP)
</s> add router, err := parseIPv4(config.GatewayIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
if config.LeaseDuration == 0 { | <mask> if s.ipnet == nil {
<mask> return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
<mask> }
<mask>
<mask> if s.LeaseDuration == 0 {
<mask> s.leaseTime = time.Hour * 2
<mask> s.LeaseDuration = uint(s.leaseTime.Seconds())
<mask> } else {
<mask> s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
<mask> }
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
</s> add return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", config.InterfaceName, iface) </s> remove s.LeaseDuration = uint(s.leaseTime.Seconds())
</s> add </s> remove s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
</s> add s.leaseTime = time.Second * time.Duration(config.LeaseDuration) </s> remove s.leaseStart, err = parseIPv4(s.RangeStart)
</s> add s.leaseStart, err = parseIPv4(config.RangeStart) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", config.InterfaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
<mask> }
<mask>
<mask> if s.LeaseDuration == 0 {
<mask> s.leaseTime = time.Hour * 2
<mask> s.LeaseDuration = uint(s.leaseTime.Seconds())
<mask> } else {
<mask> s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
<mask> }
<mask>
<mask> s.leaseStart, err = parseIPv4(s.RangeStart)
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
</s> add s.leaseTime = time.Second * time.Duration(config.LeaseDuration) </s> remove if s.LeaseDuration == 0 {
</s> add if config.LeaseDuration == 0 { </s> remove s.leaseStart, err = parseIPv4(s.RangeStart)
</s> add s.leaseStart, err = parseIPv4(config.RangeStart) </s> remove return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
</s> add return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", config.InterfaceName, iface) </s> remove pinger.Timeout = time.Duration(s.ICMPTimeout) * time.Millisecond
</s> add pinger.Timeout = time.Duration(s.conf.ICMPTimeout) * time.Millisecond | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go | |
s.leaseTime = time.Second * time.Duration(config.LeaseDuration) | <mask> if s.LeaseDuration == 0 {
<mask> s.leaseTime = time.Hour * 2
<mask> s.LeaseDuration = uint(s.leaseTime.Seconds())
<mask> } else {
<mask> s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
<mask> }
<mask>
<mask> s.leaseStart, err = parseIPv4(s.RangeStart)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.LeaseDuration = uint(s.leaseTime.Seconds())
</s> add </s> remove if s.LeaseDuration == 0 {
</s> add if config.LeaseDuration == 0 { </s> remove s.leaseStart, err = parseIPv4(s.RangeStart)
</s> add s.leaseStart, err = parseIPv4(config.RangeStart) </s> remove return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
</s> add return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", config.InterfaceName, iface) </s> remove return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
</s> add return wrapErrPrint(err, "Failed to parse range start address %s", config.RangeStart) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leaseStart, err = parseIPv4(config.RangeStart) | <mask> } else {
<mask> s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
<mask> }
<mask>
<mask> s.leaseStart, err = parseIPv4(s.RangeStart)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
<mask> }
<mask>
<mask> s.leaseStop, err = parseIPv4(s.RangeEnd)
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
</s> add s.leaseTime = time.Second * time.Duration(config.LeaseDuration) </s> remove return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
</s> add return wrapErrPrint(err, "Failed to parse range start address %s", config.RangeStart) </s> remove s.LeaseDuration = uint(s.leaseTime.Seconds())
</s> add </s> remove s.leaseStop, err = parseIPv4(s.RangeEnd)
</s> add s.leaseStop, err = parseIPv4(config.RangeEnd) </s> remove if s.LeaseDuration == 0 {
</s> add if config.LeaseDuration == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
return wrapErrPrint(err, "Failed to parse range start address %s", config.RangeStart) | <mask> }
<mask>
<mask> s.leaseStart, err = parseIPv4(s.RangeStart)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
<mask> }
<mask>
<mask> s.leaseStop, err = parseIPv4(s.RangeEnd)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.leaseStop, err = parseIPv4(s.RangeEnd)
</s> add s.leaseStop, err = parseIPv4(config.RangeEnd) </s> remove s.leaseStart, err = parseIPv4(s.RangeStart)
</s> add s.leaseStart, err = parseIPv4(config.RangeStart) </s> remove return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
</s> add return wrapErrPrint(err, "Failed to parse range end address %s", config.RangeEnd) </s> remove s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
</s> add s.leaseTime = time.Second * time.Duration(config.LeaseDuration) </s> remove subnet, err := parseIPv4(s.SubnetMask)
</s> add subnet, err := parseIPv4(config.SubnetMask) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leaseStop, err = parseIPv4(config.RangeEnd) | <mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
<mask> }
<mask>
<mask> s.leaseStop, err = parseIPv4(s.RangeEnd)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
<mask> }
<mask>
<mask> subnet, err := parseIPv4(s.SubnetMask)
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
</s> add return wrapErrPrint(err, "Failed to parse range start address %s", config.RangeStart) </s> remove return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
</s> add return wrapErrPrint(err, "Failed to parse range end address %s", config.RangeEnd) </s> remove subnet, err := parseIPv4(s.SubnetMask)
</s> add subnet, err := parseIPv4(config.SubnetMask) </s> remove s.leaseStart, err = parseIPv4(s.RangeStart)
</s> add s.leaseStart, err = parseIPv4(config.RangeStart) </s> remove s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
</s> add s.leaseTime = time.Second * time.Duration(config.LeaseDuration) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
return wrapErrPrint(err, "Failed to parse range end address %s", config.RangeEnd) | <mask> }
<mask>
<mask> s.leaseStop, err = parseIPv4(s.RangeEnd)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
<mask> }
<mask>
<mask> subnet, err := parseIPv4(s.SubnetMask)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse subnet mask %s", s.SubnetMask)
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove subnet, err := parseIPv4(s.SubnetMask)
</s> add subnet, err := parseIPv4(config.SubnetMask) </s> remove s.leaseStop, err = parseIPv4(s.RangeEnd)
</s> add s.leaseStop, err = parseIPv4(config.RangeEnd) </s> remove return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
</s> add return wrapErrPrint(err, "Failed to parse range start address %s", config.RangeStart) </s> remove return wrapErrPrint(err, "Failed to parse subnet mask %s", s.SubnetMask)
</s> add return wrapErrPrint(err, "Failed to parse subnet mask %s", config.SubnetMask) </s> remove s.leaseStart, err = parseIPv4(s.RangeStart)
</s> add s.leaseStart, err = parseIPv4(config.RangeStart) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
subnet, err := parseIPv4(config.SubnetMask) | <mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
<mask> }
<mask>
<mask> subnet, err := parseIPv4(s.SubnetMask)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse subnet mask %s", s.SubnetMask)
<mask> }
<mask>
<mask> // if !bytes.Equal(subnet, s.ipnet.Mask) {
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
</s> add return wrapErrPrint(err, "Failed to parse range end address %s", config.RangeEnd) </s> remove return wrapErrPrint(err, "Failed to parse subnet mask %s", s.SubnetMask)
</s> add return wrapErrPrint(err, "Failed to parse subnet mask %s", config.SubnetMask) </s> remove s.leaseStop, err = parseIPv4(s.RangeEnd)
</s> add s.leaseStop, err = parseIPv4(config.RangeEnd) </s> remove router, err := parseIPv4(s.GatewayIP)
</s> add router, err := parseIPv4(config.GatewayIP) </s> remove return wrapErrPrint(err, "Failed to parse range start address %s", s.RangeStart)
</s> add return wrapErrPrint(err, "Failed to parse range start address %s", config.RangeStart) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
return wrapErrPrint(err, "Failed to parse subnet mask %s", config.SubnetMask) | <mask> }
<mask>
<mask> subnet, err := parseIPv4(s.SubnetMask)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse subnet mask %s", s.SubnetMask)
<mask> }
<mask>
<mask> // if !bytes.Equal(subnet, s.ipnet.Mask) {
<mask> // return wrapErrPrint(err, "specified subnet mask %s does not meatch interface %s subnet mask %s", s.SubnetMask, s.InterfaceName, s.ipnet.Mask)
<mask> // }
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove router, err := parseIPv4(s.GatewayIP)
</s> add router, err := parseIPv4(config.GatewayIP) </s> remove subnet, err := parseIPv4(s.SubnetMask)
</s> add subnet, err := parseIPv4(config.SubnetMask) </s> remove return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
</s> add return wrapErrPrint(err, "Failed to parse range end address %s", config.RangeEnd) </s> remove s.leaseStop, err = parseIPv4(s.RangeEnd)
</s> add s.leaseStop, err = parseIPv4(config.RangeEnd) </s> remove return wrapErrPrint(err, "Failed to parse gateway IP %s", s.GatewayIP)
</s> add return wrapErrPrint(err, "Failed to parse gateway IP %s", config.GatewayIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
router, err := parseIPv4(config.GatewayIP) | <mask> // if !bytes.Equal(subnet, s.ipnet.Mask) {
<mask> // return wrapErrPrint(err, "specified subnet mask %s does not meatch interface %s subnet mask %s", s.SubnetMask, s.InterfaceName, s.ipnet.Mask)
<mask> // }
<mask>
<mask> router, err := parseIPv4(s.GatewayIP)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse gateway IP %s", s.GatewayIP)
<mask> }
<mask>
<mask> s.leaseOptions = dhcp4.Options{
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove return wrapErrPrint(err, "Failed to parse subnet mask %s", s.SubnetMask)
</s> add return wrapErrPrint(err, "Failed to parse subnet mask %s", config.SubnetMask) </s> remove return wrapErrPrint(err, "Failed to parse gateway IP %s", s.GatewayIP)
</s> add return wrapErrPrint(err, "Failed to parse gateway IP %s", config.GatewayIP) </s> remove subnet, err := parseIPv4(s.SubnetMask)
</s> add subnet, err := parseIPv4(config.SubnetMask) </s> remove return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
</s> add return wrapErrPrint(err, "Failed to parse range end address %s", config.RangeEnd) </s> remove return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
</s> add return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", config.InterfaceName, iface) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
return wrapErrPrint(err, "Failed to parse gateway IP %s", config.GatewayIP) | <mask> // }
<mask>
<mask> router, err := parseIPv4(s.GatewayIP)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Failed to parse gateway IP %s", s.GatewayIP)
<mask> }
<mask>
<mask> s.leaseOptions = dhcp4.Options{
<mask> dhcp4.OptionSubnetMask: subnet,
<mask> dhcp4.OptionRouter: router,
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove router, err := parseIPv4(s.GatewayIP)
</s> add router, err := parseIPv4(config.GatewayIP) </s> remove subnet, err := parseIPv4(s.SubnetMask)
</s> add subnet, err := parseIPv4(config.SubnetMask) </s> remove return wrapErrPrint(err, "Failed to parse range end address %s", s.RangeEnd)
</s> add return wrapErrPrint(err, "Failed to parse range end address %s", config.RangeEnd) </s> remove s.leaseStop, err = parseIPv4(s.RangeEnd)
</s> add s.leaseStop, err = parseIPv4(config.RangeEnd) </s> remove return wrapErrPrint(err, "Failed to parse subnet mask %s", s.SubnetMask)
</s> add return wrapErrPrint(err, "Failed to parse subnet mask %s", config.SubnetMask) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
iface, err := net.InterfaceByName(s.conf.InterfaceName) | <mask> if s.conn != nil {
<mask> s.closeConn()
<mask> }
<mask>
<mask> iface, err := net.InterfaceByName(s.InterfaceName)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
<mask> }
<mask>
<mask> c, err := newFilterConn(*iface, ":67") // it has to be bound to 0.0.0.0:67, otherwise it won't see DHCP discover/request packets
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", config.InterfaceName) </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(config.InterfaceName) </s> remove s.ServerConfig = config
</s> add s.conf = config </s> remove if !dhcpServer.Enabled {
return nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName) | <mask> }
<mask>
<mask> iface, err := net.InterfaceByName(s.InterfaceName)
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
<mask> }
<mask>
<mask> c, err := newFilterConn(*iface, ":67") // it has to be bound to 0.0.0.0:67, otherwise it won't see DHCP discover/request packets
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Couldn't start listening socket on 0.0.0.0:67")
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(s.conf.InterfaceName) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.InterfaceName)
</s> add return wrapErrPrint(err, "Couldn't find interface by name %s", config.InterfaceName) </s> remove iface, err := net.InterfaceByName(s.InterfaceName)
</s> add iface, err := net.InterfaceByName(config.InterfaceName) </s> remove s.ServerConfig = config
</s> add s.conf = config </s> remove if !dhcpServer.Enabled {
return nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Lock() | <mask>
<mask> log.Tracef("Assigning IP address %s to %s (lease for %s expired at %s)",
<mask> s.leases[i].IP, hwaddr, s.leases[i].HWAddr, s.leases[i].Expiry)
<mask> lease.IP = s.leases[i].IP
<mask> s.Lock()
<mask> s.leases[i] = lease
<mask> s.Unlock()
<mask>
<mask> s.reserveIP(lease.IP, hwaddr)
<mask> return lease, nil
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", s.InterfaceName, iface)
</s> add return wrapErrPrint(err, "Couldn't find IPv4 address of interface %s %+v", config.InterfaceName, iface) </s> remove router, err := parseIPv4(s.GatewayIP)
</s> add router, err := parseIPv4(config.GatewayIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Unlock() | <mask> s.leases[i].IP, hwaddr, s.leases[i].HWAddr, s.leases[i].Expiry)
<mask> lease.IP = s.leases[i].IP
<mask> s.Lock()
<mask> s.leases[i] = lease
<mask> s.Unlock()
<mask>
<mask> s.reserveIP(lease.IP, hwaddr)
<mask> return lease, nil
<mask> }
<mask>
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Lock() | <mask> }
<mask>
<mask> log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String())
<mask> lease.IP = ip
<mask> s.Lock()
<mask> s.leases = append(s.leases, lease)
<mask> s.Unlock()
<mask> return lease, nil
<mask> }
<mask>
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Unlock() | <mask> log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String())
<mask> lease.IP = ip
<mask> s.Lock()
<mask> s.leases = append(s.leases, lease)
<mask> s.Unlock()
<mask> return lease, nil
<mask> }
<mask>
<mask> // Find a lease for the client
<mask> func (s *Server) findLease(p dhcp4.Packet) *Lease {
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
if s.conf.ICMPTimeout == 0 { | <mask> // Send ICMP to the specified machine
<mask> // Return TRUE if it doesn't reply, which probably means that the IP is available
<mask> func (s *Server) addrAvailable(target net.IP) bool {
<mask>
<mask> if s.ICMPTimeout == 0 {
<mask> return true
<mask> }
<mask>
<mask> pinger, err := ping.NewPinger(target.String())
<mask> if err != nil {
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove ServerConfig
sync.RWMutex
</s> add conf ServerConfig </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
pinger.Timeout = time.Duration(s.conf.ICMPTimeout) * time.Millisecond | <mask> return true
<mask> }
<mask>
<mask> pinger.SetPrivileged(true)
<mask> pinger.Timeout = time.Duration(s.ICMPTimeout) * time.Millisecond
<mask> pinger.Count = 1
<mask> reply := false
<mask> pinger.OnRecv = func(pkt *ping.Packet) {
<mask> // log.Tracef("Received ICMP Reply from %v", target)
<mask> reply = true
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove if s.ICMPTimeout == 0 {
</s> add if s.conf.ICMPTimeout == 0 { </s> remove s.leaseTime = time.Second * time.Duration(s.LeaseDuration)
</s> add s.leaseTime = time.Second * time.Duration(config.LeaseDuration) </s> remove s.LeaseDuration = uint(s.leaseTime.Seconds())
</s> add </s> remove if s.LeaseDuration == 0 {
</s> add if config.LeaseDuration == 0 { </s> remove s.leaseStart, err = parseIPv4(s.RangeStart)
</s> add s.leaseStart, err = parseIPv4(config.RangeStart) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Lock() | <mask> // Add the specified IP to the black list for a time period
<mask> func (s *Server) blacklistLease(lease *Lease) {
<mask> hw := make(net.HardwareAddr, 6)
<mask> s.reserveIP(lease.IP, hw)
<mask> s.Lock()
<mask> lease.HWAddr = hw
<mask> lease.Hostname = ""
<mask> lease.Expiry = time.Now().Add(s.leaseTime)
<mask> s.Unlock()
<mask> }
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Unlock() | <mask> s.Lock()
<mask> lease.HWAddr = hw
<mask> lease.Hostname = ""
<mask> lease.Expiry = time.Now().Add(s.leaseTime)
<mask> s.Unlock()
<mask> }
<mask>
<mask> // Return TRUE if DHCP packet is correct
<mask> func isValidPacket(p dhcp4.Packet) bool {
<mask> hw := p.CHAddr()
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove if s.ICMPTimeout == 0 {
</s> add if s.conf.ICMPTimeout == 0 { </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.RLock() | <mask> // Leases returns the list of current DHCP leases (thread-safe)
<mask> func (s *Server) Leases() []Lease {
<mask> var result []Lease
<mask> now := time.Now().Unix()
<mask> s.RLock()
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() > now {
<mask> result = append(result, *lease)
<mask> }
<mask> }
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.leasesLock.RLock()
defer s.leasesLock.RUnlock() </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.RUnlock() | <mask> if lease.Expiry.Unix() > now {
<mask> result = append(result, *lease)
<mask> }
<mask> }
<mask> s.RUnlock()
<mask>
<mask> return result
<mask> }
<mask>
<mask> // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.leasesLock.RLock()
defer s.leasesLock.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Lock() | <mask> }
<mask>
<mask> // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
<mask> func (s *Server) StaticLeases() []Lease {
<mask> s.Lock()
<mask> if s.IPpool == nil {
<mask> s.dbLoad()
<mask> }
<mask> s.Unlock()
<mask>
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Unlock() | <mask> s.Lock()
<mask> if s.IPpool == nil {
<mask> s.dbLoad()
<mask> }
<mask> s.Unlock()
<mask>
<mask> var result []Lease
<mask> s.RLock()
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() == 1 {
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.leasesLock.RLock()
defer s.leasesLock.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.RLock() | <mask> }
<mask> s.Unlock()
<mask>
<mask> var result []Lease
<mask> s.RLock()
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() == 1 {
<mask> result = append(result, *lease)
<mask> }
<mask> }
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.leasesLock.RLock()
defer s.leasesLock.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.RUnlock() | <mask> if lease.Expiry.Unix() == 1 {
<mask> result = append(result, *lease)
<mask> }
<mask> }
<mask> s.RUnlock()
<mask> return result
<mask> }
<mask>
<mask> // Print information about the current leases
<mask> func (s *Server) printLeases() {
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove ServerConfig
sync.RWMutex
</s> add conf ServerConfig | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.RLock()
defer s.leasesLock.RUnlock() | <mask>
<mask> // FindIPbyMAC finds an IP address by MAC address in the currently active DHCP leases
<mask> func (s *Server) FindIPbyMAC(mac net.HardwareAddr) net.IP {
<mask> now := time.Now().Unix()
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask> for _, l := range s.leases {
<mask> if l.Expiry.Unix() > now && bytes.Equal(mac, l.HWAddr) {
<mask> return l.IP
<mask> }
<mask> }
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() </s> remove s.RLock()
</s> add s.leasesLock.RLock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.RUnlock()
</s> add s.leasesLock.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Lock() | <mask> }
<mask>
<mask> // Reset internal state
<mask> func (s *Server) reset() {
<mask> s.Lock()
<mask> s.leases = nil
<mask> s.Unlock()
<mask> s.IPpool = make(map[[4]byte]net.HardwareAddr)
<mask> }
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
s.leasesLock.Unlock() | <mask> // Reset internal state
<mask> func (s *Server) reset() {
<mask> s.Lock()
<mask> s.leases = nil
<mask> s.Unlock()
<mask> s.IPpool = make(map[[4]byte]net.HardwareAddr)
<mask> }
</s> * dhcpd: refactor: use separate objects for ServerConfig and RWMutex </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Unlock()
</s> add s.leasesLock.Unlock() </s> remove s.Lock()
</s> add s.leasesLock.Lock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa47fa3f9c5d42ae8ce4b686b9f3ba513286052d | dhcpd/dhcpd.go |
'dockerGo': 'adguard/golang-ubuntu:5.4' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.3'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). </s> remove log.Error("getting system directory: %s", err)
</s> add log.Error("aghnet: getting system directory: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.4' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.3'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). </s> remove log.Error("getting system directory: %s", err)
</s> add log.Error("aghnet: getting system directory: %s", err) </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.4' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.4' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.3'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | bamboo-specs/test.yaml |
"anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> .",
"confirm_dns_cache_clear": "Apakah Anda yakin ingin menghapus cache DNS?",
"cache_cleared": "Cache DNS berhasil dibersihkan",
"clear_cache": "Hapus cache" | <mask> "parental_control": "Kontrol Orang Tua",
<mask> "safe_browsing": "Penjelajahan Aman",
<mask> "served_from_cache": "{{value}} <i>(disajikan dari cache)</i>",
<mask> "form_error_password_length": "Kata sandi harus minimal {{value}} karakter",
<mask> "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> ."
<mask> }
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>."
</s> add "anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>.",
"confirm_dns_cache_clear": "Weet je zeker dat je de DNS-cache wilt wissen?",
"cache_cleared": "DNS-cache succesvol gewist",
"clear_cache": "Cache wissen" </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | client/src/__locales/id.json |
"anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>.",
"confirm_dns_cache_clear": "Weet je zeker dat je de DNS-cache wilt wissen?",
"cache_cleared": "DNS-cache succesvol gewist",
"clear_cache": "Cache wissen" | <mask> "parental_control": "Ouderlijk toezicht",
<mask> "safe_browsing": "Veilig browsen",
<mask> "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
<mask> "form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn",
<mask> "anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>."
<mask> }
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> ."
</s> add "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> .",
"confirm_dns_cache_clear": "Apakah Anda yakin ingin menghapus cache DNS?",
"cache_cleared": "Cache DNS berhasil dibersihkan",
"clear_cache": "Hapus cache" </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() </s> remove log.Error("getting system directory: %s", err)
</s> add log.Error("aghnet: getting system directory: %s", err) </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | client/src/__locales/nl.json |
log.Error("aghnet: getting system directory: %s", err) | <mask>
<mask> func defaultHostsPaths() (paths []string) {
<mask> sysDir, err := windows.GetSystemDirectory()
<mask> if err != nil {
<mask> log.Error("getting system directory: %s", err)
<mask>
<mask> return []string{}
<mask> }
<mask>
<mask> // Split all the elements of the path to join them afterwards. This is
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghnet/hostscontainer_windows.go |
// RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | <mask> func IsOpenWrt() (ok bool) {
<mask> return isOpenWrt()
<mask> }
<mask>
<mask> // RootDirFS returns the fs.FS rooted at the operating system's root.
<mask> func RootDirFS() (fsys fs.FS) {
<mask> // Use empty string since os.DirFS implicitly prepends a slash to it. This
<mask> // behavior is undocumented but it currently works.
<mask> return os.DirFS("")
<mask> }
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() </s> remove log.Error("getting system directory: %s", err)
</s> add log.Error("aghnet: getting system directory: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghos/os.go |
return rootDirFS() | <mask> }
<mask>
<mask> // RootDirFS returns the fs.FS rooted at the operating system's root.
<mask> func RootDirFS() (fsys fs.FS) {
<mask> // Use empty string since os.DirFS implicitly prepends a slash to it. This
<mask> // behavior is undocumented but it currently works.
<mask> return os.DirFS("")
<mask> }
<mask>
<mask> // NotifyReconfigureSignal notifies c on receiving reconfigure signals.
<mask> func NotifyReconfigureSignal(c chan<- os.Signal) {
<mask> notifyReconfigureSignal(c)
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). </s> remove log.Error("getting system directory: %s", err)
</s> add log.Error("aghnet: getting system directory: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghos/os.go |
"io/fs" | <mask> package aghos
<mask>
<mask> import (
<mask> "os"
<mask> "os/signal"
<mask>
<mask> "golang.org/x/sys/unix"
<mask> )
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghos/os_unix.go |
func rootDirFS() (fsys fs.FS) {
return os.DirFS("/")
}
| <mask>
<mask> "golang.org/x/sys/unix"
<mask> )
<mask>
<mask> func notifyReconfigureSignal(c chan<- os.Signal) {
<mask> signal.Notify(c, unix.SIGHUP)
<mask> }
<mask>
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() </s> remove log.Error("getting system directory: %s", err)
</s> add log.Error("aghnet: getting system directory: %s", err) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghos/os_unix.go |
"io/fs" | <mask>
<mask> package aghos
<mask>
<mask> import (
<mask> "os"
<mask> "os/signal"
<mask> "path/filepath"
<mask> "syscall"
<mask>
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghos/os_windows.go |
"path/filepath" | <mask> "os"
<mask> "os/signal"
<mask> "syscall"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "golang.org/x/sys/windows"
<mask> )
<mask>
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghos/os_windows.go |
"github.com/AdguardTeam/golibs/log" | <mask> "path/filepath"
<mask> "syscall"
<mask>
<mask> "golang.org/x/sys/windows"
<mask> )
<mask>
<mask> func rootDirFS() (fsys fs.FS) {
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghos/os_windows.go |
func rootDirFS() (fsys fs.FS) {
// TODO(a.garipov): Use a better way if golang/go#44279 is ever resolved.
sysDir, err := windows.GetSystemDirectory()
if err != nil {
log.Error("aghos: getting root filesystem: %s; using C:", err)
// Assume that C: is the safe default.
return os.DirFS("C:")
}
return os.DirFS(filepath.VolumeName(sysDir))
}
| <mask> )
<mask>
<mask> func setRlimit(val uint64) (err error) {
<mask> return Unsupported("setrlimit")
<mask> }
<mask>
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // Use empty string since os.DirFS implicitly prepends a slash to it. This
// behavior is undocumented but it currently works.
return os.DirFS("")
</s> add return rootDirFS() </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). </s> remove log.Error("getting system directory: %s", err)
</s> add log.Error("aghnet: getting system directory: %s", err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/aghos/os_windows.go |
"||aus.social^", | <mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z\"/></svg>"),
<mask> Rules: []string{
<mask> "||awscommunity.social^",
<mask> "||dju.social^",
<mask> "||dresden.network^",
<mask> "||fedibird.com^",
<mask> "||fosstodon.org^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||colorid.es^",
"||dizl.de^",
</s> add </s> remove "||freiburg.social^",
</s> add </s> remove "||snabelen.no^",
</s> add "||socel.net^", </s> remove "||oslo.town^",
"||pettingzoo.co^",
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
<mask> Name: "Mastodon",
<mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z\"/></svg>"),
<mask> Rules: []string{
<mask> "||awscommunity.social^",
<mask> "||colorid.es^",
<mask> "||dizl.de^",
<mask> "||dju.social^",
<mask> "||dresden.network^",
<mask> "||fedibird.com^",
<mask> "||fosstodon.org^",
<mask> "||freiburg.social^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||freiburg.social^",
</s> add </s> remove "||snabelen.no^",
</s> add "||socel.net^", </s> remove "||oslo.town^",
"||pettingzoo.co^",
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go | |
<mask> "||dju.social^",
<mask> "||dresden.network^",
<mask> "||fedibird.com^",
<mask> "||fosstodon.org^",
<mask> "||freiburg.social^",
<mask> "||glasgow.social^",
<mask> "||h4.io^",
<mask> "||hachyderm.io^",
<mask> "||hessen.social^",
<mask> "||hispagatos.space^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||colorid.es^",
"||dizl.de^",
</s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go | |
<mask> "||hostux.social^",
<mask> "||ieji.de^",
<mask> "||indieweb.social^",
<mask> "||ioc.exchange^",
<mask> "||kfem.cat^",
<mask> "||kolektiva.social^",
<mask> "||kurry.social^",
<mask> "||libretooth.gr^",
<mask> "||livellosegreto.it^",
<mask> "||lor.sh^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||kurry.social^",
"||libretooth.gr^",
</s> add </s> remove "||mast.dragon-fly.club^",
</s> add "||mas.to^", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go | |
<mask> "||indieweb.social^",
<mask> "||ioc.exchange^",
<mask> "||kfem.cat^",
<mask> "||kolektiva.social^",
<mask> "||kurry.social^",
<mask> "||libretooth.gr^",
<mask> "||livellosegreto.it^",
<mask> "||lor.sh^",
<mask> "||m.cmx.im^",
<mask> "||mast.dragon-fly.club^",
<mask> "||masto.ai^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||kfem.cat^",
</s> add </s> remove "||mast.dragon-fly.club^",
</s> add "||mas.to^", </s> remove "||mastodon-belgium.be^",
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go | |
"||mas.to^", | <mask> "||libretooth.gr^",
<mask> "||livellosegreto.it^",
<mask> "||lor.sh^",
<mask> "||m.cmx.im^",
<mask> "||mast.dragon-fly.club^",
<mask> "||masto.ai^",
<mask> "||masto.es^",
<mask> "||masto.nobigtech.es^",
<mask> "||masto.pt^",
<mask> "||mastodon-belgium.be^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||kurry.social^",
"||libretooth.gr^",
</s> add </s> remove "||mastodon-belgium.be^",
</s> add </s> remove "||kfem.cat^",
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
<mask> "||masto.ai^",
<mask> "||masto.es^",
<mask> "||masto.nobigtech.es^",
<mask> "||masto.pt^",
<mask> "||mastodon-belgium.be^",
<mask> "||mastodon.au^",
<mask> "||mastodon.bida.im^",
<mask> "||mastodon.eus^",
<mask> "||mastodon.ie^",
<mask> "||mastodon.iriseden.eu^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||mast.dragon-fly.club^",
</s> add "||mas.to^", </s> remove "||kurry.social^",
"||libretooth.gr^",
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go | |
"||mastodon.com.tr^", | <mask> "||masto.pt^",
<mask> "||mastodon.au^",
<mask> "||mastodon.bida.im^",
<mask> "||mastodon.eus^",
<mask> "||mastodon.ie^",
<mask> "||mastodon.iriseden.eu^",
<mask> "||mastodon.lol^",
<mask> "||mastodon.nl^",
<mask> "||mastodon.nu^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||mastodon-belgium.be^",
</s> add </s> remove "||mast.dragon-fly.club^",
</s> add "||mas.to^", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
"||mastodon.lol^", | <mask> "||mastodon.ie^",
<mask> "||mastodon.iriseden.eu^",
<mask> "||mastodon.nl^",
<mask> "||mastodon.nu^",
<mask> "||mastodon.nz^",
<mask> "||mastodon.online^",
<mask> "||mastodon.scot^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||mastodon.se^",
</s> add </s> remove "||mastodon-belgium.be^",
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
<mask> "||mastodon.nz^",
<mask> "||mastodon.online^",
<mask> "||mastodon.scot^",
<mask> "||mastodon.sdf.org^",
<mask> "||mastodon.se^",
<mask> "||mastodon.social^",
<mask> "||mastodon.uno^",
<mask> "||mastodon.world^",
<mask> "||mastodon.zaclys.com^",
<mask> "||mastodonapp.uk^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go | |
"||mastodon.top^", | <mask> "||mastodon.online^",
<mask> "||mastodon.scot^",
<mask> "||mastodon.sdf.org^",
<mask> "||mastodon.social^",
<mask> "||mastodon.uno^",
<mask> "||mastodon.world^",
<mask> "||mastodon.zaclys.com^",
<mask> "||mastodonapp.uk^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||mastodon.se^",
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
"||meow.social^",
"||metalhead.club^", | <mask> "||mastodontti.fi^",
<mask> "||mastouille.fr^",
<mask> "||mathstodon.xyz^",
<mask> "||mindly.social^",
<mask> "||mstdn.ca^",
<mask> "||mstdn.jp^",
<mask> "||mstdn.party^",
<mask> "||mstdn.social^",
<mask> "||muenchen.social^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
"||nerdculture.de^", | <mask> "||mstdn.party^",
<mask> "||mstdn.social^",
<mask> "||muenchen.social^",
<mask> "||muenster.im^",
<mask> "||newsie.social^",
<mask> "||noc.social^",
<mask> "||norden.social^",
<mask> "||nrw.social^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||oslo.town^",
"||pettingzoo.co^",
</s> add </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
<mask> "||norden.social^",
<mask> "||nrw.social^",
<mask> "||o3o.ca^",
<mask> "||ohai.social^",
<mask> "||oslo.town^",
<mask> "||pettingzoo.co^",
<mask> "||pewtix.com^",
<mask> "||phpc.social^",
<mask> "||piaille.fr^",
<mask> "||pol.social^",
<mask> "||qdon.space^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go | |
"||socel.net^", | <mask> "||rollenspiel.social^",
<mask> "||ruby.social^",
<mask> "||ruhr.social^",
<mask> "||sfba.social^",
<mask> "||snabelen.no^",
<mask> "||social.anoxinon.de^",
<mask> "||social.cologne^",
<mask> "||social.dev-wiki.de^",
<mask> "||social.politicaconciencia.org^",
<mask> "||social.vivaldi.net^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||sociale.network^",
</s> add "||sself.co^", </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
"||social.linux.pizza^", | <mask> "||social.cologne^",
<mask> "||social.dev-wiki.de^",
<mask> "||social.politicaconciencia.org^",
<mask> "||social.vivaldi.net^",
<mask> "||sself.co^",
<mask> "||sueden.social^",
<mask> "||techhub.social^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||sociale.network^",
</s> add "||sself.co^", </s> remove "||snabelen.no^",
</s> add "||socel.net^", </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.