From b6e3b62ed4e7bc17fc3fdd2f4faa940a7f4334c2 Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Thu, 6 Apr 2023 15:20:42 +0300 Subject: [PATCH] dhcpd: imp naming --- internal/dhcpd/http_unix.go | 8 ++++---- internal/dhcpd/v4_unix.go | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/dhcpd/http_unix.go b/internal/dhcpd/http_unix.go index 2c653bd7..9eb4eb47 100644 --- a/internal/dhcpd/http_unix.go +++ b/internal/dhcpd/http_unix.go @@ -88,8 +88,8 @@ func leasesToStatic(leases []*Lease) (static []*leaseStatic) { return static } -// Unwrap converts leaseStatic to Lease or returns error. -func (l *leaseStatic) Unwrap() (lease *Lease, err error) { +// toLease converts leaseStatic to Lease or returns error. +func (l *leaseStatic) toLease() (lease *Lease, err error) { addr, err := net.ParseMAC(l.HWAddr) if err != nil { return nil, fmt.Errorf("couldn't parse MAC address: %w", err) @@ -577,7 +577,7 @@ func (s *server) handleDHCPAddStaticLease(w http.ResponseWriter, r *http.Request srv = s.srv6 } - lease, err := l.Unwrap() + lease, err := l.toLease() if err != nil { aghhttp.Error(r, w, http.StatusBadRequest, "parsing: %s", err) @@ -616,7 +616,7 @@ func (s *server) handleDHCPRemoveStaticLease(w http.ResponseWriter, r *http.Requ srv = s.srv6 } - lease, err := l.Unwrap() + lease, err := l.toLease() if err != nil { aghhttp.Error(r, w, http.StatusBadRequest, "parsing: %s", err) diff --git a/internal/dhcpd/v4_unix.go b/internal/dhcpd/v4_unix.go index 188e06f4..4ac46db6 100644 --- a/internal/dhcpd/v4_unix.go +++ b/internal/dhcpd/v4_unix.go @@ -259,8 +259,10 @@ func (s *v4Server) rmLeaseByIndex(i int) { // Return error if a static lease is found func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { for i, l := range s.leases { + isStatic := l.IsStatic + if bytes.Equal(l.HWAddr, lease.HWAddr) || l.IP == lease.IP { - if l.IsStatic { + if isStatic { return errors.Error("static lease already exists") } @@ -272,7 +274,7 @@ func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { l = s.leases[i] } - if !l.IsStatic && l.Hostname == lease.Hostname { + if !isStatic && l.Hostname == lease.Hostname { l.Hostname = "" } }