From 03b5454b04c4fdb3fe928d661562883dc3e09d81 Mon Sep 17 00:00:00 2001
From: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed, 27 Sep 2023 19:34:17 +0300
Subject: [PATCH] dhcpsvc: imp code, docs

---
 internal/dhcpd/iprange.go   |  2 --
 internal/dhcpsvc/dhcpsvc.go | 10 +++++-----
 internal/dhcpsvc/iprange.go |  6 ++++--
 internal/dhcpsvc/server.go  |  4 +++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/internal/dhcpd/iprange.go b/internal/dhcpd/iprange.go
index 71d67c2a616..0f40127768e 100644
--- a/internal/dhcpd/iprange.go
+++ b/internal/dhcpd/iprange.go
@@ -76,8 +76,6 @@ type ipPredicate func(ip net.IP) (ok bool)
 
 // find finds the first IP address in r for which p returns true.  ip is in the
 // 16-byte form.
-//
-// TODO(e.burkov):  Use.
 func (r *ipRange) find(p ipPredicate) (ip net.IP) {
 	if r == nil {
 		return nil
diff --git a/internal/dhcpsvc/dhcpsvc.go b/internal/dhcpsvc/dhcpsvc.go
index c4ff4fed822..060854b898a 100644
--- a/internal/dhcpsvc/dhcpsvc.go
+++ b/internal/dhcpsvc/dhcpsvc.go
@@ -63,9 +63,9 @@ type Interface interface {
 	// invalid or already exists.
 	AddLease(l *Lease) (err error)
 
-	// EditLease changes an existing DHCP lease.  It returns an error if there
-	// is no lease equal to old or if new is invalid or already exists.
-	EditLease(old, new *Lease) (err error)
+	// UpdateStaticLease changes an existing DHCP lease.  It returns an error if
+	// there is no lease equal to old or if new is invalid or already exists.
+	UpdateStaticLease(old, new *Lease) (err error)
 
 	// RemoveLease removes an existing DHCP lease.  It returns an error if there
 	// is no lease equal to l.
@@ -111,8 +111,8 @@ func (Empty) Leases() (leases []*Lease) { return nil }
 // AddLease implements the [Interface] interface for Empty.
 func (Empty) AddLease(_ *Lease) (err error) { return nil }
 
-// EditLease implements the [Interface] interface for Empty.
-func (Empty) EditLease(_, _ *Lease) (err error) { return nil }
+// UpdateStaticLease implements the [Interface] interface for Empty.
+func (Empty) UpdateStaticLease(_, _ *Lease) (err error) { return nil }
 
 // RemoveLease implements the [Interface] interface for Empty.
 func (Empty) RemoveLease(_ *Lease) (err error) { return nil }
diff --git a/internal/dhcpsvc/iprange.go b/internal/dhcpsvc/iprange.go
index 9e8f19897c2..fdc7b99f544 100644
--- a/internal/dhcpsvc/iprange.go
+++ b/internal/dhcpsvc/iprange.go
@@ -10,8 +10,8 @@ import (
 	"github.com/AdguardTeam/golibs/errors"
 )
 
-// ipRange is an inclusive range of IP addresses.  A nil range is a range that
-// doesn't contain any IP addresses.
+// ipRange is an inclusive range of IP addresses.  A zero range doesn't contain
+// any IP addresses.
 //
 // It is safe for concurrent use.
 type ipRange struct {
@@ -65,6 +65,8 @@ type ipPredicate func(ip netip.Addr) (ok bool)
 
 // find finds the first IP address in r for which p returns true.  It returns an
 // empty [netip.Addr] if there are no addresses that satisfy p.
+//
+// TODO(e.burkov):  Use.
 func (r ipRange) find(p ipPredicate) (ip netip.Addr) {
 	for ip = r.start; !r.end.Less(ip); ip = ip.Next() {
 		if p(ip) {
diff --git a/internal/dhcpsvc/server.go b/internal/dhcpsvc/server.go
index dcad2b1d791..bd0571fdb86 100644
--- a/internal/dhcpsvc/server.go
+++ b/internal/dhcpsvc/server.go
@@ -31,9 +31,11 @@ type DHCPServer struct {
 
 // New creates a new DHCP server with the given configuration.  It returns an
 // error if the given configuration can't be used.
+//
+// TODO(e.burkov):  Use.
 func New(conf *Config) (srv *DHCPServer, err error) {
 	if !conf.Enabled {
-		// TODO(e.burkov):  !! return Empty?
+		// TODO(e.burkov):  Perhaps return [Empty]?
 		return nil, nil
 	}