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 |
|---|---|---|---|---|
ClientProtoDoH ClientProto = "doh"
ClientProtoDoQ ClientProto = "doq"
ClientProtoDoT ClientProto = "dot" | <mask> type ClientProto string
<mask>
<mask> // Client protocol names.
<mask> const (
<mask> ClientProtoDOH ClientProto = "doh"
<mask> ClientProtoDOQ ClientProto = "doq"
<mask> ClientProtoDOT ClientProto = "dot"
<mask> ClientProtoDNSCrypt ClientProto = "dnscrypt"
<mask> ClientProtoPlain ClientProto = ""
<mask> )
<mask>
<mask> // NewClientProto validates that the client protocol name is valid and returns
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove // isWhoisComment returns true if the string is empty or is a WHOIS comment.
func isWhoisComment(s string) (ok bool) {
</s> add // isWHOISComment returns true if the string is empty or is a WHOIS comment.
func isWHOISComment(s string) (ok bool) { </s> remove func TestWhoisParse(t *testing.T) {
</s> add func TestWHOISParse(t *testing.T) { </s> remove Whois *ClientWhois `json:"whois,omitempty"`
</s> add WHOIS *ClientWHOIS `json:"whois,omitempty"` </s> remove // hardwarePortInfo - information obtained using MacOS networksetup
// about the current state of the internet connection
</s> add // hardwarePortInfo contains information about the current state of the internet
// connection obtained from macOS networksetup. </s> remove // Whois - module context
type Whois struct {
</s> add // WHOIS - module context
type WHOIS struct { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | internal/querylog/qlog.go |
ClientProtoDoH,
ClientProtoDoQ,
ClientProtoDoT, | <mask> // the name as a ClientProto.
<mask> func NewClientProto(s string) (cp ClientProto, err error) {
<mask> switch cp = ClientProto(s); cp {
<mask> case
<mask> ClientProtoDOH,
<mask> ClientProtoDOQ,
<mask> ClientProtoDOT,
<mask> ClientProtoDNSCrypt,
<mask> ClientProtoPlain:
<mask>
<mask> return cp, nil
<mask> default:
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove func (w *Whois) queryAll(ctx context.Context, target string) (string, error) {
</s> add func (w *WHOIS) queryAll(ctx context.Context, target string) (string, error) { </s> remove p.ClientProto = querylog.ClientProtoDOQ
</s> add p.ClientProto = querylog.ClientProtoDoQ </s> remove func (w *Whois) query(ctx context.Context, target, serverAddr string) (data string, err error) {
</s> add func (w *WHOIS) query(ctx context.Context, target, serverAddr string) (data string, err error) { </s> remove func TestWhois(t *testing.T) {
</s> add func TestWHOIS(t *testing.T) { </s> remove whois := &querylog.ClientWhois{}
</s> add whois := &querylog.ClientWHOIS{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | internal/querylog/qlog.go |
'description': 'AdGuard Home HTTPS/DoH/DoQ/DoT settings' | <mask> 'description': 'Enforce family-friendly results in search engines'
<mask> - 'name': 'stats'
<mask> 'description': 'AdGuard Home statistics'
<mask> - 'name': 'tls'
<mask> 'description': 'AdGuard Home HTTPS/DOH/DOT settings'
<mask>
<mask> 'paths':
<mask> '/status':
<mask> 'get':
<mask> 'tags':
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove 'description': 'enabled is the encryption (DOT/DOH/HTTPS) status'
</s> add 'description': 'enabled is the encryption (DoT/DoH/HTTPS) status' </s> remove 'description': 'DNS-over-QUIC port. If 0, DOQ will be disabled.'
</s> add 'description': 'DNS-over-QUIC port. If 0, DoQ will be disabled.' </s> remove 'description': 'DNS-over-TLS port. If 0, DOT will be disabled.'
</s> add 'description': 'DNS-over-TLS port. If 0, DoT will be disabled.' </s> remove The client ID, if provided in DOH, DOQ, or DOT.
</s> add The client ID, if provided in DoH, DoQ, or DoT. </s> remove - 'Publish to Github Releases':
</s> add - 'Publish to GitHub Releases': | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | openapi/openapi.yaml |
The client ID, if provided in DoH, DoQ, or DoT. | <mask> 'example': '192.168.0.1'
<mask> 'type': 'string'
<mask> 'client_id':
<mask> 'description': >
<mask> The client ID, if provided in DOH, DOQ, or DOT.
<mask> 'example': 'cli123'
<mask> 'type': 'string'
<mask> 'client_info':
<mask> '$ref': '#/components/schemas/QueryLogItemClient'
<mask> 'client_proto':
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove 'description': 'DNS-over-QUIC port. If 0, DOQ will be disabled.'
</s> add 'description': 'DNS-over-QUIC port. If 0, DoQ will be disabled.' </s> remove 'description': 'enabled is the encryption (DOT/DOH/HTTPS) status'
</s> add 'description': 'enabled is the encryption (DoT/DoH/HTTPS) status' </s> remove 'description': 'DNS-over-TLS port. If 0, DOT will be disabled.'
</s> add 'description': 'DNS-over-TLS port. If 0, DoT will be disabled.' </s> remove // clientID is the clientID from DOH, DOQ, or DOT, if provided.
</s> add // clientID is the clientID from DoH, DoQ, or DoT, if provided. </s> remove 'description': 'AdGuard Home HTTPS/DOH/DOT settings'
</s> add 'description': 'AdGuard Home HTTPS/DoH/DoQ/DoT settings' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | openapi/openapi.yaml |
'description': 'enabled is the encryption (DoT/DoH/HTTPS) status' | <mask> 'properties':
<mask> 'enabled':
<mask> 'type': 'boolean'
<mask> 'example': true
<mask> 'description': 'enabled is the encryption (DOT/DOH/HTTPS) status'
<mask> 'server_name':
<mask> 'type': 'string'
<mask> 'example': 'example.org'
<mask> 'description': 'server_name is the hostname of your HTTPS/TLS server'
<mask> 'force_https':
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove 'description': 'DNS-over-QUIC port. If 0, DOQ will be disabled.'
</s> add 'description': 'DNS-over-QUIC port. If 0, DoQ will be disabled.' </s> remove The client ID, if provided in DOH, DOQ, or DOT.
</s> add The client ID, if provided in DoH, DoQ, or DoT. </s> remove 'description': 'DNS-over-TLS port. If 0, DOT will be disabled.'
</s> add 'description': 'DNS-over-TLS port. If 0, DoT will be disabled.' </s> remove Enabled bool `yaml:"enabled" json:"enabled"` // Enabled is the encryption (DOT/DOH/HTTPS) status
</s> add Enabled bool `yaml:"enabled" json:"enabled"` // Enabled is the encryption (DoT/DoH/HTTPS) status </s> remove PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` // DNS-over-TLS port. If 0, DOT will be disabled
</s> add PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` // DNS-over-TLS port. If 0, DoT will be disabled | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | openapi/openapi.yaml |
'description': 'DNS-over-TLS port. If 0, DoT will be disabled.' | <mask> 'port_dns_over_tls':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
<mask> 'example': 853
<mask> 'description': 'DNS-over-TLS port. If 0, DOT will be disabled.'
<mask> 'port_dns_over_quic':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
<mask> 'example': 784
<mask> 'description': 'DNS-over-QUIC port. If 0, DOQ will be disabled.'
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove 'description': 'DNS-over-QUIC port. If 0, DOQ will be disabled.'
</s> add 'description': 'DNS-over-QUIC port. If 0, DoQ will be disabled.' </s> remove PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` // DNS-over-TLS port. If 0, DOT will be disabled
</s> add PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` // DNS-over-TLS port. If 0, DoT will be disabled </s> remove Enabled bool `yaml:"enabled" json:"enabled"` // Enabled is the encryption (DOT/DOH/HTTPS) status
</s> add Enabled bool `yaml:"enabled" json:"enabled"` // Enabled is the encryption (DoT/DoH/HTTPS) status </s> remove 'description': 'enabled is the encryption (DOT/DOH/HTTPS) status'
</s> add 'description': 'enabled is the encryption (DoT/DoH/HTTPS) status' </s> remove The client ID, if provided in DOH, DOQ, or DOT.
</s> add The client ID, if provided in DoH, DoQ, or DoT. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | openapi/openapi.yaml |
'description': 'DNS-over-QUIC port. If 0, DoQ will be disabled.' | <mask> 'port_dns_over_quic':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
<mask> 'example': 784
<mask> 'description': 'DNS-over-QUIC port. If 0, DOQ will be disabled.'
<mask> 'certificate_chain':
<mask> 'type': 'string'
<mask> 'description': 'Base64 string with PEM-encoded certificates chain'
<mask> 'private_key':
<mask> 'type': 'string'
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove 'description': 'DNS-over-TLS port. If 0, DOT will be disabled.'
</s> add 'description': 'DNS-over-TLS port. If 0, DoT will be disabled.' </s> remove 'description': 'enabled is the encryption (DOT/DOH/HTTPS) status'
</s> add 'description': 'enabled is the encryption (DoT/DoH/HTTPS) status' </s> remove The client ID, if provided in DOH, DOQ, or DOT.
</s> add The client ID, if provided in DoH, DoQ, or DoT. </s> remove PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` // DNS-over-TLS port. If 0, DOT will be disabled
</s> add PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` // DNS-over-TLS port. If 0, DoT will be disabled </s> remove Enabled bool `yaml:"enabled" json:"enabled"` // Enabled is the encryption (DOT/DOH/HTTPS) status
</s> add Enabled bool `yaml:"enabled" json:"enabled"` // Enabled is the encryption (DoT/DoH/HTTPS) status | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | openapi/openapi.yaml |
<mask> #
<mask> # Do not add "PTR" since we use "Ptr" as a suffix.
<mask> "inherit"
<mask> , "DHCP"
<mask> , "DOH"
<mask> , "DOQ"
<mask> , "DOT"
<mask> , "EDNS"
<mask> , "MX"
<mask> , "QUIC"
<mask> , "RA"
<mask> , "SDNS"
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove ClientProtoDOH,
ClientProtoDOQ,
ClientProtoDOT,
</s> add ClientProtoDoH,
ClientProtoDoQ,
ClientProtoDoT, </s> remove WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
</s> add WHOISInfo *RuntimeClientWHOISInfo `json:"whois_info,omitempty"` </s> remove // initWhois creates the Whois module context.
func initWhois(clients *clientsContainer) *Whois {
w := Whois{
</s> add // initWHOIS creates the WHOIS module context.
func initWHOIS(clients *clientsContainer) *WHOIS {
w := WHOIS{ </s> remove // RuntimeClientWhoisInfo is the filtered WHOIS data for a runtime client.
type RuntimeClientWhoisInfo struct {
</s> add // RuntimeClientWHOISInfo is the filtered WHOIS data for a runtime client.
type RuntimeClientWHOISInfo struct { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | staticcheck.conf | |
, "WHOIS" | <mask> , "SLAAC"
<mask> , "SVCB"
<mask> , "TLD"
<mask> ]
<mask> dot_import_whitelist = []
<mask> http_status_code_whitelist = []
</s> Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names </s> remove , "DOH"
, "DOQ"
, "DOT"
</s> add </s> remove echo "don't publish to Github Releases for this channel"
</s> add echo "don't publish to GitHub Releases for this channel" </s> remove newConf.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH
</s> add newConf.TLSAllowUnencryptedDoH = tlsConf.AllowUnencryptedDoH </s> remove p.ClientProto = querylog.ClientProtoDOQ
</s> add p.ClientProto = querylog.ClientProtoDoQ </s> remove ClientProtoDOH ClientProto = "doh"
ClientProtoDOQ ClientProto = "doq"
ClientProtoDOT ClientProto = "dot"
</s> add ClientProtoDoH ClientProto = "doh"
ClientProtoDoQ ClientProto = "doq"
ClientProtoDoT ClientProto = "dot" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dab7b439d1f2ab6f3d7ad25c1ca6b0f002fc8ddd | staticcheck.conf |
const { name, whois_info } = info; | <mask> let whoisContainer = '';
<mask> let nameContainer = value;
<mask>
<mask> if (info) {
<mask> const { name, whois } = info;
<mask>
<mask> if (name) {
<mask> nameContainer = (
<mask> <span className="logs__text logs__text--wrap" title={`${name} (${value})`}>
<mask> {name} <small>({value})</small>
</s> -(home): fix whois info on the dashboard </s> remove {getFormattedWhois(whois, t)}
</s> add {getFormattedWhois(whois_info, t)} </s> remove if (whois) {
</s> add if (whois_info) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/daf17f16f2a71aa24534aad3c0138d6807fb322b | client/src/helpers/formatClientCell.js |
if (whois_info) { | <mask> </span>
<mask> );
<mask> }
<mask>
<mask> if (whois) {
<mask> whoisContainer = (
<mask> <div className="logs__text logs__text--wrap logs__text--whois">
<mask> {getFormattedWhois(whois, t)}
<mask> </div>
<mask> );
</s> -(home): fix whois info on the dashboard </s> remove const { name, whois } = info;
</s> add const { name, whois_info } = info; </s> remove {getFormattedWhois(whois, t)}
</s> add {getFormattedWhois(whois_info, t)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/daf17f16f2a71aa24534aad3c0138d6807fb322b | client/src/helpers/formatClientCell.js |
{getFormattedWhois(whois_info, t)} | <mask>
<mask> if (whois) {
<mask> whoisContainer = (
<mask> <div className="logs__text logs__text--wrap logs__text--whois">
<mask> {getFormattedWhois(whois, t)}
<mask> </div>
<mask> );
<mask> }
<mask> }
<mask>
</s> -(home): fix whois info on the dashboard </s> remove const { name, whois } = info;
</s> add const { name, whois_info } = info; </s> remove if (whois) {
</s> add if (whois_info) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/daf17f16f2a71aa24534aad3c0138d6807fb322b | client/src/helpers/formatClientCell.js |
Hash string `json:"hash"` | <mask> ClientTTL int `json:"clientTtl"`
<mask> Reason string `json:"reason"`
<mask> }
<mask> err := json.Unmarshal(body, &m)
<mask> if err != nil {
<mask> // error, don't save cache
<mask> log.Printf("Couldn't parse json '%s': %s", body, err)
<mask> return Result{}, err
</s> dnsfilter -- compare full hashes when parsing parental lookup result.
Closes #337. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcbe3dd4051f421553eb7782af67378f3d9ce85b | dnsfilter/dnsfilter.go |
if !hashes[m[i].Hash] {
continue
} | <mask>
<mask> result := Result{}
<mask>
<mask> for i := range m {
<mask> if m[i].Blocked {
<mask> result.IsFiltered = true
<mask> result.Reason = FilteredParental
<mask> result.Rule = fmt.Sprintf("parental %s", m[i].Reason)
<mask> break
<mask> }
</s> dnsfilter -- compare full hashes when parsing parental lookup result.
Closes #337. | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcbe3dd4051f421553eb7782af67378f3d9ce85b | dnsfilter/dnsfilter.go |
d.checkMatchEmpty(t, "api.jquery.com") | <mask> if stats.Parental.Requests != l {
<mask> t.Errorf("Parental lookup negative cache is not working")
<mask> }
<mask> }
<mask>
<mask> func TestSafeSearch(t *testing.T) {
<mask> d := NewForTest()
<mask> defer d.Destroy()
<mask> _, ok := d.SafeSearchDomain("www.google.com")
</s> dnsfilter -- compare full hashes when parsing parental lookup result.
Closes #337. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcbe3dd4051f421553eb7782af67378f3d9ce85b | dnsfilter/dnsfilter_test.go |
func normalizeIP(ip net.IP) net.IP {
ip4 := ip.To4()
if ip4 != nil {
return ip4
}
return ip
}
| <mask> Expiry int64 `json:"exp"`
<mask> }
<mask>
<mask> // Safe version of dhcp4.IPInRange()
<mask> func ipInRange(start, stop, ip net.IP) bool {
<mask> if len(start) != len(stop) ||
<mask> len(start) != len(ip) {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove ok, e := clients.AddHost(ip, host, ClientSourceARP)
</s> add ok, e := clients.addHost(ip, host, ClientSourceARP) </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/db.go |
obj[i].IP = normalizeIP(obj[i].IP) | <mask>
<mask> numLeases := len(obj)
<mask> for i := range obj {
<mask>
<mask> if obj[i].Expiry != leaseExpireStatic &&
<mask> !ipInRange(s.leaseStart, s.leaseStop, obj[i].IP) {
<mask>
<mask> log.Tracef("Skipping a lease with IP %v: not within current IP range", obj[i].IP)
<mask> continue
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { </s> remove clients.addFromDHCP()
</s> add </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove ok, e := clients.AddHost(ip, host, ClientSourceARP)
</s> add ok, e := clients.addHost(ip, host, ClientSourceARP) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/db.go |
leases := convertLeases(s.Leases(LeasesDynamic), true)
staticLeases := convertLeases(s.Leases(LeasesStatic), false) | <mask> return leases
<mask> }
<mask>
<mask> func (s *Server) handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> leases := convertLeases(s.Leases(), true)
<mask> staticLeases := convertLeases(s.StaticLeases(), false)
<mask> status := map[string]interface{}{
<mask> "config": s.conf,
<mask> "leases": leases,
<mask> "static_leases": staticLeases,
<mask> }
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcp_http.go |
type onLeaseChangedT func(flags int)
// flags for onLeaseChanged()
const (
LeaseChangedAdded = iota
LeaseChangedAddedStatic
LeaseChangedRemovedStatic
LeaseChangedBlacklisted
)
| <mask> }
<mask>
<mask> // Server - the current state of the DHCP server
<mask> type Server struct {
<mask> conn *filterConn // listening UDP socket
<mask>
<mask> ipnet *net.IPNet // if interface name changes, this needs to be reset
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
// Called when the leases DB is modified
onLeaseChanged onLeaseChangedT | <mask> IPpool map[[4]byte]net.HardwareAddr
<mask>
<mask> conf ServerConfig
<mask> }
<mask>
<mask> // Print information about the available network interfaces
<mask> func printInterfaces() {
<mask> ifaces, _ := net.Interfaces()
<mask> var buf strings.Builder
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
if s.conf.Enabled {
err := s.setConfig(config)
if err != nil {
log.Error("DHCP: %s", err)
return nil
}
} | <mask> s := Server{}
<mask> s.conf = config
<mask> s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
<mask> if s.conf.HTTPRegister != nil {
<mask> s.registerHandlers()
<mask> }
<mask>
<mask> // we can't delay database loading until DHCP server is started,
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer s.leasesLock.Unlock()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
// SetOnLeaseChanged - set callback
func (s *Server) SetOnLeaseChanged(onLeaseChanged onLeaseChangedT) {
s.onLeaseChanged = onLeaseChanged
}
func (s *Server) notify(flags int) {
if s.onLeaseChanged == nil {
return
}
s.onLeaseChanged(flags)
}
| <mask> }
<mask>
<mask> // WriteDiskConfig - write configuration
<mask> func (s *Server) WriteDiskConfig(c *ServerConfig) {
<mask> *c = s.conf
<mask> }
<mask>
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove s.dbStore()
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
<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.leases[i] = lease
<mask> s.dbStore()
<mask>
<mask> s.reserveIP(lease.IP, hwaddr)
<mask> return lease, nil
<mask> }
<mask>
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove s.dbStore()
</s> add </s> remove
_ = processQueryLogsAndStats(ctx)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go | |
<mask>
<mask> log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String())
<mask> lease.IP = ip
<mask> s.leases = append(s.leases, lease)
<mask> s.dbStore()
<mask> return lease, nil
<mask> }
<mask>
<mask> // Find a lease for the client
<mask> func (s *Server) findLease(p dhcp4.Packet) *Lease {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove s.dbStore()
</s> add </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go | |
s.notify(LeaseChangedBlacklisted) | <mask> lease.Hostname = ""
<mask> lease.Expiry = time.Now().Add(s.leaseTime)
<mask> s.dbStore()
<mask> s.leasesLock.Unlock()
<mask> }
<mask>
<mask> // Return TRUE if DHCP packet is correct
<mask> func isValidPacket(p dhcp4.Packet) bool {
<mask> hw := p.CHAddr()
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove s.dbStore()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
s.leasesLock.Lock()
s.dbStore()
s.leasesLock.Unlock()
s.notify(LeaseChangedAdded) // Note: maybe we shouldn't call this function if only expiration time is updated | <mask> if lease.Expiry.Unix() != leaseExpireStatic {
<mask> lease.Expiry = time.Now().Add(s.leaseTime)
<mask> }
<mask> log.Tracef("Replying with ACK. IP: %s HW: %s Expire: %s",
<mask> lease.IP, lease.HWAddr, lease.Expiry)
<mask> opt := s.leaseOptions.SelectOrderOrAll(options[dhcp4.OptionParameterRequestList])
<mask> return dhcp4.ReplyPacket(p, dhcp4.ACK, s.ipnet.IP, lease.IP, s.leaseTime, opt)
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove s.dbStore()
</s> add </s> remove s.dbStore()
</s> add </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
<mask> }
<mask> l.Expiry = time.Unix(leaseExpireStatic, 0)
<mask>
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> if s.findReservedHWaddr(l.IP) != nil {
<mask> err := s.rmDynamicLeaseWithIP(l.IP)
<mask> if err != nil {
<mask> return err
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer s.leasesLock.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go | |
s.leasesLock.Unlock() | <mask> if s.findReservedHWaddr(l.IP) != nil {
<mask> err := s.rmDynamicLeaseWithIP(l.IP)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> }
<mask> s.leases = append(s.leases, &l)
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer s.leasesLock.Unlock()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
s.leasesLock.Unlock()
s.notify(LeaseChangedAddedStatic) | <mask> }
<mask> s.leases = append(s.leases, &l)
<mask> s.reserveIP(l.IP, l.HWAddr)
<mask> s.dbStore()
<mask> return nil
<mask> }
<mask>
<mask> // Remove a dynamic lease by IP address
<mask> func (s *Server) rmDynamicLeaseWithIP(ip net.IP) error {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove s.dbStore()
</s> add </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add </s> remove s.dbStore()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
<mask> return fmt.Errorf("Invalid MAC")
<mask> }
<mask>
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> if s.findReservedHWaddr(l.IP) == nil {
<mask> return fmt.Errorf("Lease not found")
<mask> }
<mask>
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer s.leasesLock.Unlock()
</s> add </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go | |
s.leasesLock.Unlock() | <mask>
<mask> if s.findReservedHWaddr(l.IP) == nil {
<mask> return fmt.Errorf("Lease not found")
<mask> }
<mask>
<mask> err := s.rmLease(l)
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer s.leasesLock.Unlock()
</s> add </s> remove defer s.leasesLock.Unlock()
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
s.leasesLock.Unlock() | <mask> }
<mask>
<mask> err := s.rmLease(l)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> s.dbStore()
<mask> s.leasesLock.Unlock()
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer s.leasesLock.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
s.leasesLock.Unlock()
s.notify(LeaseChangedRemovedStatic) | <mask> s.leasesLock.Unlock()
<mask> return err
<mask> }
<mask> s.dbStore()
<mask> return nil
<mask> }
<mask>
<mask> // flags for Leases() function
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer s.leasesLock.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
// flags for Leases() function
const (
LeasesDynamic = 1
LeasesStatic = 2
LeasesAll = LeasesDynamic | LeasesStatic
)
| <mask> return nil
<mask> }
<mask>
<mask> // Leases returns the list of current DHCP leases (thread-safe)
<mask> func (s *Server) Leases(flags int) []Lease {
<mask> var result []Lease
<mask> now := time.Now().Unix()
<mask> s.leasesLock.RLock()
<mask> for _, lease := range s.leases {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { </s> remove s.dbStore()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
func (s *Server) Leases(flags int) []Lease { | <mask> return nil
<mask> }
<mask>
<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.leasesLock.RLock()
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() > now {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove s.dbStore()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { | <mask> var result []Lease
<mask> now := time.Now().Unix()
<mask> s.leasesLock.RLock()
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() > now {
<mask> result = append(result, *lease)
<mask> }
<mask> }
<mask> s.leasesLock.RUnlock()
<mask>
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
var result []Lease
for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 {
result = append(result, *lease)
}
}
return result
}
</s> add </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go |
<mask>
<mask> return result
<mask> }
<mask>
<mask> // StaticLeases returns the list of statically-configured DHCP leases (thread-safe)
<mask> func (s *Server) StaticLeases() []Lease {
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> var result []Lease
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() == 1 {
<mask> result = append(result, *lease)
<mask> }
<mask> }
<mask> return result
<mask> }
<mask>
<mask> // Print information about the current leases
<mask> func (s *Server) printLeases() {
<mask> log.Tracef("Leases:")
<mask> for i, lease := range s.leases {
<mask> log.Tracef("Lease #%d: hwaddr %s, ip %s, expiry %s",
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { </s> remove s.dbStore()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd.go | |
ll := s.Leases(LeasesStatic) | <mask> l.HWAddr = []byte{2, 2, 3, 4, 5, 6}
<mask> err = s.AddStaticLease(l)
<mask> check(t, err == nil, "AddStaticLease")
<mask>
<mask> ll := s.StaticLeases()
<mask> check(t, len(ll) != 0 && bytes.Equal(ll[0].IP, []byte{1, 1, 1, 1}), "StaticLeases")
<mask>
<mask> err = s.RemoveStaticLease(l)
<mask> check(t, err == nil, "RemoveStaticLease")
<mask> }
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer s.leasesLock.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dhcpd/dhcpd_test.go |
processQueryLogsAndStats, | <mask> processFilteringBeforeRequest,
<mask> processUpstream,
<mask> processFilteringAfterResponse,
<mask> }
<mask> for _, process := range mods {
<mask> r := process(ctx)
<mask> switch r {
<mask> case resultFinish:
<mask> return nil
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove leases := convertLeases(s.Leases(), true)
staticLeases := convertLeases(s.StaticLeases(), false)
</s> add leases := convertLeases(s.Leases(LeasesDynamic), true)
staticLeases := convertLeases(s.Leases(LeasesStatic), false) </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dnsforward/dnsforward.go |
<mask>
<mask> if d.Res != nil {
<mask> d.Res.Compress = true // some devices require DNS message compression
<mask> }
<mask>
<mask> _ = processQueryLogsAndStats(ctx)
<mask> return nil
<mask> }
<mask>
<mask> // Get IP address from net.Addr
<mask> func getIP(addr net.Addr) net.IP {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove s.dbStore()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | dnsforward/dnsforward.go | |
clients.addFromDHCP()
clients.dhcpServer.SetOnLeaseChanged(clients.onDHCPLeaseChanged)
| <mask>
<mask> if !clients.testing {
<mask> go clients.periodicUpdate()
<mask>
<mask> clients.registerWebHandlers()
<mask> }
<mask> }
<mask>
<mask> type clientObject struct {
<mask> Name string `yaml:"name"`
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile)
</s> add ok, e := clients.addHost(fields[0], fields[1], ClientSourceHostsFile) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
<mask> func (clients *clientsContainer) periodicUpdate() {
<mask> for {
<mask> clients.addFromHostsFile()
<mask> clients.addFromSystemARP()
<mask> clients.addFromDHCP()
<mask> time.Sleep(clientsUpdatePeriod)
<mask> }
<mask> }
<mask>
<mask> // Exists checks if client with this IP already exists
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove log.Debug("Added %d client aliases from 'arp -a' command output", n)
</s> add log.Debug("Clients: added %d client aliases from 'arp -a' command output", n) </s> remove // add clients from DHCP that have non-empty Hostname property
</s> add // Add clients from DHCP that have non-empty Hostname property | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go | |
func (clients *clientsContainer) onDHCPLeaseChanged(flags int) {
switch flags {
case dhcpd.LeaseChangedAdded,
dhcpd.LeaseChangedAddedStatic,
dhcpd.LeaseChangedRemovedStatic:
clients.addFromDHCP()
}
}
| <mask> time.Sleep(clientsUpdatePeriod)
<mask> }
<mask> }
<mask>
<mask> // Exists checks if client with this IP already exists
<mask> func (clients *clientsContainer) Exists(ip string, source clientSource) bool {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove clients.addFromDHCP()
</s> add </s> remove defer clients.lock.Unlock()
</s> add b, e := clients.addHost(ip, host, source)
clients.lock.Unlock()
return b, e
} </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list)) | <mask> for _, id := range c.IDs {
<mask> clients.idIndex[id] = &c
<mask> }
<mask>
<mask> log.Tracef("'%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list))
<mask> return true, nil
<mask> }
<mask>
<mask> // Del removes a client
<mask> func (clients *clientsContainer) Del(name string) bool {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove log.Tracef("'%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
</s> add log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost)) </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove clients.addFromDHCP()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
b, e := clients.addHost(ip, host, source)
clients.lock.Unlock()
return b, e
} | <mask> // Use priority of the source (etc/hosts > ARP > rDNS)
<mask> // so we overwrite existing entries with an equal or higher priority
<mask> func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (bool, error) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> // check auto-clients index
<mask> ch, ok := clients.ipHost[ip]
<mask> if ok && ch.Source > source {
<mask> return false, nil
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove func (s *Server) Leases() []Lease {
</s> add func (s *Server) Leases(flags int) []Lease { </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
func (clients *clientsContainer) addHost(ip, host string, source clientSource) (bool, error) { | <mask> clients.lock.Unlock()
<mask> return b, e
<mask> }
<mask>
<mask> // check auto-clients index
<mask> ch, ok := clients.ipHost[ip]
<mask> if ok && ch.Source > source {
<mask> return false, nil
<mask> } else if ok {
<mask> ch.Source = source
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove defer clients.lock.Unlock()
</s> add b, e := clients.addHost(ip, host, source)
clients.lock.Unlock()
return b, e
} </s> remove ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile)
</s> add ok, e := clients.addHost(fields[0], fields[1], ClientSourceHostsFile) </s> remove ok, e := clients.AddHost(ip, host, ClientSourceARP)
</s> add ok, e := clients.addHost(ip, host, ClientSourceARP) </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost)) | <mask> Source: source,
<mask> }
<mask> clients.ipHost[ip] = ch
<mask> }
<mask> log.Tracef("'%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
<mask> return true, nil
<mask> }
<mask>
<mask> // Parse system 'hosts' file and fill clients array
<mask> func (clients *clientsContainer) addFromHostsFile() {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove log.Tracef("'%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list))
</s> add log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list)) </s> remove // add clients from DHCP that have non-empty Hostname property
</s> add // Add clients from DHCP that have non-empty Hostname property </s> remove defer clients.lock.Unlock()
</s> add b, e := clients.addHost(ip, host, source)
clients.lock.Unlock()
return b, e
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
// Remove all entries that match the specified source
func (clients *clientsContainer) rmHosts(source clientSource) int {
n := 0
for k, v := range clients.ipHost {
if v.Source == source {
delete(clients.ipHost, k)
n++
}
}
log.Debug("Clients: removed %d client aliases", n)
return n
}
| <mask> }
<mask>
<mask> // Parse system 'hosts' file and fill clients array
<mask> func (clients *clientsContainer) addFromHostsFile() {
<mask> hostsFn := "/etc/hosts"
<mask> if runtime.GOOS == "windows" {
<mask> hostsFn = os.ExpandEnv("$SystemRoot\\system32\\drivers\\etc\\hosts")
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove log.Tracef("'%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
</s> add log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost)) </s> remove // add clients from DHCP that have non-empty Hostname property
</s> add // Add clients from DHCP that have non-empty Hostname property </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove log.Debug("Added %d client aliases from 'arp -a' command output", n)
</s> add log.Debug("Clients: added %d client aliases from 'arp -a' command output", n) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceHostsFile)
| <mask> return
<mask> }
<mask>
<mask> lines := strings.Split(string(d), "\n")
<mask> n := 0
<mask> for _, ln := range lines {
<mask> ln = strings.TrimSpace(ln)
<mask> if len(ln) == 0 || ln[0] == '#' {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
ok, e := clients.addHost(fields[0], fields[1], ClientSourceHostsFile) | <mask> if len(fields) < 2 {
<mask> continue
<mask> }
<mask>
<mask> ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile)
<mask> if e != nil {
<mask> log.Tracef("%s", e)
<mask> }
<mask> if ok {
<mask> n++
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove ok, e := clients.AddHost(ip, host, ClientSourceARP)
</s> add ok, e := clients.addHost(ip, host, ClientSourceARP) </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) </s> remove defer clients.lock.Unlock()
</s> add b, e := clients.addHost(ip, host, source)
clients.lock.Unlock()
return b, e
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
log.Debug("Clients: added %d client aliases from %s", n, hostsFn) | <mask> n++
<mask> }
<mask> }
<mask>
<mask> log.Debug("Added %d client aliases from %s", n, hostsFn)
<mask> }
<mask>
<mask> // Add IP -> Host pairs from the system's `arp -a` command output
<mask> // The command's output is:
<mask> // HOST (IP) at MAC on IFACE
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove log.Debug("Added %d client aliases from 'arp -a' command output", n)
</s> add log.Debug("Clients: added %d client aliases from 'arp -a' command output", n) </s> remove // add clients from DHCP that have non-empty Hostname property
</s> add // Add clients from DHCP that have non-empty Hostname property </s> remove log.Debug("Added %d client aliases from DHCP", n)
</s> add log.Debug("Clients: added %d client aliases from DHCP", n) </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) </s> remove
_ = processQueryLogsAndStats(ctx)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceARP)
| <mask> }
<mask>
<mask> n := 0
<mask> lines := strings.Split(string(data), "\n")
<mask> for _, ln := range lines {
<mask>
<mask> open := strings.Index(ln, " (")
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
ok, e := clients.addHost(ip, host, ClientSourceARP) | <mask> if utils.IsValidHostname(host) != nil || net.ParseIP(ip) == nil {
<mask> continue
<mask> }
<mask>
<mask> ok, e := clients.AddHost(ip, host, ClientSourceARP)
<mask> if e != nil {
<mask> log.Tracef("%s", e)
<mask> }
<mask> if ok {
<mask> n++
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile)
</s> add ok, e := clients.addHost(fields[0], fields[1], ClientSourceHostsFile) </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
log.Debug("Clients: added %d client aliases from 'arp -a' command output", n) | <mask> n++
<mask> }
<mask> }
<mask>
<mask> log.Debug("Added %d client aliases from 'arp -a' command output", n)
<mask> }
<mask>
<mask> // add clients from DHCP that have non-empty Hostname property
<mask> func (clients *clientsContainer) addFromDHCP() {
<mask> if clients.dhcpServer == nil {
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove // add clients from DHCP that have non-empty Hostname property
</s> add // Add clients from DHCP that have non-empty Hostname property </s> remove log.Debug("Added %d client aliases from DHCP", n)
</s> add log.Debug("Clients: added %d client aliases from DHCP", n) </s> remove log.Debug("Added %d client aliases from %s", n, hostsFn)
</s> add log.Debug("Clients: added %d client aliases from %s", n, hostsFn) </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
// Add clients from DHCP that have non-empty Hostname property | <mask>
<mask> log.Debug("Added %d client aliases from 'arp -a' command output", n)
<mask> }
<mask>
<mask> // add clients from DHCP that have non-empty Hostname property
<mask> func (clients *clientsContainer) addFromDHCP() {
<mask> if clients.dhcpServer == nil {
<mask> return
<mask> }
<mask> leases := clients.dhcpServer.Leases()
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove log.Debug("Added %d client aliases from 'arp -a' command output", n)
</s> add log.Debug("Clients: added %d client aliases from 'arp -a' command output", n) </s> remove log.Debug("Added %d client aliases from DHCP", n)
</s> add log.Debug("Clients: added %d client aliases from DHCP", n) </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) </s> remove log.Debug("Added %d client aliases from %s", n, hostsFn)
</s> add log.Debug("Clients: added %d client aliases from %s", n, hostsFn) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) | <mask> func (clients *clientsContainer) addFromDHCP() {
<mask> if clients.dhcpServer == nil {
<mask> return
<mask> }
<mask> leases := clients.dhcpServer.Leases()
<mask> n := 0
<mask> for _, l := range leases {
<mask> if len(l.Hostname) == 0 {
<mask> continue
<mask> }
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) </s> remove // add clients from DHCP that have non-empty Hostname property
</s> add // Add clients from DHCP that have non-empty Hostname property </s> remove if lease.Expiry.Unix() > now {
</s> add if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) | <mask> for _, l := range leases {
<mask> if len(l.Hostname) == 0 {
<mask> continue
<mask> }
<mask> ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
<mask> if ok {
<mask> n++
<mask> }
<mask> }
<mask> log.Debug("Added %d client aliases from DHCP", n)
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove log.Debug("Added %d client aliases from DHCP", n)
</s> add log.Debug("Clients: added %d client aliases from DHCP", n) </s> remove leases := clients.dhcpServer.Leases()
</s> add clients.lock.Lock()
defer clients.lock.Unlock()
_ = clients.rmHosts(ClientSourceDHCP)
leases := clients.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove log.Debug("Added %d client aliases from 'arp -a' command output", n)
</s> add log.Debug("Clients: added %d client aliases from 'arp -a' command output", n) </s> remove ok, e := clients.AddHost(ip, host, ClientSourceARP)
</s> add ok, e := clients.addHost(ip, host, ClientSourceARP) </s> remove ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile)
</s> add ok, e := clients.addHost(fields[0], fields[1], ClientSourceHostsFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
log.Debug("Clients: added %d client aliases from DHCP", n) | <mask> if ok {
<mask> n++
<mask> }
<mask> }
<mask> log.Debug("Added %d client aliases from DHCP", n)
<mask> }
</s> Merge: * clients: update runtime clients of type DHCP by event from DHCP module
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP </s> remove ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
</s> add ok, _ := clients.addHost(l.IP.String(), l.Hostname, ClientSourceDHCP) </s> remove log.Debug("Added %d client aliases from 'arp -a' command output", n)
</s> add log.Debug("Clients: added %d client aliases from 'arp -a' command output", n) </s> remove log.Debug("Added %d client aliases from %s", n, hostsFn)
</s> add log.Debug("Clients: added %d client aliases from %s", n, hostsFn) </s> remove // add clients from DHCP that have non-empty Hostname property
</s> add // Add clients from DHCP that have non-empty Hostname property | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dcc575402bea9d47e5e4d9c90c4c1e9c212d2395 | home/clients.go |
"es6-error": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
"integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
}, | <mask> }
<mask> },
<mask> "es6-iterator": {
<mask> "version": "2.0.3",
<mask> "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
<mask> "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
<mask> "dev": true,
</s> Added initial layout for DHCP server config </s> remove "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
</s> add "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", </s> remove "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
</s> add "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", </s> remove "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
</s> add "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", </s> remove "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
</s> add "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/package-lock.json |
"resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", | <mask> "dev": true
<mask> },
<mask> "html-webpack-plugin": {
<mask> "version": "3.2.0",
<mask> "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
<mask> "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
<mask> "dev": true,
<mask> "requires": {
<mask> "html-minifier": "^3.2.3",
<mask> "loader-utils": "^0.2.16",
</s> Added initial layout for DHCP server config </s> remove "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
</s> add "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", </s> remove "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
</s> add "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", </s> remove "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
</s> add "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/package-lock.json |
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", | <mask> }
<mask> },
<mask> "readable-stream": {
<mask> "version": "1.0.34",
<mask> "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
<mask> "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
<mask> "dev": true,
<mask> "requires": {
<mask> "core-util-is": "~1.0.0",
<mask> "inherits": "~2.0.1",
</s> Added initial layout for DHCP server config </s> remove "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
</s> add "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", </s> remove "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
</s> add "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", </s> remove "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
</s> add "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/package-lock.json |
"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" | <mask> },
<mask> "is-promise": {
<mask> "version": "2.1.0",
<mask> "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
<mask> "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
<mask> "dev": true
<mask> },
<mask> "is-regex": {
<mask> "version": "1.0.4",
<mask> "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
<mask> "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
</s> Added initial layout for DHCP server config </s> remove "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
</s> add "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", </s> remove "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
</s> add "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", </s> remove "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
</s> add "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/package-lock.json |
"redux-form": {
"version": "7.4.2",
"resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.4.2.tgz",
"integrity": "sha512-QxC36s4Lelx5Cr8dbpxqvl23dwYOydeAX8c6YPmgkz/Dhj053C16S2qoyZN6LO6HJ2oUF00rKsAyE94GwOUhFA==",
"requires": {
"es6-error": "^4.1.1",
"hoist-non-react-statics": "^2.5.4",
"invariant": "^2.2.4",
"is-promise": "^2.1.0",
"lodash": "^4.17.10",
"lodash-es": "^4.17.10",
"prop-types": "^15.6.1",
"react-lifecycles-compat": "^3.0.4"
}
}, | <mask> }
<mask> },
<mask> "redux-thunk": {
<mask> "version": "2.3.0",
<mask> "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz",
<mask> "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw=="
<mask> },
</s> Added initial layout for DHCP server config </s> remove "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
</s> add "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" </s> remove "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
</s> add "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", </s> remove "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
</s> add "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", </s> remove "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
</s> add "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/package-lock.json |
"resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", | <mask> "dev": true
<mask> },
<mask> "through": {
<mask> "version": "2.3.8",
<mask> "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
<mask> "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
<mask> "dev": true
<mask> },
<mask> "through2": {
<mask> "version": "2.0.3",
</s> Added initial layout for DHCP server config </s> remove "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
</s> add "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" </s> remove "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
</s> add "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", </s> remove "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
</s> add "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/package-lock.json |
"redux-form": "^7.4.2", | <mask> "react-transition-group": "^2.4.0",
<mask> "redux": "^4.0.0",
<mask> "redux-actions": "^2.4.0",
<mask> "redux-thunk": "^2.3.0",
<mask> "svg-url-loader": "^2.3.2",
<mask> "whatwg-fetch": "2.0.3"
<mask> },
<mask> "devDependencies": {
</s> Added initial layout for DHCP server config </s> remove "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
</s> add "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", </s> remove "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
</s> add "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" </s> remove "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
</s> add "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/package.json |
<mask> "found_in_known_domain_db": "Found in the known domains database.",
<mask> "category_label": "Category",
<mask> "rule_label": "Rule",
<mask> "filter_label": "Filter",
<mask> "unknown_filter": "Unknown filter {{filterId}}"
<mask> } </s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/__locales/en.json | |
position: relative; | <mask> .form__group {
<mask> margin-bottom: 15px;
<mask> }
<mask>
<mask> .form__group:last-child {
</s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | [
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/components/Settings/Settings.css |
.form__group--dhcp:last-child {
margin-bottom: 15px;
}
| <mask> }
<mask>
<mask> .btn-standart {
<mask> padding-left: 20px;
<mask> padding-right: 20px;
<mask> }
</s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/components/Settings/Settings.css |
import Dhcp from './Dhcp'; | <mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces, Trans } from 'react-i18next';
<mask> import Upstream from './Upstream';
<mask> import Checkbox from '../ui/Checkbox';
<mask> import Loading from '../ui/Loading';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import './Settings.css';
<mask>
</s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/components/Settings/index.js |
this.props.getDhcpStatus(); | <mask> };
<mask>
<mask> componentDidMount() {
<mask> this.props.initSettings(this.settings);
<mask> }
<mask>
<mask> handleUpstreamChange = (value) => {
<mask> this.props.handleUpstreamChange({ upstreamDns: value });
</s> Added initial layout for DHCP server config </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/components/Settings/index.js |
<Dhcp
dhcp={this.props.dhcp}
toggleDhcp={this.props.toggleDhcp}
getDhcpStatus={this.props.getDhcpStatus}
findActiveDhcp={this.props.findActiveDhcp}
setDhcpConfig={this.props.setDhcpConfig}
/> | <mask> handleUpstreamTest={this.handleUpstreamTest}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> }
<mask> </Fragment>
<mask> );
</s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/components/Settings/index.js |
import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; | <mask> import { connect } from 'react-redux';
<mask> import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
<mask> import Settings from '../components/Settings';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { settings, dashboard } = state;
<mask> const props = { settings, dashboard };
</s> Added initial layout for DHCP server config </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/containers/Settings.js |
const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | <mask> import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
<mask> import Settings from '../components/Settings';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { settings, dashboard } = state;
<mask> const props = { settings, dashboard };
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
<mask> initSettings,
</s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/containers/Settings.js |
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp, | <mask> handleUpstreamChange,
<mask> setUpstream,
<mask> testUpstream,
<mask> addErrorToast,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
</s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/containers/Settings.js |
export const R_IPV4 = /^(?:(?:^|\.)(?:2(?:5[0-5]|[0-4]\d)|1?\d?\d)){4}$/g; | <mask> export const R_URL_REQUIRES_PROTOCOL = /^https?:\/\/\w[\w_\-.]*\.[a-z]{2,8}[^\s]*$/;
<mask>
<mask> export const STATS_NAMES = {
<mask> avg_processing_time: 'average_processing_time',
<mask> blocked_filtering: 'Blocked by filters',
<mask> dns_queries: 'DNS queries',
</s> Added initial layout for DHCP server config </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; | [
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/helpers/constants.js |
import { reducer as formReducer } from 'redux-form'; | <mask> import { combineReducers } from 'redux';
<mask> import { handleActions } from 'redux-actions';
<mask> import { loadingBarReducer } from 'react-redux-loading-bar';
<mask> import nanoid from 'nanoid';
<mask> import versionCompare from '../helpers/versionCompare';
<mask>
<mask> import * as actions from '../actions';
<mask>
<mask> const settings = handleActions({
</s> Added initial layout for DHCP server config </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/reducers/index.js |
processingDhcpStatus: false, | <mask> processing: true,
<mask> processingTestUpstream: false,
<mask> processingSetUpstream: false,
<mask> });
<mask>
<mask> const dashboard = handleActions({
<mask> [actions.dnsStatusRequest]: state => ({ ...state, processing: true }),
</s> Added initial layout for DHCP server config </s> remove const { settings, dashboard } = state;
const props = { settings, dashboard };
</s> add const { settings, dashboard, dhcp } = state;
const props = { settings, dashboard, dhcp }; </s> remove import { initSettings, toggleSetting, handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
</s> add import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
setDhcpConfig,
findActiveDhcp,
} from '../actions'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/reducers/index.js |
dhcp, | <mask> queryLogs,
<mask> filtering,
<mask> toasts,
<mask> loadingBar: loadingBarReducer,
<mask> form: formReducer,
<mask> });
</s> Added initial layout for DHCP server config </s> remove "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
</s> add "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", </s> remove "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
</s> add "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd21f497e3ab9943989ac087e11b3d297768aeb6 | client/src/reducers/index.js |
"github.com/AdguardTeam/AdGuardHome/dhcpd/nclient4" | <mask> "runtime"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv6"
<mask> "github.com/insomniacslk/dhcp/dhcpv6/nclient6"
<mask> "github.com/insomniacslk/dhcp/iana"
<mask> )
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove "github.com/insomniacslk/dhcp/dhcpv4/nclient4"
</s> add </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | dhcpd/check_other_dhcp.go |
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/nclient4"
<mask> "github.com/insomniacslk/dhcp/dhcpv6"
<mask> "github.com/insomniacslk/dhcp/dhcpv6/nclient6"
<mask> "github.com/insomniacslk/dhcp/iana"
<mask> )
<mask>
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | dhcpd/check_other_dhcp.go | |
github.com/fsnotify/fsnotify v1.4.9 | <mask> github.com/AdguardTeam/dnsproxy v0.30.1
<mask> github.com/AdguardTeam/golibs v0.4.2
<mask> github.com/AdguardTeam/urlfilter v0.11.2
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/fsnotify/fsnotify v1.4.7
<mask> github.com/gobuffalo/packr v1.30.1
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
<mask> github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7
<mask> github.com/joomcode/errorx v1.0.1
<mask> github.com/kardianos/service v1.1.0
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7
</s> add github.com/google/go-cmp v0.4.0 // indirect
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 </s> remove github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7 h1:iaCm+9nZdYb8XCSU2TfIb0qYTcAlIv2XzyKR2d2xZ38=
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
</s> add github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k=
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.mod |
github.com/google/go-cmp v0.4.0 // indirect
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 | <mask> github.com/AdguardTeam/urlfilter v0.11.2
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/fsnotify/fsnotify v1.4.7
<mask> github.com/gobuffalo/packr v1.30.1
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
<mask> github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7
<mask> github.com/joomcode/errorx v1.0.1
<mask> github.com/kardianos/service v1.1.0
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
<mask> github.com/miekg/dns v1.1.29
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible </s> remove github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7 h1:iaCm+9nZdYb8XCSU2TfIb0qYTcAlIv2XzyKR2d2xZ38=
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
</s> add github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k=
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.mod |
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 | <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
<mask> github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7
<mask> github.com/joomcode/errorx v1.0.1
<mask> github.com/kardianos/service v1.1.0
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
<mask> github.com/miekg/dns v1.1.29
<mask> github.com/pkg/errors v0.9.1
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
<mask> github.com/stretchr/testify v1.5.1
<mask> github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7
</s> add github.com/google/go-cmp v0.4.0 // indirect
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.mod |
github.com/sirupsen/logrus v1.6.0 // indirect | <mask> github.com/miekg/dns v1.1.29
<mask> github.com/pkg/errors v0.9.1
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
<mask> github.com/stretchr/testify v1.5.1
<mask> github.com/u-root/u-root v6.0.0+incompatible
<mask> go.etcd.io/bbolt v1.3.4
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.mod |
github.com/u-root/u-root v6.0.0+incompatible | <mask> github.com/miekg/dns v1.1.29
<mask> github.com/pkg/errors v0.9.1
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
<mask> github.com/stretchr/testify v1.5.1
<mask> github.com/u-root/u-root v6.0.0+incompatible // indirect
<mask> go.etcd.io/bbolt v1.3.4
<mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.mod |
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 | <mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
<mask> github.com/stretchr/testify v1.5.1
<mask> github.com/u-root/u-root v6.0.0+incompatible // indirect
<mask> go.etcd.io/bbolt v1.3.4
<mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.2.8
<mask> )
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.mod |
gopkg.in/yaml.v2 v2.3.0 | <mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.2.8
<mask> )
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.mod |
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= | <mask> github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
<mask> github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
<mask> github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
<mask> github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
<mask> github.com/go-test/deep v1.0.5 h1:AKODKU3pDH1RzZzm6YZu77YWtEAq6uh1rLIAQlay2qc=
<mask> github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
<mask> github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU=
<mask> github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7
</s> add github.com/google/go-cmp v0.4.0 // indirect
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> remove "github.com/insomniacslk/dhcp/dhcpv4/nclient4"
</s> add </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | <mask> github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw=
<mask> github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
<mask> github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
<mask> github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
<mask> github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
<mask> github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
<mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7 h1:iaCm+9nZdYb8XCSU2TfIb0qYTcAlIv2XzyKR2d2xZ38=
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
</s> add github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k=
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw= </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7
</s> add github.com/google/go-cmp v0.4.0 // indirect
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k=
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw= | <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
<mask> github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
<mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
<mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
<mask> github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7 h1:iaCm+9nZdYb8XCSU2TfIb0qYTcAlIv2XzyKR2d2xZ38=
<mask> github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
<mask> github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
<mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
<mask> github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
<mask> github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
<mask> github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7
</s> add github.com/google/go-cmp v0.4.0 // indirect
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= | <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
<mask> github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
<mask> github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
<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:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove "github.com/insomniacslk/dhcp/dhcpv4/nclient4"
</s> add </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= | <mask> github.com/shirou/gopsutil v2.20.3+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
<mask> github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
<mask> github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw=
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0=
<mask> github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
<mask> github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
<mask> github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
</s> add github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 </s> remove github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7 h1:iaCm+9nZdYb8XCSU2TfIb0qYTcAlIv2XzyKR2d2xZ38=
github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
</s> add github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k=
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | <mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 h1:fpnn/HnJONpIu6hkXi1u/7rR0NzilgWr4T0JmWkEitk=
<mask> golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= | <mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | <mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
<mask> gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove "github.com/insomniacslk/dhcp/dhcpv4/nclient4"
</s> add </s> remove github.com/fsnotify/fsnotify v1.4.7
</s> add github.com/fsnotify/fsnotify v1.4.9 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
<mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
<mask> gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
</s> * copy dhcpv4/nclient4 package with minor enhancement
The original package can be built only on Linux. </s> remove gopkg.in/yaml.v2 v2.2.8
</s> add gopkg.in/yaml.v2 v2.3.0 </s> remove golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
</s> add golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200625001655-4c5254603344
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 </s> remove github.com/u-root/u-root v6.0.0+incompatible // indirect
</s> add github.com/u-root/u-root v6.0.0+incompatible </s> remove "github.com/insomniacslk/dhcp/dhcpv4/nclient4"
</s> add | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd46cd5f36ae31dfb4f31dcb4dec65921510db17 | go.sum |
<mask> "form_error_ip6_format": "Invalid IPv6 format",
<mask> "form_error_ip_format": "Invalid IP format",
<mask> "form_error_mac_format": "Invalid MAC format",
<mask> "form_error_client_id_format": "Invalid client ID format",
<mask> "form_error_server_name": "Invalid server name",
<mask> "form_error_positive": "Must be greater than 0",
<mask> "form_error_negative": "Must be equal to 0 or greater",
<mask> "range_end_error": "Must be greater than range start",
<mask> "dhcp_form_gateway_input": "Gateway IP",
<mask> "dhcp_form_subnet_input": "Subnet mask",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", </s> remove "download_mobileconfig": "Download configuration file",
</s> add </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", </s> remove "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
</s> add </s> remove "dhcp_config_saved": "DHCP server configuratie opgeslagen",
</s> add "dhcp_config_saved": "DHCP configuratie succesvol opgeslagen", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/en.json | |
<mask> "blocking_ipv4": "Blocking IPv4",
<mask> "blocking_ipv6": "Blocking IPv6",
<mask> "dns_over_https": "DNS-over-HTTPS",
<mask> "dns_over_tls": "DNS-over-TLS",
<mask> "dns_over_quic": "DNS-over-QUIC",
<mask> "client_id": "Client ID",
<mask> "client_id_placeholder": "Enter client ID",
<mask> "client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
<mask> "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
<mask> "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
<mask> "download_mobileconfig": "Download configuration file",
<mask> "plain_dns": "Plain DNS",
<mask> "form_enter_rate_limit": "Enter rate limit",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "download_mobileconfig": "Download configuration file",
</s> add </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", </s> remove "setup_dns_privacy_ioc_mac": "iOS and macOS configuration",
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/en.json |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.