docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { | <mask> }
<mask>
<mask> // Remove a dynamic lease with the same properties
<mask> // Return error if a static lease is found
<mask> func (s *v4Server) rmDynamicLease(lease Lease) error {
<mask> for i := 0; i < len(s.leases); i++ {
<mask> l := s.leases[i]
<mask>
<mask> if bytes.Equal(l.HWAddr, lease.HWAddr) {
<mask> if l.Expiry.Unix() == leaseExpireStatic {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
l.Hostname != lease.Hostname {
return fmt.Errorf("lease not found")
</s> add if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) </s> remove log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
</s> add return s.addDynamicLease(l) </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if l.IsStatic() { | <mask> for i := 0; i < len(s.leases); i++ {
<mask> l := s.leases[i]
<mask>
<mask> if bytes.Equal(l.HWAddr, lease.HWAddr) {
<mask> if l.Expiry.Unix() == leaseExpireStatic {
<mask> return fmt.Errorf("static lease already exists")
<mask> }
<mask>
<mask> s.rmLeaseByIndex(i)
<mask> if i == len(s.leases) {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove return nil
</s> add return nil, nil </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if l.IsStatic() { | <mask> l = s.leases[i]
<mask> }
<mask>
<mask> if net.IP.Equal(l.IP, lease.IP) {
<mask> if l.Expiry.Unix() == leaseExpireStatic {
<mask> return fmt.Errorf("static lease already exists")
<mask> }
<mask>
<mask> s.rmLeaseByIndex(i)
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { </s> remove s.addLease(l)
</s> add err = s.addLease(l)
if err != nil {
return nil, err
} </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
func (s *v4Server) addStaticLease(l *Lease) (err error) {
subnet := &net.IPNet{
IP: s.conf.routerIP,
Mask: s.conf.subnetMask,
}
if !subnet.Contains(l.IP) {
return fmt.Errorf("subnet %s does not contain the ip %q", subnet, l.IP)
}
s.leases = append(s.leases, l)
| <mask> }
<mask> return nil
<mask> }
<mask>
<mask> // addLease adds a lease.
<mask> func (s *v4Server) addLease(l *Lease) {
<mask> r := s.conf.ipRange
<mask> offset, ok := r.offset(l.IP)
<mask> if !ok {
<mask> // TODO(a.garipov): Better error handling.
<mask> log.Debug("dhcpv4: lease %s (%s) out of range, not adding", l.IP, l.HWAddr)
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if !ok {
// TODO(a.garipov): Better error handling.
log.Debug("dhcpv4: lease %s (%s) out of range, not adding", l.IP, l.HWAddr)
</s> add if ok {
s.leasedOffsets.set(offset, true)
} </s> remove return
</s> add return nil
}
func (s *v4Server) addDynamicLease(l *Lease) (err error) {
r := s.conf.ipRange
offset, ok := r.offset(l.IP)
if !ok {
return fmt.Errorf("lease %s (%s) out of range, not adding", l.IP, l.HWAddr) </s> remove s.leasedOffsets.Clear(offset)
</s> add s.leasedOffsets.set(offset, false) </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} </s> remove s.addLease(l)
</s> add err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if ok {
s.leasedOffsets.set(offset, true)
} | <mask> // addLease adds a lease.
<mask> func (s *v4Server) addLease(l *Lease) {
<mask> r := s.conf.ipRange
<mask> offset, ok := r.offset(l.IP)
<mask> if !ok {
<mask> // TODO(a.garipov): Better error handling.
<mask> log.Debug("dhcpv4: lease %s (%s) out of range, not adding", l.IP, l.HWAddr)
<mask>
<mask> return
<mask> }
<mask>
<mask> s.leases = append(s.leases, l)
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove return
</s> add return nil
}
func (s *v4Server) addDynamicLease(l *Lease) (err error) {
r := s.conf.ipRange
offset, ok := r.offset(l.IP)
if !ok {
return fmt.Errorf("lease %s (%s) out of range, not adding", l.IP, l.HWAddr) </s> remove // addLease adds a lease.
func (s *v4Server) addLease(l *Lease) {
</s> add func (s *v4Server) addStaticLease(l *Lease) (err error) {
subnet := &net.IPNet{
IP: s.conf.routerIP,
Mask: s.conf.subnetMask,
}
if !subnet.Contains(l.IP) {
return fmt.Errorf("subnet %s does not contain the ip %q", subnet, l.IP)
}
s.leases = append(s.leases, l)
</s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} </s> remove s.leasedOffsets.Clear(offset)
</s> add s.leasedOffsets.set(offset, false) </s> remove log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
</s> add return s.addDynamicLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
return nil
}
func (s *v4Server) addDynamicLease(l *Lease) (err error) {
r := s.conf.ipRange
offset, ok := r.offset(l.IP)
if !ok {
return fmt.Errorf("lease %s (%s) out of range, not adding", l.IP, l.HWAddr) | <mask> if !ok {
<mask> // TODO(a.garipov): Better error handling.
<mask> log.Debug("dhcpv4: lease %s (%s) out of range, not adding", l.IP, l.HWAddr)
<mask>
<mask> return
<mask> }
<mask>
<mask> s.leases = append(s.leases, l)
<mask> s.leasedOffsets.Set(offset)
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if !ok {
// TODO(a.garipov): Better error handling.
log.Debug("dhcpv4: lease %s (%s) out of range, not adding", l.IP, l.HWAddr)
</s> add if ok {
s.leasedOffsets.set(offset, true)
} </s> remove // addLease adds a lease.
func (s *v4Server) addLease(l *Lease) {
</s> add func (s *v4Server) addStaticLease(l *Lease) (err error) {
subnet := &net.IPNet{
IP: s.conf.routerIP,
Mask: s.conf.subnetMask,
}
if !subnet.Contains(l.IP) {
return fmt.Errorf("subnet %s does not contain the ip %q", subnet, l.IP)
}
s.leases = append(s.leases, l)
</s> remove log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
</s> add return s.addDynamicLease(l) </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} </s> remove s.addLease(l)
</s> add err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} | <mask> return
<mask> }
<mask>
<mask> s.leases = append(s.leases, l)
<mask> s.leasedOffsets.Set(offset)
<mask>
<mask> log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
<mask> }
<mask>
<mask> // Remove a lease with the same properties
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
</s> add return s.addDynamicLease(l) </s> remove return
</s> add return nil
}
func (s *v4Server) addDynamicLease(l *Lease) (err error) {
r := s.conf.ipRange
offset, ok := r.offset(l.IP)
if !ok {
return fmt.Errorf("lease %s (%s) out of range, not adding", l.IP, l.HWAddr) </s> remove if !ok {
// TODO(a.garipov): Better error handling.
log.Debug("dhcpv4: lease %s (%s) out of range, not adding", l.IP, l.HWAddr)
</s> add if ok {
s.leasedOffsets.set(offset, true)
} </s> remove if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
l.Hostname != lease.Hostname {
return fmt.Errorf("lease not found")
</s> add if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
return s.addDynamicLease(l) | <mask>
<mask> s.leases = append(s.leases, l)
<mask> s.leasedOffsets.Set(offset)
<mask>
<mask> log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
<mask> }
<mask>
<mask> // Remove a lease with the same properties
<mask> func (s *v4Server) rmLease(lease Lease) error {
<mask> for i, l := range s.leases {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} </s> remove if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
l.Hostname != lease.Hostname {
return fmt.Errorf("lease not found")
</s> add if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) </s> remove return
</s> add return nil
}
func (s *v4Server) addDynamicLease(l *Lease) (err error) {
r := s.conf.ipRange
offset, ok := r.offset(l.IP)
if !ok {
return fmt.Errorf("lease %s (%s) out of range, not adding", l.IP, l.HWAddr) </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if len(s.leases) == 0 {
return nil
}
| <mask>
<mask> // Remove a lease with the same properties
<mask> func (s *v4Server) rmLease(lease Lease) error {
<mask> for i, l := range s.leases {
<mask> if l.IP.Equal(lease.IP) {
<mask> if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
<mask> return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l)
<mask> }
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
l.Hostname != lease.Hostname {
return fmt.Errorf("lease not found")
</s> add if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) </s> remove log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
</s> add return s.addDynamicLease(l) </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) | <mask> // Remove a lease with the same properties
<mask> func (s *v4Server) rmLease(lease Lease) error {
<mask> for i, l := range s.leases {
<mask> if l.IP.Equal(lease.IP) {
<mask> if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
<mask> l.Hostname != lease.Hostname {
<mask> return fmt.Errorf("lease not found")
<mask> }
<mask>
<mask> s.rmLeaseByIndex(i)
<mask>
<mask> return nil
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
</s> add return s.addDynamicLease(l) </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { </s> remove return fmt.Errorf("lease not found")
</s> add return agherr.Error("lease not found") </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
return agherr.Error("lease not found") | <mask> return nil
<mask> }
<mask> }
<mask>
<mask> return fmt.Errorf("lease not found")
<mask> }
<mask>
<mask> // AddStaticLease adds a static lease (thread-safe)
<mask> func (s *v4Server) AddStaticLease(lease Lease) error {
<mask> if len(lease.IP) != 4 {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) </s> remove if len(lease.HWAddr) != 6 {
return fmt.Errorf("invalid MAC")
</s> add if len(l.HWAddr) != 6 {
return fmt.Errorf("invalid mac %q, only EUI-48 is supported", l.HWAddr) </s> remove if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
l.Hostname != lease.Hostname {
return fmt.Errorf("lease not found")
</s> add if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
// AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) | <mask>
<mask> return fmt.Errorf("lease not found")
<mask> }
<mask>
<mask> // AddStaticLease adds a static lease (thread-safe)
<mask> func (s *v4Server) AddStaticLease(lease Lease) error {
<mask> if len(lease.IP) != 4 {
<mask> return fmt.Errorf("invalid IP")
<mask> }
<mask> if len(lease.HWAddr) != 6 {
<mask> return fmt.Errorf("invalid MAC")
<mask> }
<mask> lease.Expiry = time.Unix(leaseExpireStatic, 0)
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if len(lease.HWAddr) != 6 {
return fmt.Errorf("invalid MAC")
</s> add if len(l.HWAddr) != 6 {
return fmt.Errorf("invalid mac %q, only EUI-48 is supported", l.HWAddr) </s> remove return fmt.Errorf("lease not found")
</s> add return agherr.Error("lease not found") </s> remove lease.Expiry = time.Unix(leaseExpireStatic, 0)
</s> add </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() </s> remove if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
l.Hostname != lease.Hostname {
return fmt.Errorf("lease not found")
</s> add if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if len(l.HWAddr) != 6 {
return fmt.Errorf("invalid mac %q, only EUI-48 is supported", l.HWAddr) | <mask> func (s *v4Server) AddStaticLease(lease Lease) error {
<mask> if len(lease.IP) != 4 {
<mask> return fmt.Errorf("invalid IP")
<mask> }
<mask> if len(lease.HWAddr) != 6 {
<mask> return fmt.Errorf("invalid MAC")
<mask> }
<mask> lease.Expiry = time.Unix(leaseExpireStatic, 0)
<mask>
<mask> s.leasesLock.Lock()
<mask> err := s.rmDynamicLease(lease)
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove lease.Expiry = time.Unix(leaseExpireStatic, 0)
</s> add </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() </s> remove return fmt.Errorf("lease not found")
</s> add return agherr.Error("lease not found") </s> remove s.leasesLock.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
<mask> }
<mask> if len(lease.HWAddr) != 6 {
<mask> return fmt.Errorf("invalid MAC")
<mask> }
<mask> lease.Expiry = time.Unix(leaseExpireStatic, 0)
<mask>
<mask> s.leasesLock.Lock()
<mask> err := s.rmDynamicLease(lease)
<mask> if err != nil {
<mask> s.leasesLock.Unlock()
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if len(lease.HWAddr) != 6 {
return fmt.Errorf("invalid MAC")
</s> add if len(l.HWAddr) != 6 {
return fmt.Errorf("invalid mac %q, only EUI-48 is supported", l.HWAddr) </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) </s> remove s.leasesLock.Unlock()
</s> add </s> remove s.conf.notify(LeaseChangedDBStore)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go | |
l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() | <mask> return fmt.Errorf("invalid MAC")
<mask> }
<mask> lease.Expiry = time.Unix(leaseExpireStatic, 0)
<mask>
<mask> s.leasesLock.Lock()
<mask> err := s.rmDynamicLease(lease)
<mask> if err != nil {
<mask> s.leasesLock.Unlock()
<mask> return err
<mask> }
<mask> s.addLease(&lease)
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove lease.Expiry = time.Unix(leaseExpireStatic, 0)
</s> add </s> remove if len(lease.HWAddr) != 6 {
return fmt.Errorf("invalid MAC")
</s> add if len(l.HWAddr) != 6 {
return fmt.Errorf("invalid mac %q, only EUI-48 is supported", l.HWAddr) </s> remove s.leasesLock.Unlock()
</s> add </s> remove s.addLease(&lease)
s.conf.notify(LeaseChangedDBStore)
s.leasesLock.Unlock()
</s> add </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
<mask>
<mask> s.leasesLock.Lock()
<mask> err := s.rmDynamicLease(lease)
<mask> if err != nil {
<mask> s.leasesLock.Unlock()
<mask> return err
<mask> }
<mask> s.addLease(&lease)
<mask> s.conf.notify(LeaseChangedDBStore)
<mask> s.leasesLock.Unlock()
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.addLease(&lease)
s.conf.notify(LeaseChangedDBStore)
s.leasesLock.Unlock()
</s> add </s> remove lease.Expiry = time.Unix(leaseExpireStatic, 0)
</s> add </s> remove s.conf.notify(LeaseChangedDBStore)
</s> add </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() </s> remove if len(lease.HWAddr) != 6 {
return fmt.Errorf("invalid MAC")
</s> add if len(l.HWAddr) != 6 {
return fmt.Errorf("invalid mac %q, only EUI-48 is supported", l.HWAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go | |
<mask> if err != nil {
<mask> s.leasesLock.Unlock()
<mask> return err
<mask> }
<mask> s.addLease(&lease)
<mask> s.conf.notify(LeaseChangedDBStore)
<mask> s.leasesLock.Unlock()
<mask>
<mask> s.conf.notify(LeaseChangedAddedStatic)
<mask> return nil
<mask> }
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.leasesLock.Unlock()
</s> add </s> remove s.conf.notify(LeaseChangedDBStore)
</s> add </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() </s> remove lease.Expiry = time.Unix(leaseExpireStatic, 0)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go | |
s.conf.notify(LeaseChangedDBStore) | <mask> }
<mask>
<mask> s.conf.notify(LeaseChangedAddedStatic)
<mask>
<mask> return nil
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.addLease(&lease)
s.conf.notify(LeaseChangedDBStore)
s.leasesLock.Unlock()
</s> add </s> remove return lease
</s> add return l, nil </s> remove return s.leases[i]
</s> add return s.leases[i], nil </s> remove return !s.leasedOffsets.Test(offset)
</s> add return !s.leasedOffsets.isSet(offset) </s> remove s.addLease(l)
</s> add err = s.addLease(l)
if err != nil {
return nil, err
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
<mask> if err != nil {
<mask> s.leasesLock.Unlock()
<mask> return err
<mask> }
<mask> s.conf.notify(LeaseChangedDBStore)
<mask> s.leasesLock.Unlock()
<mask>
<mask> s.conf.notify(LeaseChangedRemovedStatic)
<mask> return nil
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.addLease(&lease)
s.conf.notify(LeaseChangedDBStore)
s.leasesLock.Unlock()
</s> add </s> remove s.leasesLock.Unlock()
</s> add </s> remove lease.Expiry = time.Unix(leaseExpireStatic, 0)
</s> add </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go | |
s.conf.notify(LeaseChangedDBStore) | <mask> }
<mask> s.leasesLock.Unlock()
<mask>
<mask> s.conf.notify(LeaseChangedRemovedStatic)
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // Send ICMP to the specified machine
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.conf.notify(LeaseChangedDBStore)
</s> add </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() </s> remove return result
</s> add return res </s> remove s.leasesLock.Unlock()
</s> add </s> remove s.addLease(&lease)
s.conf.notify(LeaseChangedDBStore)
s.leasesLock.Unlock()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
return !s.leasedOffsets.isSet(offset) | <mask> // Shouldn't happen.
<mask> return false
<mask> }
<mask>
<mask> return !s.leasedOffsets.Test(offset)
<mask> })
<mask>
<mask> return ip.To4()
<mask> }
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove func (r *ipRange) offset(ip net.IP) (offset uint, ok bool) {
</s> add func (r *ipRange) offset(ip net.IP) (offset uint64, ok bool) { </s> remove return fmt.Errorf("lease not found")
</s> add return agherr.Error("lease not found") </s> remove return s.leases[i]
</s> add return s.leases[i], nil </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
now := time.Now() | <mask> }
<mask>
<mask> // Find an expired lease and return its index or -1
<mask> func (s *v4Server) findExpiredLease() int {
<mask> now := time.Now().Unix()
<mask> for i, lease := range s.leases {
<mask> if lease.Expiry.Unix() != leaseExpireStatic &&
<mask> lease.Expiry.Unix() <= now {
<mask> return i
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 </s> remove if lease.Expiry.Unix() != leaseExpireStatic {
</s> add if !lease.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if !lease.IsStatic() && lease.Expiry.Before(now) { | <mask> // Find an expired lease and return its index or -1
<mask> func (s *v4Server) findExpiredLease() int {
<mask> now := time.Now().Unix()
<mask> for i, lease := range s.leases {
<mask> if lease.Expiry.Unix() != leaseExpireStatic &&
<mask> lease.Expiry.Unix() <= now {
<mask> return i
<mask> }
<mask> }
<mask> return -1
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 </s> remove if lease.Expiry.Unix() != leaseExpireStatic {
</s> add if !lease.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
func (s *v4Server) reserveLease(mac net.HardwareAddr) (l *Lease, err error) { | <mask> }
<mask>
<mask> // reserveLease reserves a lease for a client by its MAC-address. It returns
<mask> // nil if it couldn't allocate a new lease.
<mask> func (s *v4Server) reserveLease(mac net.HardwareAddr) (l *Lease) {
<mask> l = &Lease{
<mask> HWAddr: make([]byte, len(mac)),
<mask> }
<mask>
<mask> copy(l.HWAddr, mac)
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
return nil, nil | <mask> l.IP = s.nextIP()
<mask> if l.IP == nil {
<mask> i := s.findExpiredLease()
<mask> if i < 0 {
<mask> return nil
<mask> }
<mask>
<mask> copy(s.leases[i].HWAddr, mac)
<mask>
<mask> return s.leases[i]
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { </s> remove return s.leases[i]
</s> add return s.leases[i], nil </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
return s.leases[i], nil | <mask> }
<mask>
<mask> copy(s.leases[i].HWAddr, mac)
<mask>
<mask> return s.leases[i]
<mask> }
<mask>
<mask> s.addLease(l)
<mask>
<mask> return l
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove return nil
</s> add return nil, nil </s> remove s.addLease(l)
</s> add err = s.addLease(l)
if err != nil {
return nil, err
} </s> remove return l
</s> add return l, nil </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
err = s.addLease(l)
if err != nil {
return nil, err
} | <mask>
<mask> return s.leases[i]
<mask> }
<mask>
<mask> s.addLease(l)
<mask>
<mask> return l
<mask> }
<mask>
<mask> func (s *v4Server) commitLease(l *Lease) {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove return l
</s> add return l, nil </s> remove return s.leases[i]
</s> add return s.leases[i], nil </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
return l, nil | <mask> }
<mask>
<mask> s.addLease(l)
<mask>
<mask> return l
<mask> }
<mask>
<mask> func (s *v4Server) commitLease(l *Lease) {
<mask> l.Expiry = time.Now().Add(s.conf.leaseTime)
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.addLease(l)
</s> add err = s.addLease(l)
if err != nil {
return nil, err
} </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove return s.leases[i]
</s> add return s.leases[i], nil </s> remove s.addLease(l)
</s> add err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
func (s *v4Server) processDiscover(req, resp *dhcpv4.DHCPv4) (l *Lease, err error) { | <mask> s.conf.notify(LeaseChangedAdded)
<mask> }
<mask>
<mask> // Process Discover request and return lease
<mask> func (s *v4Server) processDiscover(req, resp *dhcpv4.DHCPv4) *Lease {
<mask> mac := req.ClientHWAddr
<mask>
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove var lease *Lease
</s> add var err error </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove if len(lease.HWAddr) != 6 {
return fmt.Errorf("invalid MAC")
</s> add if len(l.HWAddr) != 6 {
return fmt.Errorf("invalid mac %q, only EUI-48 is supported", l.HWAddr) </s> remove s.leasesLock.Unlock()
</s> add </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
// TODO(a.garipov): Refactor this mess.
l = s.findLease(mac)
if l == nil { | <mask>
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> lease := s.findLease(mac)
<mask> if lease == nil {
<mask> toStore := false
<mask> for lease == nil {
<mask> lease = s.reserveLease(mac)
<mask> if lease == nil {
<mask> log.Debug("dhcpv4: No more IP addresses")
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove for lease == nil {
lease = s.reserveLease(mac)
if lease == nil {
log.Debug("dhcpv4: No more IP addresses")
</s> add for l == nil {
l, err = s.reserveLease(mac)
if err != nil {
return nil, fmt.Errorf("reserving a lease: %w", err)
}
if l == nil {
log.Debug("dhcpv4: no more ip addresses") </s> remove return nil
</s> add // TODO(a.garipov): Return a special error?
return nil, nil </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove leases6 := s.srv6.GetLeasesRef()
</s> add leases6 := s.srv6.getLeasesRef() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
for l == nil {
l, err = s.reserveLease(mac)
if err != nil {
return nil, fmt.Errorf("reserving a lease: %w", err)
}
if l == nil {
log.Debug("dhcpv4: no more ip addresses") | <mask>
<mask> lease := s.findLease(mac)
<mask> if lease == nil {
<mask> toStore := false
<mask> for lease == nil {
<mask> lease = s.reserveLease(mac)
<mask> if lease == nil {
<mask> log.Debug("dhcpv4: No more IP addresses")
<mask> if toStore {
<mask> s.conf.notify(LeaseChangedDBStore)
<mask> }
<mask> return nil
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove lease := s.findLease(mac)
if lease == nil {
</s> add // TODO(a.garipov): Refactor this mess.
l = s.findLease(mac)
if l == nil { </s> remove return nil
</s> add // TODO(a.garipov): Return a special error?
return nil, nil </s> remove if !s.addrAvailable(lease.IP) {
s.blocklistLease(lease)
lease = nil
</s> add if !s.addrAvailable(l.IP) {
s.blocklistLease(l)
l = nil
</s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
// TODO(a.garipov): Return a special error?
return nil, nil | <mask> log.Debug("dhcpv4: No more IP addresses")
<mask> if toStore {
<mask> s.conf.notify(LeaseChangedDBStore)
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> toStore = true
<mask>
<mask> if !s.addrAvailable(lease.IP) {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove for lease == nil {
lease = s.reserveLease(mac)
if lease == nil {
log.Debug("dhcpv4: No more IP addresses")
</s> add for l == nil {
l, err = s.reserveLease(mac)
if err != nil {
return nil, fmt.Errorf("reserving a lease: %w", err)
}
if l == nil {
log.Debug("dhcpv4: no more ip addresses") </s> remove lease := s.findLease(mac)
if lease == nil {
</s> add // TODO(a.garipov): Refactor this mess.
l = s.findLease(mac)
if l == nil { </s> remove if !s.addrAvailable(lease.IP) {
s.blocklistLease(lease)
lease = nil
</s> add if !s.addrAvailable(l.IP) {
s.blocklistLease(l)
l = nil
</s> remove if len(reqIP) != 0 && !reqIP.Equal(lease.IP) {
log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add if len(reqIP) != 0 && !reqIP.Equal(l.IP) {
log.Debug("dhcpv4: different RequestedIP: %s != %s", reqIP, l.IP) </s> remove if lease.Expiry.Unix() != leaseExpireStatic {
</s> add if !lease.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if !s.addrAvailable(l.IP) {
s.blocklistLease(l)
l = nil
| <mask> }
<mask>
<mask> toStore = true
<mask>
<mask> if !s.addrAvailable(lease.IP) {
<mask> s.blocklistLease(lease)
<mask> lease = nil
<mask> continue
<mask> }
<mask> break
<mask> }
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove return nil
</s> add // TODO(a.garipov): Return a special error?
return nil, nil </s> remove for lease == nil {
lease = s.reserveLease(mac)
if lease == nil {
log.Debug("dhcpv4: No more IP addresses")
</s> add for l == nil {
l, err = s.reserveLease(mac)
if err != nil {
return nil, fmt.Errorf("reserving a lease: %w", err)
}
if l == nil {
log.Debug("dhcpv4: no more ip addresses") </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove if lease.Expiry.Unix() != leaseExpireStatic {
</s> add if !lease.IsStatic() { </s> remove s.addLease(l)
</s> add err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if len(reqIP) != 0 && !reqIP.Equal(l.IP) {
log.Debug("dhcpv4: different RequestedIP: %s != %s", reqIP, l.IP) | <mask> s.conf.notify(LeaseChangedDBStore)
<mask>
<mask> } else {
<mask> reqIP := req.RequestedIPAddress()
<mask> if len(reqIP) != 0 && !reqIP.Equal(lease.IP) {
<mask> log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP)
<mask> }
<mask> }
<mask>
<mask> resp.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer))
<mask> return lease
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if lease.Expiry.Unix() != leaseExpireStatic {
</s> add if !lease.IsStatic() { </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove for lease == nil {
lease = s.reserveLease(mac)
if lease == nil {
log.Debug("dhcpv4: No more IP addresses")
</s> add for l == nil {
l, err = s.reserveLease(mac)
if err != nil {
return nil, fmt.Errorf("reserving a lease: %w", err)
}
if l == nil {
log.Debug("dhcpv4: no more ip addresses") </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove s.leasedOffsets = &bitset.BitSet{}
</s> add s.leasedOffsets = newBitSet() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
return l, nil | <mask> }
<mask> }
<mask>
<mask> resp.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer))
<mask> return lease
<mask> }
<mask>
<mask> type optFQDN struct {
<mask> name string
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if len(reqIP) != 0 && !reqIP.Equal(lease.IP) {
log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add if len(reqIP) != 0 && !reqIP.Equal(l.IP) {
log.Debug("dhcpv4: different RequestedIP: %s != %s", reqIP, l.IP) </s> remove expiryStr = expiry.Format(time.RFC3339)
</s> add expiryStr = l.Expiry.Format(time.RFC3339) </s> remove func (s *winServer) GetLeasesRef() []*Lease { return nil }
</s> add func (s *winServer) getLeasesRef() []*Lease { return nil } </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if !lease.IsStatic() { | <mask>
<mask> return nil, true
<mask> }
<mask>
<mask> if lease.Expiry.Unix() != leaseExpireStatic {
<mask> lease.Hostname = req.HostName()
<mask> s.commitLease(lease)
<mask> } else if len(lease.Hostname) != 0 {
<mask> o := &optFQDN{
<mask> name: lease.Hostname,
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove if len(reqIP) != 0 && !reqIP.Equal(lease.IP) {
log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add if len(reqIP) != 0 && !reqIP.Equal(l.IP) {
log.Debug("dhcpv4: different RequestedIP: %s != %s", reqIP, l.IP) </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove return nil
</s> add // TODO(a.garipov): Return a special error?
return nil, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
var err error | <mask> // Return 1: OK
<mask> // Return 0: error; reply with Nak
<mask> // Return -1: error; don't reply
<mask> func (s *v4Server) process(req, resp *dhcpv4.DHCPv4) int {
<mask> var lease *Lease
<mask>
<mask> resp.UpdateOption(dhcpv4.OptServerIdentifier(s.conf.dnsIPAddrs[0]))
<mask>
<mask> switch req.MessageType() {
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove func (s *v4Server) processDiscover(req, resp *dhcpv4.DHCPv4) *Lease {
</s> add func (s *v4Server) processDiscover(req, resp *dhcpv4.DHCPv4) (l *Lease, err error) { </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove return nil
</s> add // TODO(a.garipov): Return a special error?
return nil, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
var l *Lease | <mask>
<mask> resp.UpdateOption(dhcpv4.OptServerIdentifier(s.conf.dnsIPAddrs[0]))
<mask>
<mask> switch req.MessageType() {
<mask> case dhcpv4.MessageTypeDiscover:
<mask> l, err = s.processDiscover(req, resp)
<mask> if err != nil {
<mask> log.Error("dhcpv4: processing discover: %s", err)
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove lease = s.processDiscover(req, resp)
if lease == nil {
</s> add l, err = s.processDiscover(req, resp)
if err != nil {
log.Error("dhcpv4: processing discover: %s", err)
</s> remove var lease *Lease
</s> add var err error </s> remove s.addLease(l)
</s> add err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} </s> remove lease, toReply = s.processRequest(req, resp)
if lease == nil {
</s> add l, toReply = s.processRequest(req, resp)
if l == nil { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
l, err = s.processDiscover(req, resp)
if err != nil {
log.Error("dhcpv4: processing discover: %s", err)
| <mask>
<mask> switch req.MessageType() {
<mask>
<mask> case dhcpv4.MessageTypeDiscover:
<mask> lease = s.processDiscover(req, resp)
<mask> if lease == nil {
<mask> return 0
<mask> }
<mask>
<mask> case dhcpv4.MessageTypeRequest:
<mask> var toReply bool
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove lease, toReply = s.processRequest(req, resp)
if lease == nil {
</s> add l, toReply = s.processRequest(req, resp)
if l == nil { </s> remove var lease *Lease
</s> add var err error </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if l == nil {
return 0
} | <mask> }
<mask>
<mask> case dhcpv4.MessageTypeRequest:
<mask> var toReply bool
<mask> l, toReply = s.processRequest(req, resp)
<mask> if l == nil {
<mask> if toReply {
<mask> return 0
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove lease, toReply = s.processRequest(req, resp)
if lease == nil {
</s> add l, toReply = s.processRequest(req, resp)
if l == nil { </s> remove lease = s.processDiscover(req, resp)
if lease == nil {
</s> add l, err = s.processDiscover(req, resp)
if err != nil {
log.Error("dhcpv4: processing discover: %s", err)
</s> remove for lease == nil {
lease = s.reserveLease(mac)
if lease == nil {
log.Debug("dhcpv4: No more IP addresses")
</s> add for l == nil {
l, err = s.reserveLease(mac)
if err != nil {
return nil, fmt.Errorf("reserving a lease: %w", err)
}
if l == nil {
log.Debug("dhcpv4: no more ip addresses") </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
l, toReply = s.processRequest(req, resp)
if l == nil { | <mask> }
<mask>
<mask> case dhcpv4.MessageTypeRequest:
<mask> var toReply bool
<mask> lease, toReply = s.processRequest(req, resp)
<mask> if lease == nil {
<mask> if toReply {
<mask> return 0
<mask> }
<mask> return -1 // drop packet
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove lease = s.processDiscover(req, resp)
if lease == nil {
</s> add l, err = s.processDiscover(req, resp)
if err != nil {
log.Error("dhcpv4: processing discover: %s", err)
</s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove return nil
</s> add return nil, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
copy(resp.YourIPAddr, l.IP) | <mask> }
<mask> }
<mask>
<mask> resp.YourIPAddr = make([]byte, 4)
<mask> copy(resp.YourIPAddr, lease.IP)
<mask>
<mask> resp.UpdateOption(dhcpv4.OptIPAddressLeaseTime(s.conf.leaseTime))
<mask> resp.UpdateOption(dhcpv4.OptRouter(s.conf.routerIP))
<mask> resp.UpdateOption(dhcpv4.OptSubnetMask(s.conf.subnetMask))
<mask> resp.UpdateOption(dhcpv4.OptDNS(s.conf.dnsIPAddrs...))
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove if len(reqIP) != 0 && !reqIP.Equal(lease.IP) {
log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP)
</s> add if len(reqIP) != 0 && !reqIP.Equal(l.IP) {
log.Debug("dhcpv4: different RequestedIP: %s != %s", reqIP, l.IP) </s> remove func (s *v4Server) reserveLease(mac net.HardwareAddr) (l *Lease) {
</s> add func (s *v4Server) reserveLease(mac net.HardwareAddr) (l *Lease, err error) { </s> remove if !s.addrAvailable(lease.IP) {
s.blocklistLease(lease)
lease = nil
</s> add if !s.addrAvailable(l.IP) {
s.blocklistLease(l)
l = nil
</s> remove return lease
</s> add return l, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
s.leasedOffsets = newBitSet() | <mask> if err != nil {
<mask> return s, fmt.Errorf("dhcpv4: %w", err)
<mask> }
<mask>
<mask> s.leasedOffsets = &bitset.BitSet{}
<mask>
<mask> if conf.LeaseDuration == 0 {
<mask> s.conf.leaseTime = time.Hour * 24
<mask> s.conf.LeaseDuration = uint32(s.conf.leaseTime.Seconds())
<mask> } else {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove for lease == nil {
lease = s.reserveLease(mac)
if lease == nil {
log.Debug("dhcpv4: No more IP addresses")
</s> add for l == nil {
l, err = s.reserveLease(mac)
if err != nil {
return nil, fmt.Errorf("reserving a lease: %w", err)
}
if l == nil {
log.Debug("dhcpv4: no more ip addresses") </s> remove if lease.Expiry.Unix() != leaseExpireStatic {
</s> add if !lease.IsStatic() { </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove lease = s.processDiscover(req, resp)
if lease == nil {
</s> add l, err = s.processDiscover(req, resp)
if err != nil {
log.Error("dhcpv4: processing discover: %s", err)
</s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
func (s *winServer) getLeasesRef() []*Lease { return nil } | <mask> type winServer struct{}
<mask>
<mask> func (s *winServer) ResetLeases(leases []*Lease) {}
<mask> func (s *winServer) GetLeases(flags int) []Lease { return nil }
<mask> func (s *winServer) GetLeasesRef() []*Lease { return nil }
<mask> func (s *winServer) AddStaticLease(lease Lease) error { return nil }
<mask> func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
<mask> func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
<mask> func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
<mask> func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove return fmt.Errorf("lease not found")
</s> add return agherr.Error("lease not found") </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove if len(lease.HWAddr) != 6 {
return fmt.Errorf("invalid MAC")
</s> add if len(l.HWAddr) != 6 {
return fmt.Errorf("invalid mac %q, only EUI-48 is supported", l.HWAddr) </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v46_windows.go |
assert.True(t, ls[0].IsStatic()) | <mask> ls = s.GetLeases(LeasesStatic)
<mask> require.Len(t, ls, 1)
<mask> assert.True(t, l.IP.Equal(ls[0].IP))
<mask> assert.Equal(t, l.HWAddr, ls[0].HWAddr)
<mask> assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix())
<mask>
<mask> // Try to remove static lease.
<mask> assert.NotNil(t, s.RemoveStaticLease(Lease{
<mask> IP: net.IP{192, 168, 10, 110},
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.addLease(&dynLeases[i])
</s> add err = s.addLease(&dynLeases[i])
require.Nil(t, err) </s> remove assert.EqualValues(t, leaseExpireStatic, ll[0].Expiry.Unix())
</s> add assert.True(t, ll[0].IsStatic()) </s> remove assert.EqualValues(t, leaseExpireStatic, l.Expiry.Unix())
</s> add assert.True(t, l.IsStatic()) </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4_test.go |
err = s.addLease(&dynLeases[i])
require.Nil(t, err) | <mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }}
<mask>
<mask> for i := range dynLeases {
<mask> s.addLease(&dynLeases[i])
<mask> }
<mask>
<mask> stLeases := []Lease{{
<mask> IP: net.IP{192, 168, 10, 150},
<mask> HWAddr: net.HardwareAddr{0x33, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix())
</s> add assert.True(t, ls[0].IsStatic()) </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove func (s *v4Server) reserveLease(mac net.HardwareAddr) (l *Lease) {
</s> add func (s *v4Server) reserveLease(mac net.HardwareAddr) (l *Lease, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4_test.go |
assert.True(t, l.IsStatic()) | <mask>
<mask> for i, l := range ls {
<mask> assert.True(t, stLeases[i].IP.Equal(l.IP))
<mask> assert.Equal(t, stLeases[i].HWAddr, l.HWAddr)
<mask> assert.EqualValues(t, leaseExpireStatic, l.Expiry.Unix())
<mask> }
<mask> }
<mask>
<mask> func TestV4StaticLease_Get(t *testing.T) {
<mask> var err error
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove assert.EqualValues(t, leaseExpireStatic, ll[0].Expiry.Unix())
</s> add assert.True(t, ll[0].IsStatic()) </s> remove assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix())
</s> add assert.True(t, ls[0].IsStatic()) </s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) </s> remove log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
</s> add return s.addDynamicLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4_test.go |
// getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { | <mask> s.leasesLock.Unlock()
<mask> return result
<mask> }
<mask>
<mask> // GetLeasesRef - get leases
<mask> func (s *v6Server) GetLeasesRef() []*Lease {
<mask> return s.leases
<mask> }
<mask>
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
<mask> func (s *v6Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove return result
</s> add return res </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove s.leasesLock.Unlock()
</s> add </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v6.go |
"stats_disabled": "The statistics have been disabled. You can turn it on from the <0>settings page</0>.",
"stats_disabled_short": "The statistics have been disabled", | <mask> "stats_query_domain": "Top queried domains",
<mask> "for_last_24_hours": "for the last 24 hours",
<mask> "for_last_days": "for the last {{count}} day",
<mask> "for_last_days_plural": "for the last {{count}} days",
<mask> "no_domains_found": "No domains found",
<mask> "requests_count": "Requests count",
<mask> "top_blocked_domains": "Top blocked domains",
<mask> "top_clients": "Top clients",
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> </s> remove <Card title={t('statistics_configuration')} bodyType="card-body box-body--settings">
</s> add <Card
title={t('statistics_configuration')}
bodyType="card-body box-body--settings"
id="stats-config"
> </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { </s> remove </div>
</s> add </Link> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/__locales/en.json |
import { HashLink as Link } from 'react-router-hash-link'; | <mask> import React, { useEffect } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, useTranslation } from 'react-i18next';
<mask> import classNames from 'classnames';
<mask>
<mask> import Statistics from './Statistics';
<mask> import Counters from './Counters';
<mask> import Clients from './Clients';
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Dashboard/index.js |
import { SETTINGS_URLS } from '../../helpers/constants'; | <mask> import QueriedDomains from './QueriedDomains';
<mask> import BlockedDomains from './BlockedDomains';
<mask>
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Loading from '../ui/Loading';
<mask> import './Dashboard.css';
<mask>
<mask> const Dashboard = ({
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Dashboard/index.js |
const getSubtitle = () => {
if (stats.interval === 0) {
return t('stats_disabled_short');
}
return stats.interval === 1
? t('for_last_24_hours')
: t('for_last_days', { count: stats.interval });
};
| <mask> }, []);
<mask>
<mask> const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
<mask>
<mask> const buttonClass = classNames('btn btn-sm dashboard-title__button', {
<mask> 'btn-gray': protectionEnabled,
<mask> 'btn-success': !protectionEnabled,
<mask> });
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const subtitle = stats.interval === 1
? t('for_last_24_hours')
: t('for_last_days', { count: stats.interval });
</s> add </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Dashboard/index.js |
<mask> <use xlinkHref="#refresh" />
<mask> </svg>
<mask> </button>;
<mask>
<mask> const subtitle = stats.interval === 1
<mask> ? t('for_last_24_hours')
<mask> : t('for_last_days', { count: stats.interval });
<mask>
<mask> const statsProcessing = stats.processingStats
<mask> || stats.processingGetConfig
<mask> || access.processing;
<mask>
<mask> return <>
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Dashboard/index.js | |
const subtitle = getSubtitle();
| <mask> || access.processing;
<mask>
<mask> return <>
<mask> <PageTitle title={t('dashboard')} containerClass="page-title--dashboard">
<mask> <button
<mask> type="button"
<mask> className={buttonClass}
<mask> onClick={() => toggleProtection(protectionEnabled)}
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const subtitle = stats.interval === 1
? t('for_last_24_hours')
: t('for_last_days', { count: stats.interval });
</s> add </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { </s> remove <Card title={t('statistics_configuration')} bodyType="card-body box-body--settings">
</s> add <Card
title={t('statistics_configuration')}
bodyType="card-body box-body--settings"
id="stats-config"
> </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Dashboard/index.js |
{stats.interval === 0 && (
<div className="alert alert-warning" role="alert">
<Trans components={[
<Link
to={`${SETTINGS_URLS.settings}#stats-config`}
key="0"
>
link
</Link>,
]}>
stats_disabled
</Trans>
</div>
)} | <mask> {statsProcessing && <Loading />}
<mask> {!statsProcessing && <div className="row row-cards dashboard">
<mask> <div className="col-lg-12">
<mask> <Statistics
<mask> interval={stats.interval}
<mask> dnsQueries={stats.dnsQueries}
<mask> blockedFiltering={stats.blockedFiltering}
<mask> replacedSafebrowsing={stats.replacedSafebrowsing}
<mask> replacedParental={stats.replacedParental}
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove <div
className="detailed-info d-none d-sm-block logs__text"
</s> add <Link
className="detailed-info d-none d-sm-block logs__text logs__text--link"
to={`logs?search=${encodeURIComponent(clientName)}`} </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> </s> remove <Card title={t('statistics_configuration')} bodyType="card-body box-body--settings">
</s> add <Card
title={t('statistics_configuration')}
bodyType="card-body box-body--settings"
id="stats-config"
> </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Dashboard/index.js |
import { Link } from 'react-router-dom'; | <mask> import classNames from 'classnames';
<mask> import { useTranslation } from 'react-i18next';
<mask> import propTypes from 'prop-types';
<mask>
<mask> import { checkFiltered, getBlockingClientName } from '../../../helpers/helpers';
<mask> import { BLOCK_ACTIONS } from '../../../helpers/constants';
<mask> import { toggleBlocking, toggleBlockingForClient } from '../../../actions';
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Logs/Cells/ClientCell.js |
<Link
className="detailed-info d-none d-sm-block logs__text logs__text--link"
to={`logs?search=${encodeURIComponent(clientName)}`} | <mask> <div data-tip={true} data-for={id}>
<mask> {renderFormattedClientCell(client, clientInfo, isDetailed, true)}
<mask> </div>
<mask> {isDetailed && clientName && !whoisAvailable && (
<mask> <div
<mask> className="detailed-info d-none d-sm-block logs__text"
<mask> title={clientName}
<mask> >
<mask> {clientName}
<mask> </div>
<mask> )}
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove </div>
</s> add </Link> </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> </s> remove <Card title={t('statistics_configuration')} bodyType="card-body box-body--settings">
</s> add <Card
title={t('statistics_configuration')}
bodyType="card-body box-body--settings"
id="stats-config"
> </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Logs/Cells/ClientCell.js |
</Link> | <mask> className="detailed-info d-none d-sm-block logs__text"
<mask> title={clientName}
<mask> >
<mask> {clientName}
<mask> </div>
<mask> )}
<mask> </div>
<mask> {renderBlockingButton(isFiltered, domain)}
<mask> </div>
<mask> );
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove <div
className="detailed-info d-none d-sm-block logs__text"
</s> add <Link
className="detailed-info d-none d-sm-block logs__text logs__text--link"
to={`logs?search=${encodeURIComponent(clientName)}`} </s> remove <Card title={t('statistics_configuration')} bodyType="card-body box-body--settings">
</s> add <Card
title={t('statistics_configuration')}
bodyType="card-body box-body--settings"
id="stats-config"
> </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Logs/Cells/ClientCell.js |
.logs__text--link {
color: #467fcf;
}
.logs__text--link:hover,
.logs__text--link:focus {
color: #295a9f;
}
| <mask> line-height: 1.4;
<mask> color: #888888;
<mask> }
<mask>
<mask> .icon--selected {
<mask> background-color: var(--gray-f3);
<mask> border: solid 1px var(--gray-d8);
<mask> border-radius: 4px;
<mask> }
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Logs/Logs.css |
const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { | <mask> import Form from './Form';
<mask>
<mask> class StatsConfig extends Component {
<mask> handleFormSubmit = (values) => {
<mask> const { t } = this.props;
<mask> // eslint-disable-next-line no-alert
<mask> if (window.confirm(t('statistics_retention_confirm'))) {
<mask> this.props.setStatsConfig(values);
<mask> }
<mask> };
<mask>
<mask> handleReset = () => {
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Settings/StatsConfig/index.js |
<Card
title={t('statistics_configuration')}
bodyType="card-body box-body--settings"
id="stats-config"
> | <mask> t, interval, processing, processingReset,
<mask> } = this.props;
<mask>
<mask> return (
<mask> <Card title={t('statistics_configuration')} bodyType="card-body box-body--settings">
<mask> <div className="form">
<mask> <Form
<mask> initialValues={{ interval }}
<mask> onSubmit={this.handleFormSubmit}
<mask> processing={processing}
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { </s> remove <div
className="detailed-info d-none d-sm-block logs__text"
</s> add <Link
className="detailed-info d-none d-sm-block logs__text logs__text--link"
to={`logs?search=${encodeURIComponent(clientName)}`} </s> remove const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
</s> add const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/components/Settings/StatsConfig/index.js |
const nameValue = <div className="logs__text logs__text--link logs__text--nowrap" title={`${name} (${value})`}> | <mask> const { name, whois_info } = info;
<mask> const whoisAvailable = whois_info && Object.keys(whois_info).length > 0;
<mask>
<mask> if (name) {
<mask> const nameValue = <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
<mask> {name} <small>{`(${value})`}</small>
<mask> </div>;
<mask>
<mask> if (!isLogs) {
<mask> nameContainer = nameValue;
</s> Pull request: 3313 statistics settings UI
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message </s> remove const { t } = this.props;
// eslint-disable-next-line no-alert
if (window.confirm(t('statistics_retention_confirm'))) {
</s> add const { t, interval: prevInterval } = this.props;
if (values.interval < prevInterval) {
if (window.confirm(t('statistics_retention_confirm'))) {
this.props.setStatsConfig(values);
}
} else { </s> remove <div
className="detailed-info d-none d-sm-block logs__text"
</s> add <Link
className="detailed-info d-none d-sm-block logs__text logs__text--link"
to={`logs?search=${encodeURIComponent(clientName)}`} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ebade2b6cec89793d852473eb918861b545fe1d4 | client/src/helpers/renderFormattedClientCell.js |
// Exchange tries to resolve the ip in a suitable way, i.e. either as local
// or as external. | <mask> }
<mask>
<mask> // RDNSExchanger is a resolver for clients' addresses.
<mask> type RDNSExchanger interface {
<mask> // Exchange tries to resolve the ip in a suitable way, e.g. either as
<mask> // local or as external.
<mask> Exchange(ip net.IP) (host string, err error)
<mask>
<mask> // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
<mask> // resolve PTR requests for locally-served addresses.
<mask> ResolvesPrivatePTR() (ok bool)
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // rDNSNotPTRErr is returned by Exchange method when the response is not
// of PTR type.
rDNSNotPTRErr errors.Error = "the response is not a ptr"
</s> add // ErrRDNSFailed is returned by [RDNSExchanger.Exchange] if the received
// response is not a NOERROR or NXDOMAIN.
ErrRDNSFailed errors.Error = "failed to resolve ptr" </s> remove return strings.TrimSuffix(ptr.Ptr, "."), nil
</s> add return "", ErrRDNSNoData </s> remove // rDNSEmptyAnswerErr is returned by Exchange method when the answer
// section of respond is empty.
rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
</s> add // ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
// section of response is either NODATA or has no PTR records.
ErrRDNSNoData errors.Error = "no ptr data in response" </s> remove // The cache entry either expired or doesn't exist.
ttl := make([]byte, 8)
binary.BigEndian.PutUint64(ttl, now+defaultRDNSCacheTTL)
r.ipCache.Set(ipBytes, ttl)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward.go |
// ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
// section of response is either NODATA or has no PTR records.
ErrRDNSNoData errors.Error = "no ptr data in response" | <mask> ResolvesPrivatePTR() (ok bool)
<mask> }
<mask>
<mask> const (
<mask> // rDNSEmptyAnswerErr is returned by Exchange method when the answer
<mask> // section of respond is empty.
<mask> rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
<mask>
<mask> // rDNSNotPTRErr is returned by Exchange method when the response is not
<mask> // of PTR type.
<mask> rDNSNotPTRErr errors.Error = "the response is not a ptr"
<mask> )
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // rDNSNotPTRErr is returned by Exchange method when the response is not
// of PTR type.
rDNSNotPTRErr errors.Error = "the response is not a ptr"
</s> add // ErrRDNSFailed is returned by [RDNSExchanger.Exchange] if the received
// response is not a NOERROR or NXDOMAIN.
ErrRDNSFailed errors.Error = "failed to resolve ptr" </s> remove // Exchange tries to resolve the ip in a suitable way, e.g. either as
// local or as external.
</s> add // Exchange tries to resolve the ip in a suitable way, i.e. either as local
// or as external. </s> remove // The cache entry either expired or doesn't exist.
ttl := make([]byte, 8)
binary.BigEndian.PutUint64(ttl, now+defaultRDNSCacheTTL)
r.ipCache.Set(ipBytes, ttl)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward.go |
// ErrRDNSFailed is returned by [RDNSExchanger.Exchange] if the received
// response is not a NOERROR or NXDOMAIN.
ErrRDNSFailed errors.Error = "failed to resolve ptr" | <mask> // rDNSEmptyAnswerErr is returned by Exchange method when the answer
<mask> // section of respond is empty.
<mask> rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
<mask>
<mask> // rDNSNotPTRErr is returned by Exchange method when the response is not
<mask> // of PTR type.
<mask> rDNSNotPTRErr errors.Error = "the response is not a ptr"
<mask> )
<mask>
<mask> // type check
<mask> var _ RDNSExchanger = (*Server)(nil)
<mask>
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // rDNSEmptyAnswerErr is returned by Exchange method when the answer
// section of respond is empty.
rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
</s> add // ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
// section of response is either NODATA or has no PTR records.
ErrRDNSNoData errors.Error = "no ptr data in response" </s> remove // Exchange tries to resolve the ip in a suitable way, e.g. either as
// local or as external.
</s> add // Exchange tries to resolve the ip in a suitable way, i.e. either as local
// or as external. </s> remove // The cache entry either expired or doesn't exist.
ttl := make([]byte, 8)
binary.BigEndian.PutUint64(ttl, now+defaultRDNSCacheTTL)
r.ipCache.Set(ipBytes, ttl)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward.go |
// Distinguish between NODATA response and a failed request. | <mask> return "", err
<mask> }
<mask>
<mask> resp := ctx.Res
<mask> if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
<mask> return "", fmt.Errorf(
<mask> "received %s response: %w",
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} </s> remove return strings.TrimSuffix(ptr.Ptr, "."), nil
</s> add return "", ErrRDNSNoData </s> remove
return
</s> add </s> remove
continue
} else if host == "" {
continue
</s> add if errors.Is(err, dnsforward.ErrRDNSFailed) {
// Cache failure for a less time.
ttl = revDNSFailureCacheTTL
} </s> remove if binary.BigEndian.Uint64(expire) > now {
return true
}
</s> add return binary.BigEndian.Uint64(expire) > now | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward.go |
if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} | <mask> return "", err
<mask> }
<mask>
<mask> resp := ctx.Res
<mask> if len(resp.Answer) == 0 {
<mask> return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
<mask> }
<mask>
<mask> ptr, ok := resp.Answer[0].(*dns.PTR)
<mask> if !ok {
<mask> return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
<mask> }
<mask>
<mask> return strings.TrimSuffix(ptr.Ptr, "."), nil
<mask> }
<mask>
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove return strings.TrimSuffix(ptr.Ptr, "."), nil
</s> add return "", ErrRDNSNoData </s> remove // Return false if the new source has higher priority.
return source <= rc.Source
</s> add return rc.Source </s> remove return true
</s> add return ClientSourcePersistent </s> remove
continue
} else if host == "" {
continue
</s> add if errors.Is(err, dnsforward.ErrRDNSFailed) {
// Cache failure for a less time.
ttl = revDNSFailureCacheTTL
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward.go |
return "", ErrRDNSNoData | <mask> if !ok {
<mask> return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
<mask> }
<mask>
<mask> return strings.TrimSuffix(ptr.Ptr, "."), nil
<mask> }
<mask>
<mask> // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
<mask> func (s *Server) ResolvesPrivatePTR() (ok bool) {
<mask> s.serverLock.RLock()
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} </s> remove // Exchange tries to resolve the ip in a suitable way, e.g. either as
// local or as external.
</s> add // Exchange tries to resolve the ip in a suitable way, i.e. either as local
// or as external. </s> remove // Return false if the new source has higher priority.
return source <= rc.Source
</s> add return rc.Source </s> remove return false
</s> add return ClientSourceNone | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward.go |
refusingUpstream := aghtest.NewUpstreamMock(func(req *dns.Msg) (resp *dns.Msg, err error) {
return new(dns.Msg).SetRcode(req, dns.RcodeRefused), nil
}) | <mask> errUpstream := aghtest.NewErrorUpstream()
<mask> nonPtrUpstream := aghtest.NewBlockUpstream("some-host", true)
<mask>
<mask> srv := &Server{
<mask> recDetector: newRecursionDetector(0, 1),
<mask> internalProxy: &proxy.Proxy{
<mask> Config: proxy.Config{
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove ups upstream.Upstream
cliIP netip.Addr
wantLog string
name string
</s> add ups upstream.Upstream
cliIP netip.Addr
wantLog string
name string
wantClientSource clientSource </s> remove MaxCount: defaultRDNSCacheSize,
</s> add MaxCount: revDNSCacheSize, </s> remove MaxCount: defaultRDNSCacheSize,
</s> add MaxCount: revDNSCacheSize, </s> remove if binary.BigEndian.Uint64(expire) > now {
return true
}
</s> add return binary.BigEndian.Uint64(expire) > now | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward_test.go |
wantErr: ErrRDNSNoData, | <mask> req: localIP,
<mask> }, {
<mask> name: "empty_answer_error",
<mask> want: "",
<mask> wantErr: rDNSEmptyAnswerErr,
<mask> locUpstream: locUpstream,
<mask> req: net.IP{192, 168, 1, 2},
<mask> }, {
<mask> name: "not_ptr_error",
<mask> want: "",
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove name: "not_ptr_error",
</s> add name: "invalid_answer", </s> remove wantErr: rDNSNotPTRErr,
</s> add wantErr: ErrRDNSNoData, </s> remove ups: errUpstream,
cliIP: netip.MustParseAddr("192.168.1.2"),
wantLog: `rdns: resolving "192.168.1.2": test upstream error`,
name: "resolve_error",
</s> add ups: errUpstream,
cliIP: netip.MustParseAddr("192.168.1.2"),
wantLog: `rdns: resolving "192.168.1.2": test upstream error`,
name: "resolve_error",
wantClientSource: ClientSourceNone, </s> remove ups: locUpstream,
cliIP: localIP,
wantLog: "",
name: "all_good",
</s> add ups: locUpstream,
cliIP: localIP,
wantLog: "",
name: "all_good",
wantClientSource: ClientSourceRDNS, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward_test.go |
name: "invalid_answer", | <mask> wantErr: rDNSEmptyAnswerErr,
<mask> locUpstream: locUpstream,
<mask> req: net.IP{192, 168, 1, 2},
<mask> }, {
<mask> name: "not_ptr_error",
<mask> want: "",
<mask> wantErr: rDNSNotPTRErr,
<mask> locUpstream: nonPtrUpstream,
<mask> req: localIP,
<mask> }}
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove wantErr: rDNSEmptyAnswerErr,
</s> add wantErr: ErrRDNSNoData, </s> remove wantErr: rDNSNotPTRErr,
</s> add wantErr: ErrRDNSNoData, </s> remove ups: locUpstream,
cliIP: netip.MustParseAddr("2a00:1450:400c:c06::93"),
wantLog: "",
name: "ipv6_good",
</s> add ups: locUpstream,
cliIP: netip.MustParseAddr("2a00:1450:400c:c06::93"),
wantLog: "",
name: "ipv6_good",
wantClientSource: ClientSourceRDNS, </s> remove ups: locUpstream,
cliIP: localIP,
wantLog: "",
name: "all_good",
</s> add ups: locUpstream,
cliIP: localIP,
wantLog: "",
name: "all_good",
wantClientSource: ClientSourceRDNS, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward_test.go |
wantErr: ErrRDNSNoData, | <mask> req: net.IP{192, 168, 1, 2},
<mask> }, {
<mask> name: "not_ptr_error",
<mask> want: "",
<mask> wantErr: rDNSNotPTRErr,
<mask> locUpstream: nonPtrUpstream,
<mask> req: localIP,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove name: "not_ptr_error",
</s> add name: "invalid_answer", </s> remove wantErr: rDNSEmptyAnswerErr,
</s> add wantErr: ErrRDNSNoData, </s> remove ups: locUpstream,
cliIP: netip.MustParseAddr("2a00:1450:400c:c06::93"),
wantLog: "",
name: "ipv6_good",
</s> add ups: locUpstream,
cliIP: netip.MustParseAddr("2a00:1450:400c:c06::93"),
wantLog: "",
name: "ipv6_good",
wantClientSource: ClientSourceRDNS, </s> remove ups: errUpstream,
cliIP: netip.MustParseAddr("192.168.1.2"),
wantLog: `rdns: resolving "192.168.1.2": test upstream error`,
name: "resolve_error",
</s> add ups: errUpstream,
cliIP: netip.MustParseAddr("192.168.1.2"),
wantLog: `rdns: resolving "192.168.1.2": test upstream error`,
name: "resolve_error",
wantClientSource: ClientSourceNone, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward_test.go |
}, {
name: "refused",
want: "",
wantErr: ErrRDNSFailed,
locUpstream: refusingUpstream,
req: localIP, | <mask> wantErr: ErrRDNSNoData,
<mask> locUpstream: nonPtrUpstream,
<mask> req: localIP,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> pcfg := proxy.Config{
<mask> UpstreamConfig: &proxy.UpstreamConfig{
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove wantErr: rDNSNotPTRErr,
</s> add wantErr: ErrRDNSNoData, </s> remove name: "not_ptr_error",
</s> add name: "invalid_answer", </s> remove wantErr: rDNSEmptyAnswerErr,
</s> add wantErr: ErrRDNSNoData, </s> remove ups: locUpstream,
cliIP: netip.MustParseAddr("2a00:1450:400c:c06::93"),
wantLog: "",
name: "ipv6_good",
</s> add ups: locUpstream,
cliIP: netip.MustParseAddr("2a00:1450:400c:c06::93"),
wantLog: "",
name: "ipv6_good",
wantClientSource: ClientSourceRDNS, </s> remove ups upstream.Upstream
cliIP netip.Addr
wantLog string
name string
</s> add ups upstream.Upstream
cliIP netip.Addr
wantLog string
name string
wantClientSource clientSource | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/dnsforward/dnsforward_test.go |
// Clients information sources. The order determines the priority. | <mask> }
<mask>
<mask> type clientSource uint
<mask>
<mask> // Client sources. The order determines the priority.
<mask> const (
<mask> ClientSourceWHOIS clientSource = iota
<mask> ClientSourceARP
<mask> ClientSourceRDNS
<mask> ClientSourceDHCP
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove ClientSourceWHOIS clientSource = iota
</s> add ClientSourceNone clientSource = iota
ClientSourceWHOIS </s> remove // Default rDNS values.
</s> add // Default AdGuard Home reverse DNS values. </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { </s> remove // rDNSEmptyAnswerErr is returned by Exchange method when the answer
// section of respond is empty.
rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
</s> add // ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
// section of response is either NODATA or has no PTR records.
ErrRDNSNoData errors.Error = "no ptr data in response" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
ClientSourceNone clientSource = iota
ClientSourceWHOIS | <mask> type clientSource uint
<mask>
<mask> // Client sources. The order determines the priority.
<mask> const (
<mask> ClientSourceWHOIS clientSource = iota
<mask> ClientSourceARP
<mask> ClientSourceRDNS
<mask> ClientSourceDHCP
<mask> ClientSourceHostsFile
<mask> )
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // Client sources. The order determines the priority.
</s> add // Clients information sources. The order determines the priority. </s> remove // Default rDNS values.
</s> add // Default AdGuard Home reverse DNS values. </s> remove // rDNSEmptyAnswerErr is returned by Exchange method when the answer
// section of respond is empty.
rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
</s> add // ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
// section of response is either NODATA or has no PTR records.
ErrRDNSNoData errors.Error = "no ptr data in response" </s> remove defaultRDNSCacheSize = 10000
defaultRDNSCacheTTL = 1 * 60 * 60
defaultRDNSIPChSize = 256
</s> add revDNSCacheSize = 10000
// TODO(e.burkov): Make these values configurable.
revDNSCacheTTL = 24 * 60 * 60
revDNSFailureCacheTTL = 1 * 60 * 60
revDNSQueueSize = 256 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
ClientSourcePersistent | <mask> ClientSourceARP
<mask> ClientSourceRDNS
<mask> ClientSourceDHCP
<mask> ClientSourceHostsFile
<mask> )
<mask>
<mask> // type check
<mask> var _ fmt.Stringer = clientSource(0)
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove ClientSourceWHOIS clientSource = iota
</s> add ClientSourceNone clientSource = iota
ClientSourceWHOIS </s> remove // Client sources. The order determines the priority.
</s> add // Clients information sources. The order determines the priority. </s> remove // rDNSNotPTRErr is returned by Exchange method when the response is not
// of PTR type.
rDNSNotPTRErr errors.Error = "the response is not a ptr"
</s> add // ErrRDNSFailed is returned by [RDNSExchanger.Exchange] if the received
// response is not a NOERROR or NXDOMAIN.
ErrRDNSFailed errors.Error = "failed to resolve ptr" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
// type check | <mask> )
<mask>
<mask> var _ fmt.Stringer = clientSource(0)
<mask>
<mask> // String returns a human-readable name of cs.
<mask> func (cs clientSource) String() (s string) {
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // rDNSNotPTRErr is returned by Exchange method when the response is not
// of PTR type.
rDNSNotPTRErr errors.Error = "the response is not a ptr"
</s> add // ErrRDNSFailed is returned by [RDNSExchanger.Exchange] if the received
// response is not a NOERROR or NXDOMAIN.
ErrRDNSFailed errors.Error = "failed to resolve ptr" </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { </s> remove // rDNSEmptyAnswerErr is returned by Exchange method when the answer
// section of respond is empty.
rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
</s> add // ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
// section of response is either NODATA or has no PTR records.
ErrRDNSNoData errors.Error = "no ptr data in response" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
// type check | <mask> return ""
<mask> }
<mask> }
<mask>
<mask> var _ encoding.TextMarshaler = clientSource(0)
<mask>
<mask> // MarshalText implements encoding.TextMarshaler for the clientSource.
<mask> func (cs clientSource) MarshalText() (text []byte, err error) {
<mask> return []byte(cs.String()), nil
<mask> }
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove return strings.TrimSuffix(ptr.Ptr, "."), nil
</s> add return "", ErrRDNSNoData </s> remove
continue
} else if host == "" {
continue
</s> add if errors.Is(err, dnsforward.ErrRDNSFailed) {
// Cache failure for a less time.
ttl = revDNSFailureCacheTTL
} </s> remove _ = r.clients.AddHost(ip, host, ClientSourceRDNS)
</s> add r.cache(ip, ttl)
if host != "" {
_ = r.clients.AddHost(ip, host, ClientSourceRDNS)
} </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
// clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { | <mask> clients.updateFromDHCP(false)
<mask> }
<mask> }
<mask>
<mask> // exists checks if client with this IP address already exists.
<mask> func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> _, ok = clients.findLocked(ip.String())
<mask> if ok {
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove _, ok = clients.findLocked(ip.String())
</s> add _, ok := clients.findLocked(ip.String()) </s> remove return true
</s> add return ClientSourcePersistent </s> remove return false
</s> add return ClientSourceNone </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
_, ok := clients.findLocked(ip.String()) | <mask> func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> _, ok = clients.findLocked(ip.String())
<mask> if ok {
<mask> return true
<mask> }
<mask>
<mask> rc, ok := clients.ipToRC[ip]
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { </s> remove return true
</s> add return ClientSourcePersistent </s> remove return false
</s> add return ClientSourceNone </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} </s> remove if binary.BigEndian.Uint64(expire) > now {
return true
}
</s> add return binary.BigEndian.Uint64(expire) > now | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
return ClientSourcePersistent | <mask> defer clients.lock.Unlock()
<mask>
<mask> _, ok = clients.findLocked(ip.String())
<mask> if ok {
<mask> return true
<mask> }
<mask>
<mask> rc, ok := clients.ipToRC[ip]
<mask> if !ok {
<mask> return false
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove _, ok = clients.findLocked(ip.String())
</s> add _, ok := clients.findLocked(ip.String()) </s> remove return false
</s> add return ClientSourceNone </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { </s> remove // Return false if the new source has higher priority.
return source <= rc.Source
</s> add return rc.Source | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
return ClientSourceNone | <mask> }
<mask>
<mask> rc, ok := clients.ipToRC[ip]
<mask> if !ok {
<mask> return false
<mask> }
<mask>
<mask> // Return false if the new source has higher priority.
<mask> return source <= rc.Source
<mask> }
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // Return false if the new source has higher priority.
return source <= rc.Source
</s> add return rc.Source </s> remove return true
</s> add return ClientSourcePersistent </s> remove _, ok = clients.findLocked(ip.String())
</s> add _, ok := clients.findLocked(ip.String()) </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
return rc.Source | <mask> if !ok {
<mask> return false
<mask> }
<mask>
<mask> // Return false if the new source has higher priority.
<mask> return source <= rc.Source
<mask> }
<mask>
<mask> func toQueryLogWHOIS(wi *RuntimeClientWHOISInfo) (cw *querylog.ClientWHOIS) {
<mask> if wi == nil {
<mask> return &querylog.ClientWHOIS{}
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove return false
</s> add return ClientSourceNone </s> remove return true
</s> add return ClientSourcePersistent </s> remove return strings.TrimSuffix(ptr.Ptr, "."), nil
</s> add return "", ErrRDNSNoData </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} </s> remove _, ok = clients.findLocked(ip.String())
</s> add _, ok := clients.findLocked(ip.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients.go |
assert.Equal(t, clients.clientSource(cliNoneIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cli1IP), ClientSourcePersistent)
assert.Equal(t, clients.clientSource(cli2IP), ClientSourcePersistent) | <mask> require.True(t, ok)
<mask>
<mask> assert.Equal(t, "client2", c.Name)
<mask>
<mask> assert.False(t, clients.exists(cliNoneIP, ClientSourceHostsFile))
<mask> assert.True(t, clients.exists(cli1IP, ClientSourceHostsFile))
<mask> assert.True(t, clients.exists(cli2IP, ClientSourceHostsFile))
<mask> })
<mask>
<mask> t.Run("add_fail_name", func(t *testing.T) {
<mask> ok, err := clients.Add(&Client{
<mask> IDs: []string{"1.2.3.5"},
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove assert.False(t, clients.exists(netip.MustParseAddr("1.1.1.2"), ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(netip.MustParseAddr("1.1.1.2")), ClientSourceNone) </s> remove assert.False(t, clients.exists(cliOldIP, ClientSourceHostsFile))
assert.True(t, clients.exists(cliNewIP, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(cliOldIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cliNewIP), ClientSourcePersistent) </s> remove assert.True(t, clients.exists(ip, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceHostsFile) </s> remove assert.True(t, clients.exists(ip, ClientSourceARP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceARP) </s> remove assert.True(t, clients.exists(ip, ClientSourceDHCP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceDHCP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients_test.go |
assert.Equal(t, clients.clientSource(cliOldIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cliNewIP), ClientSourcePersistent) | <mask> Name: "client1",
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> assert.False(t, clients.exists(cliOldIP, ClientSourceHostsFile))
<mask> assert.True(t, clients.exists(cliNewIP, ClientSourceHostsFile))
<mask>
<mask> err = clients.Update("client1", &Client{
<mask> IDs: []string{cliNew},
<mask> Name: "client1-renamed",
<mask> UseOwnSettings: true,
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove assert.False(t, clients.exists(cliNoneIP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli1IP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli2IP, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(cliNoneIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cli1IP), ClientSourcePersistent)
assert.Equal(t, clients.clientSource(cli2IP), ClientSourcePersistent) </s> remove assert.False(t, clients.exists(netip.MustParseAddr("1.1.1.2"), ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(netip.MustParseAddr("1.1.1.2")), ClientSourceNone) </s> remove assert.True(t, clients.exists(ip, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceHostsFile) </s> remove assert.True(t, clients.exists(ip, ClientSourceARP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceARP) </s> remove assert.True(t, clients.exists(ip, ClientSourceDHCP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceDHCP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients_test.go |
assert.Equal(t, clients.clientSource(netip.MustParseAddr("1.1.1.2")), ClientSourceNone) | <mask> t.Run("del_success", func(t *testing.T) {
<mask> ok := clients.Del("client1-renamed")
<mask> require.True(t, ok)
<mask>
<mask> assert.False(t, clients.exists(netip.MustParseAddr("1.1.1.2"), ClientSourceHostsFile))
<mask> })
<mask>
<mask> t.Run("del_fail", func(t *testing.T) {
<mask> ok := clients.Del("client3")
<mask> assert.False(t, ok)
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove assert.False(t, clients.exists(cliNoneIP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli1IP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli2IP, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(cliNoneIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cli1IP), ClientSourcePersistent)
assert.Equal(t, clients.clientSource(cli2IP), ClientSourcePersistent) </s> remove assert.True(t, clients.exists(ip, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceHostsFile) </s> remove assert.True(t, clients.exists(ip, ClientSourceARP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceARP) </s> remove assert.True(t, clients.exists(ip, ClientSourceDHCP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceDHCP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients_test.go |
assert.Equal(t, clients.clientSource(ip), ClientSourceHostsFile) | <mask>
<mask> ok = clients.AddHost(ip, "host3", ClientSourceHostsFile)
<mask> assert.True(t, ok)
<mask>
<mask> assert.True(t, clients.exists(ip, ClientSourceHostsFile))
<mask> })
<mask>
<mask> t.Run("dhcp_replaces_arp", func(t *testing.T) {
<mask> ip := netip.MustParseAddr("1.2.3.4")
<mask> ok := clients.AddHost(ip, "from_arp", ClientSourceARP)
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove assert.True(t, clients.exists(ip, ClientSourceARP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceARP) </s> remove assert.True(t, clients.exists(ip, ClientSourceDHCP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceDHCP) </s> remove assert.False(t, clients.exists(netip.MustParseAddr("1.1.1.2"), ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(netip.MustParseAddr("1.1.1.2")), ClientSourceNone) </s> remove assert.False(t, clients.exists(cliNoneIP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli1IP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli2IP, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(cliNoneIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cli1IP), ClientSourcePersistent)
assert.Equal(t, clients.clientSource(cli2IP), ClientSourcePersistent) </s> remove assert.False(t, clients.exists(cliOldIP, ClientSourceHostsFile))
assert.True(t, clients.exists(cliNewIP, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(cliOldIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cliNewIP), ClientSourcePersistent) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients_test.go |
assert.Equal(t, clients.clientSource(ip), ClientSourceARP) | <mask> t.Run("dhcp_replaces_arp", func(t *testing.T) {
<mask> ip := netip.MustParseAddr("1.2.3.4")
<mask> ok := clients.AddHost(ip, "from_arp", ClientSourceARP)
<mask> assert.True(t, ok)
<mask> assert.True(t, clients.exists(ip, ClientSourceARP))
<mask>
<mask> ok = clients.AddHost(ip, "from_dhcp", ClientSourceDHCP)
<mask> assert.True(t, ok)
<mask> assert.True(t, clients.exists(ip, ClientSourceDHCP))
<mask> })
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove assert.True(t, clients.exists(ip, ClientSourceDHCP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceDHCP) </s> remove assert.True(t, clients.exists(ip, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceHostsFile) </s> remove assert.False(t, clients.exists(cliNoneIP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli1IP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli2IP, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(cliNoneIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cli1IP), ClientSourcePersistent)
assert.Equal(t, clients.clientSource(cli2IP), ClientSourcePersistent) </s> remove assert.False(t, clients.exists(netip.MustParseAddr("1.1.1.2"), ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(netip.MustParseAddr("1.1.1.2")), ClientSourceNone) </s> remove
return
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients_test.go |
assert.Equal(t, clients.clientSource(ip), ClientSourceDHCP) | <mask> assert.True(t, clients.exists(ip, ClientSourceARP))
<mask>
<mask> ok = clients.AddHost(ip, "from_dhcp", ClientSourceDHCP)
<mask> assert.True(t, ok)
<mask> assert.True(t, clients.exists(ip, ClientSourceDHCP))
<mask> })
<mask>
<mask> t.Run("addhost_fail", func(t *testing.T) {
<mask> ip := netip.MustParseAddr("1.1.1.1")
<mask> ok := clients.AddHost(ip, "host1", ClientSourceRDNS)
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove assert.True(t, clients.exists(ip, ClientSourceARP))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceARP) </s> remove assert.True(t, clients.exists(ip, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(ip), ClientSourceHostsFile) </s> remove assert.False(t, clients.exists(netip.MustParseAddr("1.1.1.2"), ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(netip.MustParseAddr("1.1.1.2")), ClientSourceNone) </s> remove assert.False(t, clients.exists(cliNoneIP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli1IP, ClientSourceHostsFile))
assert.True(t, clients.exists(cli2IP, ClientSourceHostsFile))
</s> add assert.Equal(t, clients.clientSource(cliNoneIP), ClientSourceNone)
assert.Equal(t, clients.clientSource(cli1IP), ClientSourcePersistent)
assert.Equal(t, clients.clientSource(cli2IP), ClientSourcePersistent) </s> remove
return
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/clients_test.go |
"github.com/AdguardTeam/golibs/errors" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // RDNS resolves clients' addresses to enrich their metadata.
<mask> type RDNS struct {
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // Exchange tries to resolve the ip in a suitable way, e.g. either as
// local or as external.
</s> add // Exchange tries to resolve the ip in a suitable way, i.e. either as local
// or as external. </s> remove ClientSourceWHOIS clientSource = iota
</s> add ClientSourceNone clientSource = iota
ClientSourceWHOIS </s> remove // rDNSNotPTRErr is returned by Exchange method when the response is not
// of PTR type.
rDNSNotPTRErr errors.Error = "the response is not a ptr"
</s> add // ErrRDNSFailed is returned by [RDNSExchanger.Exchange] if the received
// response is not a NOERROR or NXDOMAIN.
ErrRDNSFailed errors.Error = "failed to resolve ptr" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
// Default AdGuard Home reverse DNS values. | <mask> // settings.
<mask> usePrivate atomic.Bool
<mask> }
<mask>
<mask> // Default rDNS values.
<mask> const (
<mask> defaultRDNSCacheSize = 10000
<mask> defaultRDNSCacheTTL = 1 * 60 * 60
<mask> defaultRDNSIPChSize = 256
<mask> )
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove defaultRDNSCacheSize = 10000
defaultRDNSCacheTTL = 1 * 60 * 60
defaultRDNSIPChSize = 256
</s> add revDNSCacheSize = 10000
// TODO(e.burkov): Make these values configurable.
revDNSCacheTTL = 24 * 60 * 60
revDNSFailureCacheTTL = 1 * 60 * 60
revDNSQueueSize = 256 </s> remove ClientSourceWHOIS clientSource = iota
</s> add ClientSourceNone clientSource = iota
ClientSourceWHOIS </s> remove // Client sources. The order determines the priority.
</s> add // Clients information sources. The order determines the priority. </s> remove // rDNSEmptyAnswerErr is returned by Exchange method when the answer
// section of respond is empty.
rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
</s> add // ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
// section of response is either NODATA or has no PTR records.
ErrRDNSNoData errors.Error = "no ptr data in response" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
revDNSCacheSize = 10000
// TODO(e.burkov): Make these values configurable.
revDNSCacheTTL = 24 * 60 * 60
revDNSFailureCacheTTL = 1 * 60 * 60
revDNSQueueSize = 256 | <mask> }
<mask>
<mask> // Default rDNS values.
<mask> const (
<mask> defaultRDNSCacheSize = 10000
<mask> defaultRDNSCacheTTL = 1 * 60 * 60
<mask> defaultRDNSIPChSize = 256
<mask> )
<mask>
<mask> // NewRDNS creates and returns initialized RDNS.
<mask> func NewRDNS(
<mask> exchanger dnsforward.RDNSExchanger,
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // Default rDNS values.
</s> add // Default AdGuard Home reverse DNS values. </s> remove ClientSourceWHOIS clientSource = iota
</s> add ClientSourceNone clientSource = iota
ClientSourceWHOIS </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { </s> remove // Client sources. The order determines the priority.
</s> add // Clients information sources. The order determines the priority. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
MaxCount: revDNSCacheSize, | <mask> exchanger: exchanger,
<mask> clients: clients,
<mask> ipCache: cache.New(cache.Config{
<mask> EnableLRU: true,
<mask> MaxCount: defaultRDNSCacheSize,
<mask> }),
<mask> ipCh: make(chan netip.Addr, defaultRDNSIPChSize),
<mask> }
<mask>
<mask> rDNS.usePrivate.Store(usePrivate)
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove ipCh: make(chan netip.Addr, defaultRDNSIPChSize),
</s> add ipCh: make(chan netip.Addr, revDNSQueueSize), </s> remove MaxCount: defaultRDNSCacheSize,
</s> add MaxCount: revDNSCacheSize, </s> remove MaxCount: defaultRDNSCacheSize,
</s> add MaxCount: revDNSCacheSize, </s> remove _, ok = clients.findLocked(ip.String())
</s> add _, ok := clients.findLocked(ip.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
ipCh: make(chan netip.Addr, revDNSQueueSize), | <mask> ipCache: cache.New(cache.Config{
<mask> EnableLRU: true,
<mask> MaxCount: defaultRDNSCacheSize,
<mask> }),
<mask> ipCh: make(chan netip.Addr, defaultRDNSIPChSize),
<mask> }
<mask>
<mask> rDNS.usePrivate.Store(usePrivate)
<mask>
<mask> go rDNS.workerLoop()
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove MaxCount: defaultRDNSCacheSize,
</s> add MaxCount: revDNSCacheSize, </s> remove MaxCount: defaultRDNSCacheSize,
</s> add MaxCount: revDNSCacheSize, </s> remove MaxCount: defaultRDNSCacheSize,
</s> add MaxCount: revDNSCacheSize, </s> remove _, ok = clients.findLocked(ip.String())
</s> add _, ok := clients.findLocked(ip.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
return binary.BigEndian.Uint64(expire) > now | <mask> func (r *RDNS) isCached(ip netip.Addr) (ok bool) {
<mask> ipBytes := ip.AsSlice()
<mask> now := uint64(time.Now().Unix())
<mask> if expire := r.ipCache.Get(ipBytes); len(expire) != 0 {
<mask> if binary.BigEndian.Uint64(expire) > now {
<mask> return true
<mask> }
<mask> }
<mask>
<mask> // The cache entry either expired or doesn't exist.
<mask> ttl := make([]byte, 8)
<mask> binary.BigEndian.PutUint64(ttl, now+defaultRDNSCacheTTL)
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // The cache entry either expired or doesn't exist.
ttl := make([]byte, 8)
binary.BigEndian.PutUint64(ttl, now+defaultRDNSCacheTTL)
r.ipCache.Set(ipBytes, ttl)
</s> add </s> remove if r.isCached(ip) || r.clients.exists(ip, ClientSourceRDNS) {
</s> add if r.isCached(ip) || r.clients.clientSource(ip) > ClientSourceRDNS { </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { </s> remove _, ok = clients.findLocked(ip.String())
</s> add _, ok := clients.findLocked(ip.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
<mask> return true
<mask> }
<mask> }
<mask>
<mask> // The cache entry either expired or doesn't exist.
<mask> ttl := make([]byte, 8)
<mask> binary.BigEndian.PutUint64(ttl, now+defaultRDNSCacheTTL)
<mask> r.ipCache.Set(ipBytes, ttl)
<mask>
<mask> return false
<mask> }
<mask>
<mask> // Begin adds the ip to the resolving queue if it is not cached or already
<mask> // resolved.
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove if binary.BigEndian.Uint64(expire) > now {
return true
}
</s> add return binary.BigEndian.Uint64(expire) > now </s> remove // Exchange tries to resolve the ip in a suitable way, e.g. either as
// local or as external.
</s> add // Exchange tries to resolve the ip in a suitable way, i.e. either as local
// or as external. </s> remove // rDNSEmptyAnswerErr is returned by Exchange method when the answer
// section of respond is empty.
rDNSEmptyAnswerErr errors.Error = "the answer section is empty"
</s> add // ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
// section of response is either NODATA or has no PTR records.
ErrRDNSNoData errors.Error = "no ptr data in response" </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go | |
// cache caches the ip address for ttl seconds.
func (r *RDNS) cache(ip netip.Addr, ttl uint64) {
ipData := ip.AsSlice()
ttlData := [8]byte{}
binary.BigEndian.PutUint64(ttlData[:], uint64(time.Now().Unix())+ttl)
r.ipCache.Set(ipData, ttlData[:])
}
| <mask> return false
<mask> }
<mask>
<mask> // Begin adds the ip to the resolving queue if it is not cached or already
<mask> // resolved.
<mask> func (r *RDNS) Begin(ip netip.Addr) {
<mask> r.ensurePrivateCache()
<mask>
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove // The cache entry either expired or doesn't exist.
ttl := make([]byte, 8)
binary.BigEndian.PutUint64(ttl, now+defaultRDNSCacheTTL)
r.ipCache.Set(ipBytes, ttl)
</s> add </s> remove if r.isCached(ip) || r.clients.exists(ip, ClientSourceRDNS) {
</s> add if r.isCached(ip) || r.clients.clientSource(ip) > ClientSourceRDNS { </s> remove // Exchange tries to resolve the ip in a suitable way, e.g. either as
// local or as external.
</s> add // Exchange tries to resolve the ip in a suitable way, i.e. either as local
// or as external. </s> remove // exists checks if client with this IP address already exists.
func (clients *clientsContainer) exists(ip netip.Addr, source clientSource) (ok bool) {
</s> add // clientSource checks if client with this IP address already exists and returns
// the source which updated it last. It returns [ClientSourceNone] if the
// client doesn't exist.
func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource) { </s> remove // rDNSNotPTRErr is returned by Exchange method when the response is not
// of PTR type.
rDNSNotPTRErr errors.Error = "the response is not a ptr"
</s> add // ErrRDNSFailed is returned by [RDNSExchanger.Exchange] if the received
// response is not a NOERROR or NXDOMAIN.
ErrRDNSFailed errors.Error = "failed to resolve ptr" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
if r.isCached(ip) || r.clients.clientSource(ip) > ClientSourceRDNS { | <mask> // resolved.
<mask> func (r *RDNS) Begin(ip netip.Addr) {
<mask> r.ensurePrivateCache()
<mask>
<mask> if r.isCached(ip) || r.clients.exists(ip, ClientSourceRDNS) {
<mask> return
<mask> }
<mask>
<mask> select {
<mask> case r.ipCh <- ip:
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove if binary.BigEndian.Uint64(expire) > now {
return true
}
</s> add return binary.BigEndian.Uint64(expire) > now </s> remove
continue
} else if host == "" {
continue
</s> add if errors.Is(err, dnsforward.ErrRDNSFailed) {
// Cache failure for a less time.
ttl = revDNSFailureCacheTTL
} </s> remove _ = r.clients.AddHost(ip, host, ClientSourceRDNS)
</s> add r.cache(ip, ttl)
if host != "" {
_ = r.clients.AddHost(ip, host, ClientSourceRDNS)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
ttl := uint64(revDNSCacheTTL)
| <mask> func (r *RDNS) workerLoop() {
<mask> defer log.OnPanic("rdns")
<mask>
<mask> for ip := range r.ipCh {
<mask> host, err := r.exchanger.Exchange(ip.AsSlice())
<mask> if err != nil {
<mask> log.Debug("rdns: resolving %q: %s", ip, err)
<mask> if errors.Is(err, dnsforward.ErrRDNSFailed) {
<mask> // Cache failure for a less time.
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove
continue
} else if host == "" {
continue
</s> add if errors.Is(err, dnsforward.ErrRDNSFailed) {
// Cache failure for a less time.
ttl = revDNSFailureCacheTTL
} </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} </s> remove if r.isCached(ip) || r.clients.exists(ip, ClientSourceRDNS) {
</s> add if r.isCached(ip) || r.clients.clientSource(ip) > ClientSourceRDNS { </s> remove if binary.BigEndian.Uint64(expire) > now {
return true
}
</s> add return binary.BigEndian.Uint64(expire) > now | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
if errors.Is(err, dnsforward.ErrRDNSFailed) {
// Cache failure for a less time.
ttl = revDNSFailureCacheTTL
} | <mask> for ip := range r.ipCh {
<mask> host, err := r.exchanger.Exchange(ip.AsSlice())
<mask> if err != nil {
<mask> log.Debug("rdns: resolving %q: %s", ip, err)
<mask>
<mask> continue
<mask> } else if host == "" {
<mask> continue
<mask> }
<mask>
<mask> _ = r.clients.AddHost(ip, host, ClientSourceRDNS)
<mask> }
<mask> }
</s> Pull request: 4939 Client update
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939.
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic </s> remove _ = r.clients.AddHost(ip, host, ClientSourceRDNS)
</s> add r.cache(ip, ttl)
if host != "" {
_ = r.clients.AddHost(ip, host, ClientSourceRDNS)
} </s> remove if len(resp.Answer) == 0 {
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
}
ptr, ok := resp.Answer[0].(*dns.PTR)
if !ok {
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
</s> add if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
return "", fmt.Errorf(
"received %s response: %w",
dns.RcodeToString[resp.Rcode],
ErrRDNSFailed,
)
}
for _, ans := range resp.Answer {
ptr, ok := ans.(*dns.PTR)
if ok {
return strings.TrimSuffix(ptr.Ptr, "."), nil
} </s> remove
return
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ec19a85ed02e17001e06134c9d5ed2258c37ec08 | internal/home/rdns.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.