Skip to content

dhcpd: skip empty disabled dhcpv4 config #8375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xnuminous wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −0
Open

dhcpd: skip empty disabled dhcpv4 config #8375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions internal/dhcpd/dhcpd_unix_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ func TestV4Server_badRange(t *testing.T) {
}
}

func TestV4Server_Create_disabled(t *testing.T) {
s, err := v4Create(&V4ServerConf{})

require.NoError(t, err)
assert.NotNil(t, s)
assert.False(t, s.enabled())
}

// cloneUDPAddr returns a deep copy of a.
func cloneUDPAddr(a *net.UDPAddr) (clone *net.UDPAddr) {
return &net.UDPAddr{
Expand Down
9 changes: 9 additions & 0 deletions internal/dhcpd/v4_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,15 @@ func v4Create(conf *V4ServerConf) (srv *v4Server, err error) {
ipIndex: map[netip.Addr]*dhcpsvc.Lease{},
}

if conf != nil &&
!conf.Enabled &&
!conf.GatewayIP.IsValid() &&
!conf.SubnetMask.IsValid() &&
!conf.RangeStart.IsValid() &&
!conf.RangeEnd.IsValid() {
return s, nil
}

err = conf.Validate()
if err != nil {
// TODO(a.garipov): Don't use a disabled server in other places or just
Expand Down