mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-16 02:18:28 -07:00
39aeaf8910
Merge in DNS/adguard-home from 4923-gopacket-dhcp-vol.3 to master
Updates #4923.
Squashed commit of the following:
commit 1a09c436e5666a515084cd5e76cfccd67991ae5e
Merge: 95bcf0720 c3f141a0a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 28 19:38:57 2023 +0300
Merge branch 'master' into 4923-gopacket-dhcp-vol.3
commit 95bcf07206434fd451632e819926871ba8c14f08
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 28 13:19:42 2023 +0300
dhcpsvc: fix interface to match legacy version
commit 5da513ce177319f19698c5a8e1d10affaaf5e85c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 28 12:32:21 2023 +0300
dhcpsvc: make it build on 32bit
commit 37a935514b1cebdc817cdcd5ec3562baeafbc42d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 27 19:39:35 2023 +0300
dhcpd: fix v6 as well
commit 03b5454b04c4fdb3fe928d661562883dc3e09d81
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 27 19:34:17 2023 +0300
dhcpsvc: imp code, docs
commit 91a0e451f78fba64578cc541f7ba66579c31d388
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Sep 22 15:25:58 2023 +0300
dhcpsvc: imp filing
commit 57c91e1194caa00a69e62b6655b1b4e38b69b89f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Sep 22 15:23:02 2023 +0300
dhcpsvc: imp code
commit d86be56efbfc121c9fe2c5ecef992b4523e04d57
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 14 12:24:39 2023 +0300
dhcpsvc: imp code, docs
commit c9ef29057e9e378779d1a7938ad13b6eebda8f50
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 13 17:53:55 2023 +0300
dhcpsvc: add constructor, validations, tests
commit f2533ed64e4ef439603b9cdf9596f8b0c4a87cf1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 12 23:05:42 2023 +0500
WIP
93 lines
2.1 KiB
Go
93 lines
2.1 KiB
Go
package dhcpsvc
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"golang.org/x/exp/maps"
|
|
"golang.org/x/exp/slices"
|
|
)
|
|
|
|
// Config is the configuration for the DHCP service.
|
|
type Config struct {
|
|
// Interfaces stores configurations of DHCP server specific for the network
|
|
// interface identified by its name.
|
|
Interfaces map[string]*InterfaceConfig
|
|
|
|
// LocalDomainName is the top-level domain name to use for resolving DHCP
|
|
// clients' hostnames.
|
|
LocalDomainName string
|
|
|
|
// ICMPTimeout is the timeout for checking another DHCP server's presence.
|
|
ICMPTimeout time.Duration
|
|
|
|
// Enabled is the state of the service, whether it is enabled or not.
|
|
Enabled bool
|
|
}
|
|
|
|
// InterfaceConfig is the configuration of a single DHCP interface.
|
|
type InterfaceConfig struct {
|
|
// IPv4 is the configuration of DHCP protocol for IPv4.
|
|
IPv4 *IPv4Config
|
|
|
|
// IPv6 is the configuration of DHCP protocol for IPv6.
|
|
IPv6 *IPv6Config
|
|
}
|
|
|
|
// Validate returns an error in conf if any.
|
|
func (conf *Config) Validate() (err error) {
|
|
switch {
|
|
case conf == nil:
|
|
return errNilConfig
|
|
case !conf.Enabled:
|
|
return nil
|
|
case conf.ICMPTimeout < 0:
|
|
return fmt.Errorf("icmp timeout %s must be non-negative", conf.ICMPTimeout)
|
|
}
|
|
|
|
err = netutil.ValidateDomainName(conf.LocalDomainName)
|
|
if err != nil {
|
|
// Don't wrap the error since it's informative enough as is.
|
|
return err
|
|
}
|
|
|
|
if len(conf.Interfaces) == 0 {
|
|
return errNoInterfaces
|
|
}
|
|
|
|
ifaces := maps.Keys(conf.Interfaces)
|
|
slices.Sort(ifaces)
|
|
|
|
for _, iface := range ifaces {
|
|
if err = conf.Interfaces[iface].validate(); err != nil {
|
|
return fmt.Errorf("interface %q: %w", iface, err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// mustBeErr returns an error that indicates that valName must be as must
|
|
// describes.
|
|
func mustBeErr(valName, must string, val fmt.Stringer) (err error) {
|
|
return fmt.Errorf("%s %s must %s", valName, val, must)
|
|
}
|
|
|
|
// validate returns an error in ic, if any.
|
|
func (ic *InterfaceConfig) validate() (err error) {
|
|
if ic == nil {
|
|
return errNilConfig
|
|
}
|
|
|
|
if err = ic.IPv4.validate(); err != nil {
|
|
return fmt.Errorf("ipv4: %w", err)
|
|
}
|
|
|
|
if err = ic.IPv6.validate(); err != nil {
|
|
return fmt.Errorf("ipv6: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|