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
cmd: "arp", // Use -n flag to avoid resolving the hostnames of the neighbors. By // default ARP attempts to resolve the hostnames via DNS. See man 8 // arp. // // See also https://github.com/AdguardTeam/AdGuardHome/issues/3157. args: []string{"-a", "-n"},
<mask> ns: &neighs{ <mask> mu: &sync.RWMutex{}, <mask> ns: make([]Neighbor, 0), <mask> }, <mask> cmd: "arp", <mask> args: []string{"-a"}, <mask> } <mask> } <mask> <mask> // parseArpA parses the output of the "arp -a" command on macOS and FreeBSD. <mask> // The expected input format: </s> Pu...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_bsd.go
// parseArpA parses the output of the "arp -a -n" command on macOS and FreeBSD.
<mask> args: []string{"-a"}, <mask> } <mask> } <mask> <mask> // parseArpA parses the output of the "arp -a" command on macOS and FreeBSD. <mask> // The expected input format: <mask> // <mask> // host.name (192.168.0.1) at ff:ff:ff:ff:ff:ff on en0 ifscope [ethernet] <mask> // <mask> func parseArpA(sc *bu...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_bsd.go
// Then, try "arp -a -n".
<mask> ns: ns, <mask> fsys: rootDirFS, <mask> filename: "proc/net/arp", <mask> }, <mask> // Then, try "arp -a". <mask> &cmdARPDB{ <mask> parse: parseF, <mask> ns: ns, <mask> cmd: "arp", <mask> args: []string{"-a"}, </s> Pull request: 3157 excessive ptrs Merge in DN...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_linux.go
// Use -n flag to avoid resolving the hostnames of the neighbors. // By default ARP attempts to resolve the hostnames via DNS. See // man 8 arp. // // See also https://github.com/AdguardTeam/AdGuardHome/issues/3157. args: []string{"-a", "-n"},
<mask> &cmdARPDB{ <mask> parse: parseF, <mask> ns: ns, <mask> cmd: "arp", <mask> args: []string{"-a"}, <mask> }, <mask> // Finally, try "ip neigh". <mask> &cmdARPDB{ <mask> parse: parseIPNeigh, <mask> ns: ns, </s> Pull request: 3157 excessive ptrs Merge in DNS/adguard-home...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_linux.go
// parseArpAWrt parses the output of the "arp -a -n" command on OpenWrt. The
<mask> func (arp *fsysARPDB) Neighbors() (ns []Neighbor) { <mask> return arp.ns.clone() <mask> } <mask> <mask> // parseArpAWrt parses the output of the "arp -a" command on OpenWrt. The <mask> // expected input format: <mask> // <mask> // IP address HW type Flags HW address Mask ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_linux.go
// IP address HW type Flags HW address Mask Device // 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan
<mask> <mask> // parseArpAWrt parses the output of the "arp -a" command on OpenWrt. The <mask> // expected input format: <mask> // <mask> // IP address HW type Flags HW address Mask Device <mask> // 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan <...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_linux.go
// parseArpA parses the output of the "arp -a -n" command on Linux. The // expected input format:
<mask> <mask> return ns <mask> } <mask> <mask> // parseArpA parses the output of the "arp -a" command on Linux. The expected <mask> // input format: <mask> // <mask> // hostname (192.168.1.1) at ab:cd:ef:ab:cd:ef [ether] on enp0s3 <mask> // <mask> func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Nei...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_linux.go
func newARPDB() (arp *cmdARPDB) {
<mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> func newARPDB() *cmdARPDB { <mask> return &cmdARPDB{ <mask> parse: parseArpA, <mask> ns: &neighs{ <mask> mu: &sync.RWMutex{}, <mask> ns: make([]Neighbor, 0), </s> Pull request: 3157 excessive ptrs Merge in DNS/adguard-hom...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_openbsd.go
cmd: "arp", // Use -n flag to avoid resolving the hostnames of the neighbors. By // default ARP attempts to resolve the hostnames via DNS. See man 8 // arp. // // See also https://github.com/AdguardTeam/AdGuardHome/issues/3157. args: []string{"-a", "-n"},
<mask> ns: &neighs{ <mask> mu: &sync.RWMutex{}, <mask> ns: make([]Neighbor, 0), <mask> }, <mask> cmd: "arp", <mask> args: []string{"-a"}, <mask> } <mask> } <mask> <mask> // parseArpA parses the output of the "arp -a" command on OpenBSD. The expected <mask> // input format: </s> Pull reques...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_openbsd.go
// parseArpA parses the output of the "arp -a -n" command on OpenBSD. The // expected input format:
<mask> args: []string{"-a"}, <mask> } <mask> } <mask> <mask> // parseArpA parses the output of the "arp -a" command on OpenBSD. The expected <mask> // input format: <mask> // <mask> // Host Ethernet Address Netif Expire Flags <mask> // 192.168.1.1 ab:cd:ef:ab:cd:ef em0 19m59s <mask> // ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_openbsd.go
func newARPDB() (arp *cmdARPDB) {
<mask> "strings" <mask> "sync" <mask> ) <mask> <mask> func newARPDB() *cmdARPDB { <mask> return &cmdARPDB{ <mask> parse: parseArpA, <mask> ns: &neighs{ <mask> mu: &sync.RWMutex{}, <mask> ns: make([]Neighbor, 0), </s> Pull request: 3157 excessive ptrs Merge in DNS/adguard-home from 3157-excessi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/aghnet/arpdb_windows.go
want int
<mask> <mask> testCases := []struct { <mask> name string <mask> msg dns.Msg <mask> want bool <mask> }{{ <mask> name: "simple", <mask> msg: dns.Msg{ <mask> MsgHdr: dns.MsgHdr{ <mask> Id: 1234, </s> Pull request: 3157 excessive ptrs Merge in DNS/adguard-home from 3157-excessive-ptrs to ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/dnsforward/recursiondetector_test.go
want: 1,
<mask> Name: "some.domain", <mask> Qtype: dns.TypeA, <mask> }}, <mask> }, <mask> want: true, <mask> }, { <mask> name: "unencumbered", <mask> msg: dns.Msg{}, <mask> want: false, <mask> }} </s> Pull request: 3157 excessive ptrs Merge in DNS/adguard-home from 3157-excessive-ptrs to mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/dnsforward/recursiondetector_test.go
want: 0,
<mask> want: true, <mask> }, { <mask> name: "unencumbered", <mask> msg: dns.Msg{}, <mask> want: false, <mask> }} <mask> <mask> for _, tc := range testCases { <mask> t.Run(tc.name, func(t *testing.T) { <mask> t.Cleanup(rd.clear) </s> Pull request: 3157 excessive ptrs Merge in DNS/adguard-ho...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/dnsforward/recursiondetector_test.go
assert.Equal(t, tc.want, rd.recentRequests.Stats().Count)
<mask> t.Run(tc.name, func(t *testing.T) { <mask> t.Cleanup(rd.clear) <mask> <mask> rd.add(tc.msg) <mask> <mask> if tc.want { <mask> assert.Equal(t, 1, rd.recentRequests.Stats().Count) <mask> } else { <mask> assert.Zero(t, rd.recentRequests.Stats().Count) <mask> } <mask> }) <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/dnsforward/recursiondetector_test.go
// usePrivate is used to store the state of current private RDNS resolving // settings and to react to it's changes.
<mask> type RDNS struct { <mask> exchanger dnsforward.RDNSExchanger <mask> clients *clientsContainer <mask> <mask> // usePrivate is used to store the state of current private RDNS <mask> // resolving settings and to react to it's changes. <mask> usePrivate uint32 <mask> <mask> // ipCh used to pass cl...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/home/rdns.go
// address stays here while it's inside clients. After leaving clients the // address will be resolved once again. If the address couldn't be // resolved, cache prevents further attempts to resolve it for some time.
<mask> // ipCh used to pass client's IP to rDNS workerLoop. <mask> ipCh chan net.IP <mask> <mask> // ipCache caches the IP addresses to be resolved by rDNS. The resolved <mask> // address stays here while it's inside clients. After leaving clients <mask> // the address will be resolved once again. If the...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb
internal/home/rdns.go
'GO_VERSION': '1.19.5'
<mask> 'name': 'build' <mask> <mask> 'env': <mask> 'GO_VERSION': '1.18.9' <mask> 'NODE_VERSION': '14' <mask> <mask> 'on': <mask> 'push': <mask> 'branches': </s> Pull request 1729: upd-go Merge in DNS/adguard-home from upd-go to master Squashed commit of the following: commit 0e13d6863a3d4632898...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
.github/workflows/build.yml
'GO_VERSION': '1.19.5'
<mask> 'name': 'lint' <mask> <mask> 'env': <mask> 'GO_VERSION': '1.18.9' <mask> <mask> 'on': <mask> 'push': <mask> 'tags': <mask> - 'v*' </s> Pull request 1729: upd-go Merge in DNS/adguard-home from upd-go to master Squashed commit of the following: commit 0e13d6863a3d463289823a27414b427cb76b...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
.github/workflows/lint.yml
'dockerGo': 'adguard/golang-ubuntu:6.0'
<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.4' <mask> <mask> 'stages': <mask> - 'Build frontend': <mask> 'manual': false <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
bamboo-specs/release.yaml
'dockerGo': 'adguard/golang-ubuntu:6.0'
<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.4' <mask> # release-vX.Y.Z branches are the branches from which the actual final...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
bamboo-specs/release.yaml
'dockerGo': 'adguard/golang-ubuntu:6.0'
<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.4' </s> Pull request 1729: upd-go Merge in DNS/adguard-home from ...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
bamboo-specs/release.yaml
'dockerGo': 'adguard/golang-ubuntu:6.0'
<mask> 'project-key': 'AGH' <mask> 'key': 'AHBRTSPECS' <mask> 'name': 'AdGuard Home - Build and run tests' <mask> 'variables': <mask> 'dockerGo': 'adguard/golang-ubuntu:5.4' <mask> <mask> 'stages': <mask> - 'Tests': <mask> 'manual': false <mask> 'final': false </s> Pull request 1729: upd-go ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
bamboo-specs/test.yaml
go 1.19
<mask> module github.com/AdguardTeam/AdGuardHome <mask> <mask> go 1.18 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.47.0 <mask> github.com/AdguardTeam/golibs v0.11.4 <mask> github.com/AdguardTeam/urlfilter v0.16.1 </s> Pull request 1729: upd-go Merge in DNS/adguard-home from upd-go t...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
// TODO(a.garipov): Use v0.48.0 when it's released. github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239
<mask> <mask> go 1.18 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.47.0 <mask> github.com/AdguardTeam/golibs v0.11.4 <mask> github.com/AdguardTeam/urlfilter v0.16.1 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.2.5 <mask> github.com/digineo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
<mask> github.com/google/renameio v1.0.1 <mask> github.com/google/uuid v1.3.0 <mask> github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 <mask> github.com/kardianos/service v1.2.2 <mask> github.com/lucas-clemente/quic-go v0.31.1 <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
github.com/quic-go/quic-go v0.32.0
<mask> github.com/mdlayher/raw v0.1.0 <mask> github.com/miekg/dns v1.1.50 <mask> github.com/stretchr/testify v1.8.1 <mask> github.com/ti-mo/netfilter v0.5.0 <mask> go.etcd.io/bbolt v1.3.7 <mask> golang.org/x/crypto v0.5.0 <mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771 </s> Pull request 1729: ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
<mask> github.com/stretchr/testify v1.8.1 <mask> github.com/ti-mo/netfilter v0.5.0 <mask> go.etcd.io/bbolt v1.3.7 <mask> golang.org/x/crypto v0.5.0 <mask> golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 <mask> golang.org/x/net v0.5.0 <mask> golang.org/x/sys v0.4.0 <mask> gopkg.in/natefinch/lumberjac...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
golang.org/x/sys v0.5.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1
<mask> go.etcd.io/bbolt v1.3.7 <mask> golang.org/x/crypto v0.5.0 <mask> golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 <mask> golang.org/x/net v0.5.0 <mask> golang.org/x/sys v0.4.0 <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 <mask> gopkg.in/yaml.v3 v3.0.1 <mask> howett.net/plist v1.0.0 <mask> )...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
<mask> howett.net/plist v1.0.0 <mask> ) <mask> <mask> require ( <mask> github.com/BurntSushi/toml v1.1.0 // indirect <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect <mask> github.com/ameshkov/dnss...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
<mask> github.com/bluele/gcache v0.0.2 // indirect <mask> github.com/davecgh/go-spew v1.1.1 // indirect <mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect <mask> github.com/golang/mock v1.6.0 // indirect <mask> github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
<mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect <mask> github.com/golang/mock v1.6.0 // indirect <mask> github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect <mask> github.com/josharian/native v1.1.0 // indirect <mask> github.com/marten-seemann/qpack v0.3.0...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
github.com/quic-go/qpack v0.4.0 // indirect github.com/quic-go/qtls-go1-18 v0.2.0 // indirect github.com/quic-go/qtls-go1-19 v0.2.0 // indirect github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect <mask> github.com/pmezard/go-difflib v1.0.0 // indirect <mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect <mask> golang.org/x/mod v0.7.0 // indirect <mask> golang.org/x/sync v0.1.0 // indirect <mask> golang.org/x/text v0.6.0 // indire...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.mod
github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239 h1:n1oOiywOvdeqWLto809bK1rK1EPDkpaSfT/r1OiCVaQ= github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239/go.mod h1:+Sdi5ISrjDFbeCsKNqzcC1Ag7pJ5Hh9y+UBNb3dfqJ4=
<mask> github.com/AdguardTeam/dnsproxy v0.47.0 h1:h/ycmA8QhyuwlMYRj2Egtw86+AFxs5wQQT2qskLWyXU= <mask> github.com/AdguardTeam/dnsproxy v0.47.0/go.mod h1:ZEkTmTJ2XInT3aVy0mHtEnSWSclpHHj/9hfNXDuAk5k= <mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/Ad...
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
<mask> github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA= <mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU= <mask> github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw= <mask> github.co...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U= github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
<mask> github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= <mask> github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= <mask> github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= <mask> github.com/google/gopacket v1.1.19/go....
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
<mask> github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= <mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= <mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= <mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkid...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U= github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZN...
<mask> github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= <mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= <mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= <mask> github.com/shirou/gopsutil/...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<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.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
<mask> google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= <mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= <mask> gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= <mask> gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= <mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= <mask> gopkg.i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
go.sum
"github.com/quic-go/quic-go"
<mask> <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/lucas-clemente/quic-go" <mask> ) <mask> <mask> // ValidateClientID returns an error if id is not a valid ClientID. <mask> func ValidateClie...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid.go
srvName = pctx.HTTPRequest.TLS.ServerName
<mask> // clientServerName returns the TLS server name based on the protocol. <mask> func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) { <mask> switch proto { <mask> case proxy.ProtoHTTPS: <mask> // github.com/lucas-clemente/quic-go seems to not populate the TLS <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", ...
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid.go
"github.com/quic-go/quic-go"
<mask> "testing" <mask> <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/testutil" <mask> "github.com/lucas-clemente/quic-go" <mask> "github.com/stretchr/testify/assert" <mask> ) <mask> <mask> // testTLSConn is a tlsConn for tests. <mask> type testTLSConn struct { <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName string <mask> wantClientID string <mask> wantErrMsg string <mask> strictSNI bool <mask> useHTTP3 bool <mask> }{{ <mask> name: "udp", <mask> proto: proxy.ProtoUDP, <mask> hostSrvName: "", <mask> cliSrvName: "", </s> Pull request 1729: upd-go M...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> strictSNI: false, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_no_clientid", <mask> proto: proxy.ProtoTLS, <mask> hostSrvName: "example.com", <mask> cliSrvName: "example.com",...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "example.com", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_no_client_server_name", <mask> proto: proxy.ProtoTLS, <mask> hostSrvName: "example.com", <mask> cliSrvNa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> wantClientID: "", <mask> wantErrMsg: `clientid check: client server name "" ` + <mask> `doesn't match host server name "example.com"`, <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_no_client_server_name_no_strict", <mask> proto: proxy.ProtoT...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> strictSNI: false, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_clientid", <mask> proto: proxy.ProtoTLS, <mask> hostSrvName: "example.com", <mask> cliSrvName: "cli.example.com"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "cli.example.com", <mask> wantClientID: "cli", <mask> wantErrMsg: "", <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_clientid_hostname_error", <mask> proto: proxy.ProtoTLS, <mask> hostSrvName: "example.com", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> wantClientID: "", <mask> wantErrMsg: `clientid check: client server name "cli.example.net" ` + <mask> `doesn't match host server name "example.com"`, <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_invalid_clientid", <mask> proto: proxy.ProtoT...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> wantClientID: "", <mask> wantErrMsg: `clientid check: invalid clientid "!!!": ` + <mask> `bad domain name label rune '!'`, <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_clientid_too_long", <mask> proto: proxy.ProtoTLS, <mask> hostSrvName: "...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> wantErrMsg: `clientid check: invalid clientid "abcdefghijklmno` + <mask> `pqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789": ` + <mask> `domain name label is too long: got 72, max 63`, <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "quic_clientid"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "cli.example.com", <mask> wantClientID: "cli", <mask> wantErrMsg: "", <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_clientid_issue3437", <mask> proto: proxy.ProtoTLS, <mask> hostSrvName: "example.com", <mask> cliS...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> wantClientID: "", <mask> wantErrMsg: `clientid check: client server name "cli.myexample.com" ` + <mask> `doesn't match host server name "example.com"`, <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "tls_case", <mask> proto: proxy.ProtoTLS, <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "InSeNsItIvE.example.com", <mask> wantClientID: "insensitive", <mask> wantErrMsg: ``, <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "quic_case", <mask> proto: proxy.ProtoQUIC, <mask> hostSrvName: "example.com", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "InSeNsItIvE.example.com", <mask> wantClientID: "insensitive", <mask> wantErrMsg: ``, <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "https_no_clientid", <mask> proto: proxy.ProtoHTTPS, <mask> hostSrvName: "example.com", ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "example.com", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "https_clientid", <mask> proto: proxy.ProtoHTTPS, <mask> hostSrvName: "example.com", <mask> cliSrvName: "cl...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "cli.example.com", <mask> wantClientID: "cli", <mask> wantErrMsg: "", <mask> strictSNI: true, <mask> useHTTP3: false, <mask> }, { <mask> name: "https_clientid_quic", <mask> proto: proxy.ProtoHTTPS, <mask> hostSrvName: "example.com", <mask> cliSr...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
httpReq = newHTTPReq(tc.cliSrvName)
<mask> ) <mask> <mask> switch tc.proto { <mask> case proxy.ProtoHTTPS: <mask> httpReq = newHTTPReq(tc.cliSrvName, tc.useHTTP3) <mask> case proxy.ProtoQUIC: <mask> qconn = testQUICConnection{ <mask> serverName: tc.cliSrvName, <mask> } <mask> case proxy.ProtoTLS: </s> Pull requ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
func newHTTPReq(cliSrvName string) (r *http.Request) {
<mask> } <mask> } <mask> <mask> // newHTTPReq is a helper to create HTTP requests for tests. <mask> func newHTTPReq(cliSrvName string, useHTTP3 bool) (r *http.Request) { <mask> u := &url.URL{ <mask> Path: "/dns-query", <mask> } <mask> <mask> if useHTTP3 { </s> Pull request 1729: upd-go Merge in DNS/...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
<mask> u := &url.URL{ <mask> Path: "/dns-query", <mask> } <mask> <mask> if useHTTP3 { <mask> return &http.Request{ <mask> ProtoMajor: 3, <mask> ProtoMinor: 0, <mask> URL: u, <mask> Host: cliSrvName, <mask> TLS: &tls.ConnectionState{}, <mask> } <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/dnsforward/clientid_test.go
"github.com/quic-go/quic-go/http3"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/version" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/lucas-clemente/quic-go/http3" <mask> ) <mask> <mask> // getAddrsResponse is t...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/home/controlinstall.go
<mask> type RDNS struct { <mask> exchanger dnsforward.RDNSExchanger <mask> clients *clientsContainer <mask> <mask> // usePrivate is used to store the state of current private RDNS resolving <mask> // settings and to react to it's changes. <mask> usePrivate uint32 <mask> <mask> // ipCh used to pass cl...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/home/rdns.go
// usePrivate stores the state of current private reverse-DNS resolving // settings. usePrivate atomic.Bool
<mask> // address will be resolved once again. If the address couldn't be <mask> // resolved, cache prevents further attempts to resolve it for some time. <mask> ipCache cache.Cache <mask> } <mask> <mask> // Default rDNS values. <mask> const ( <mask> defaultRDNSCacheSize = 10000 <mask> defaultRDNSCacheT...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/home/rdns.go
rDNS.usePrivate.Store(usePrivate)
<mask> MaxCount: defaultRDNSCacheSize, <mask> }), <mask> ipCh: make(chan netip.Addr, defaultRDNSIPChSize), <mask> } <mask> if usePrivate { <mask> rDNS.usePrivate = 1 <mask> } <mask> <mask> go rDNS.workerLoop() <mask> <mask> return rDNS <mask> } </s> Pull request 1729: upd-go Merge in DNS/...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/home/rdns.go
usePrivate := r.exchanger.ResolvesPrivatePTR() if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) {
<mask> // TODO(e.burkov): Clearing cache each time this value changed is not a perfect <mask> // approach since only unresolved locally-served addresses should be removed. <mask> // Implement when improving the cache. <mask> func (r *RDNS) ensurePrivateCache() { <mask> var usePrivate uint32 <mask> if r.exchange...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/home/rdns.go
"github.com/quic-go/quic-go" "github.com/quic-go/quic-go/http3"
<mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/NYTimes/gziphandler" <mask> "github.com/lucas-clemente/quic-go" <mask> "github.com/lucas-clemente/quic-go/http3" <mask> "golang.org/x/net/http2" <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/home/web.go
<mask> <mask> // Service is the AdGuard Home DNS service. A nil *Service is a valid <mask> // [agh.Service] that does nothing. <mask> type Service struct { <mask> // running is an atomic boolean value. Keep it the first value in the <mask> // struct to ensure atomic alignment. 0 means that the service is no...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/dnssvc/dnssvc.go
running atomic.Bool
<mask> proxy *proxy.Proxy <mask> bootstraps []string <mask> upstreams []string <mask> upsTimeout time.Duration <mask> } <mask> <mask> // New returns a new properly initialized *Service. If c is nil, svc is a nil <mask> // *Service that does nothing. The fields of c must not be modified after </s> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/dnssvc/dnssvc.go
svc.running.Store(err == nil)
<mask> defer func() { <mask> // TODO(a.garipov): [proxy.Proxy.Start] doesn't actually have any way to <mask> // tell when all servers are actually up, so at best this is merely an <mask> // assumption. <mask> if err != nil { <mask> atomic.StoreUint64(&svc.running, 0) <mask> } else { <mask> atom...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/dnssvc/dnssvc.go
if svc.running.Load() {
<mask> func (svc *Service) Config() (c *Config) { <mask> // TODO(a.garipov): Do we need to get the TCP addresses separately? <mask> <mask> var addrs []netip.AddrPort <mask> if atomic.LoadUint64(&svc.running) == 1 { <mask> udpAddrs := svc.proxy.Addrs(proxy.ProtoUDP) <mask> addrs = make([]netip.AddrPort, l...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/dnssvc/dnssvc.go
var started atomic.Bool
<mask> UpstreamServers: []string{"1.1.1.1"}, <mask> UpstreamTimeout: websvc.JSONDuration(2 * time.Second), <mask> } <mask> <mask> // TODO(a.garipov): Use [atomic.Bool] in Go 1.19. <mask> var numStarted uint64 <mask> confMgr := newConfigManager() <mask> confMgr.onDNS = func() (s agh.ServiceWithConfig...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/websvc/dns_test.go
started.Store(true)
<mask> confMgr := newConfigManager() <mask> confMgr.onDNS = func() (s agh.ServiceWithConfig[*dnssvc.Config]) { <mask> return &aghtest.ServiceWithConfig[*dnssvc.Config]{ <mask> OnStart: func() (err error) { <mask> atomic.AddUint64(&numStarted, 1) <mask> <mask> return nil <mask> }, <mask> O...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/websvc/dns_test.go
assert.True(t, started.Load())
<mask> resp := &websvc.HTTPAPIDNSSettings{} <mask> err := json.Unmarshal(respBody, resp) <mask> require.NoError(t, err) <mask> <mask> assert.Equal(t, uint64(1), numStarted) <mask> assert.Equal(t, wantDNS, resp) <mask> assert.Equal(t, wantDNS, resp) <mask> } </s> Pull request 1729: upd-go Merge in DNS/a...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/websvc/dns_test.go
var accepted atomic.Bool
<mask> "github.com/stretchr/testify/assert" <mask> ) <mask> <mask> func TestWaitListener_Accept(t *testing.T) { <mask> // TODO(a.garipov): use atomic.Bool in Go 1.19. <mask> var numAcceptCalls uint32 <mask> var l net.Listener = &aghtest.Listener{ <mask> OnAccept: func() (conn net.Conn, err error) { <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/websvc/waitlistener_internal_test.go
accepted.Store(true)
<mask> // TODO(a.garipov): use atomic.Bool in Go 1.19. <mask> var numAcceptCalls uint32 <mask> var l net.Listener = &aghtest.Listener{ <mask> OnAccept: func() (conn net.Conn, err error) { <mask> atomic.AddUint32(&numAcceptCalls, 1) <mask> <mask> return nil, nil <mask> }, <mask> OnAddr: func() ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/websvc/waitlistener_internal_test.go
assert.True(t, accepted.Load())
<mask> <mask> wg.Wait() <mask> close(done) <mask> <mask> assert.Equal(t, uint32(1), atomic.LoadUint32(&numAcceptCalls)) <mask> } </s> Pull request 1729: upd-go Merge in DNS/adguard-home from upd-go to master Squashed commit of the following: commit 0e13d6863a3d463289823a27414b427cb76be88c Author: Ainar G...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/next/websvc/waitlistener_internal_test.go
<mask> } <mask> <mask> // StatsCtx collects the statistics and flushes it to the database. Its default <mask> // flushing interval is one hour. <mask> // <mask> // TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19. <mask> type StatsCtx struct { <mask> // limitHours is the maximum number of hours...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
<mask> currMu *sync.RWMutex <mask> // curr is the actual statistics collection result. <mask> curr *unit <mask> <mask> // dbMu protects db. <mask> dbMu *sync.Mutex <mask> // db is the opened statistics database, if any. <mask> db *bbolt.DB <mask> <mask> // unitIDGen is the function that generates an...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
db atomic.Pointer[bbolt.DB]
<mask> <mask> // dbMu protects db. <mask> dbMu *sync.Mutex <mask> // db is the opened statistics database, if any. <mask> db *bbolt.DB <mask> <mask> // unitIDGen is the function that generates an identifier for the current <mask> // unit. It's here for only testing purposes. <mask> unitIDGen UnitIDGe...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
<mask> defer withRecovered(&err) <mask> <mask> s = &StatsCtx{ <mask> currMu: &sync.RWMutex{}, <mask> dbMu: &sync.Mutex{}, <mask> filename: conf.Filename, <mask> configModified: conf.ConfigModified, <mask> httpRegister: conf.HTTPRegister, <mask> } <mask> if s.limitHours...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
tx, err := s.db.Load().Begin(true)
<mask> <mask> var udb *unitDB <mask> id := s.unitIDGen() <mask> <mask> tx, err := s.db.Begin(true) <mask> if err != nil { <mask> return nil, fmt.Errorf("stats: opening a transaction: %w", err) <mask> } <mask> <mask> deleted := deleteOldUnits(tx, id-s.limitHours-1) </s> Pull request 1729: upd-go M...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
db := s.db.Swap(nil)
<mask> // Close implements the io.Closer interface for *StatsCtx. <mask> func (s *StatsCtx) Close() (err error) { <mask> defer func() { err = errors.Annotate(err, "stats: closing: %w") }() <mask> <mask> db := s.swapDatabase(nil) <mask> if db == nil { <mask> return nil <mask> } <mask> defer func() { <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
<mask> <mask> return ips <mask> } <mask> <mask> // database returns the database if it's opened. It's safe for concurrent use. <mask> func (s *StatsCtx) database() (db *bbolt.DB) { <mask> s.dbMu.Lock() <mask> defer s.dbMu.Unlock() <mask> <mask> return s.db <mask> } <mask> <mask> // swapDatabase sw...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", ...
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
s.db.Store(db)
<mask> <mask> // Use defer to unlock the mutex as soon as possible. <mask> defer log.Debug("stats: database opened") <mask> <mask> s.dbMu.Lock() <mask> defer s.dbMu.Unlock() <mask> <mask> s.db = db <mask> <mask> return nil <mask> } <mask> <mask> func (s *StatsCtx) flush() (cont bool, sleepFor ti...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
db := s.db.Load()
<mask> if limit == 0 || ptr.id == id { <mask> return true, time.Second <mask> } <mask> <mask> db := s.database() <mask> if db == nil { <mask> return true, 0 <mask> } <mask> <mask> isCommitable := true </s> Pull request 1729: upd-go Merge in DNS/adguard-home from upd-go to master Squashed commit...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
db := s.db.Swap(nil)
<mask> // Reset counters and clear database <mask> func (s *StatsCtx) clear() (err error) { <mask> defer func() { err = errors.Annotate(err, "clearing: %w") }() <mask> <mask> db := s.swapDatabase(nil) <mask> if db != nil { <mask> var tx *bbolt.Tx <mask> tx, err = db.Begin(true) <mask> if err != nil {...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
db := s.db.Load()
<mask> return nil <mask> } <mask> <mask> func (s *StatsCtx) loadUnits(limit uint32) (units []*unitDB, firstID uint32) { <mask> db := s.database() <mask> if db == nil { <mask> return nil, 0 <mask> } <mask> <mask> // Use writable transaction to ensure any ongoing writable transaction is </s> Pull requ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats.go
<mask> s.Start() <mask> startTime := time.Now() <mask> testutil.CleanupAndRequireSuccess(t, s.Close) <mask> <mask> type signal = struct{} <mask> <mask> writeFunc := func(start, fin *sync.WaitGroup, waitCh <-chan unit, i int) { <mask> e := Entry{ <mask> Domain: fmt.Sprintf("example-%d.org", i), <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/stats/stats_internal_test.go
go 1.19
<mask> module github.com/AdguardTeam/AdGuardHome/internal/tools <mask> <mask> go 1.18 <mask> <mask> require ( <mask> github.com/fzipp/gocyclo v0.6.0 <mask> github.com/golangci/misspell v0.4.0 <mask> github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 </s> Pull request 1729: upd-go Merge...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.mod
github.com/securego/gosec/v2 v2.15.0
<mask> github.com/golangci/misspell v0.4.0 <mask> github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 <mask> github.com/kisielk/errcheck v1.6.3 <mask> github.com/kyoh86/looppointer v0.2.1 <mask> github.com/securego/gosec/v2 v2.14.0 <mask> golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.mod
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 honnef.co/go/tools v0.4.0
<mask> github.com/kisielk/errcheck v1.6.3 <mask> github.com/kyoh86/looppointer v0.2.1 <mask> github.com/securego/gosec/v2 v2.14.0 <mask> golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 <mask> golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33 <mask> honnef.co/go/tools v0.3.3 <mask> mvdan.cc/gofu...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.mod
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // 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-20230131160201-f...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.mod
golang.org/x/sys v0.5.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
<mask> golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect <mask> golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect <mask> golang.org/x/mod v0.7.0 // indirect <mask> golang.org/x/sync v0.1.0 // indirect <mask> golang.org/x/sys v0.4.0 // indirect <mask> gopkg.in/yaml.v2 v...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.mod
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
<mask> github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= <mask> github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= <mask> github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= <mask> github.com/golangci/misspell v0.4.0...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.sum
github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
<mask> github.com/kyoh86/nolint v0.0.1 h1:GjNxDEkVn2wAxKHtP7iNTrRxytRZ1wXxLV5j4XzGfRU= <mask> github.com/kyoh86/nolint v0.0.1/go.mod h1:1ZiZZ7qqrZ9dZegU96phwVcdQOMKIqRzFJL3ewq9gtI= <mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= <mask> github....
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.sum
github.com/securego/gosec/v2 v2.15.0 h1:v4Ym7FF58/jlykYmmhZ7mTm7FQvN/setNm++0fgIAtw= github.com/securego/gosec/v2 v2.15.0/go.mod h1:VOjTrZOkUtSDt2QLSJmQBMWnvwiQPEjg0l+5juIqGk8=
<mask> github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A= <mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= <mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= <mask> github.c...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.sum
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s= go...
<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:LzIPMQfyMNh...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f
internal/tools/go.sum