feat: Add next-server and filename instructions to dhcpdd

Author: pojntfx

cmd/dhcpdctl/cmd/apply.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"context"
 	"fmt"
+
 	"github.com/ghodss/yaml"
 	constants "github.com/pojntfx/go-isc-dhcp/cmd"
 	goISCDHCP "github.com/pojntfx/go-isc-dhcp/pkg/proto/generated"
@@ -74,6 +75,8 @@ func init() {
   {
     "netmask": "255.255.255.0",
     "network": "192.168.1.0",
+    "nextServer": "192.168.1.1",
+    "filename": "undionly.kpxe",
     "range": {
       "start": "192.168.1.10",
       "end": "192.168.1.100"

pkg/proto/dhcpd.proto

@@ -18,7 +18,9 @@ message DHCPD {
 message Subnet {
   string Network = 1;
   string Netmask = 2;
-  Range Range = 3;
+  string NextServer = 3;
+  string Filename = 4;
+  Range Range = 5;
 }
 
 message Range {

pkg/proto/generated/dhcpd.pb.go

@@ -27,8 +27,10 @@ func (m *DHCPDManager) getReplyDHCPDManagerFromDHCPDManaged(id string, DHCPD *wo
 	var subnetsForReply []*goISCDHCP.Subnet
 	for _, subnet := range DHCPD.Subnets {
 		subnetForReply := &goISCDHCP.Subnet{
-			Network: subnet.Network,
-			Netmask: subnet.Netmask,
+			Network:    subnet.Network,
+			Netmask:    subnet.Netmask,
+			NextServer: subnet.NextServer,
+			Filename:   subnet.Filename,
 			Range: &goISCDHCP.Range{
 				Start: subnet.Range.Start,
 				End:   subnet.Range.End,
@@ -53,8 +55,10 @@ func (m *DHCPDManager) Create(_ context.Context, args *goISCDHCP.DHCPD) (*goISCD
 	var subnetsForWorker []workers.Subnet
 	for _, subnet := range subnets {
 		subnetsForWorker = append(subnetsForWorker, workers.Subnet{
-			Network: subnet.GetNetwork(),
-			Netmask: subnet.GetNetmask(),
+			Network:    subnet.GetNetwork(),
+			Netmask:    subnet.GetNetmask(),
+			NextServer: subnet.GetNextServer(),
+			Filename:   subnet.GetFilename(),
 			Range: workers.Range{
 				Start: subnet.GetRange().GetStart(),
 				End:   subnet.GetRange().GetEnd(),

pkg/svc/dhcpd/dhcpd.go

@@ -2,11 +2,12 @@ package workers
 
 import (
 	"fmt"
-	"github.com/pojntfx/go-isc-dhcp/pkg/utils"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"syscall"
+
+	"github.com/pojntfx/go-isc-dhcp/pkg/utils"
 )
 
 // DHCPD is a dhcp server.
@@ -23,9 +24,11 @@ type DHCPD struct {
 
 // Subnet is a dhcp subnet.
 type Subnet struct {
-	Network string
-	Netmask string
-	Range   Range
+	Network    string
+	Netmask    string
+	NextServer string
+	Filename   string
+	Range      Range
 }
 
 // Range is a range in which IP address should be given out.
@@ -36,15 +39,21 @@ type Range struct {
 
 // Configure configures the dhcp server.
 func (d *DHCPD) Configure() error {
-	var configFileContent string
+	configFileContent := ""
 	for _, subnet := range d.Subnets {
-		header := fmt.Sprintf("subnet %s netmask %s {", subnet.Network, subnet.Netmask)
+		configFileContent += fmt.Sprintf("subnet %s netmask %s {\n", subnet.Network, subnet.Netmask)
+
+		configFileContent += fmt.Sprintf("\trange %s %s;\n", subnet.Range.Start, subnet.Range.End)
 
-		ranges := fmt.Sprintf("range %s %s;", subnet.Range.Start, subnet.Range.End)
+		if subnet.NextServer != "" {
+			configFileContent += fmt.Sprintf("\tnext-server %s;\n", subnet.NextServer)
+		}
 
-		footer := "}"
+		if subnet.Filename != "" {
+			configFileContent += fmt.Sprintf("\tfilename \"%s\";\n", subnet.Filename)
+		}
 
-		configFileContent += fmt.Sprintf("%s\n\t%s\n%s\n", header, ranges, footer)
+		configFileContent += "}\n"
 	}
 	if err := os.MkdirAll(d.StateDir, os.ModePerm); err != nil {
 		return err