Add more specific dhcpv4 options (#17)

Added several DHCPv4 options

1 files changed, 20 insertions, 41 deletions

diff --git a/dhcpv4/bsdp/bsdp.go b/dhcpv4/bsdp/bsdp.go
index f18fdce..e93b654 100644
--- a/dhcpv4/bsdp/bsdp.go
+++ b/dhcpv4/bsdp/bsdp.go
@@ -213,36 +213,25 @@ func NewInformListForInterface(iface string, replyPort uint16) (*dhcpv4.DHCPv4,
 	for _, opt := range vendorOpts {
 		vendorOptsBytes = append(vendorOptsBytes, opt.ToBytes()...)
 	}
-	d.AddOption(dhcpv4.OptionGeneric{
+	d.AddOption(&dhcpv4.OptionGeneric{
 		OptionCode: dhcpv4.OptionVendorSpecificInformation,
 		Data:       vendorOptsBytes,
 	})
 
-	d.AddOption(dhcpv4.OptionGeneric{
-		OptionCode: dhcpv4.OptionParameterRequestList,
-		Data: []byte{
-			byte(dhcpv4.OptionVendorSpecificInformation),
-			byte(dhcpv4.OptionClassIdentifier),
+	d.AddOption(&dhcpv4.OptParameterRequestList{
+		RequestedOpts: []dhcpv4.OptionCode{
+			dhcpv4.OptionVendorSpecificInformation,
+			dhcpv4.OptionClassIdentifier,
 		},
 	})
-
-	u16 := make([]byte, 2)
-	binary.BigEndian.PutUint16(u16, MaxDHCPMessageSize)
-	d.AddOption(dhcpv4.OptionGeneric{
-		OptionCode: dhcpv4.OptionMaximumDHCPMessageSize,
-		Data:       u16,
-	})
+	d.AddOption(&dhcpv4.OptMaximumDHCPMessageSize{Size: MaxDHCPMessageSize})
 
 	vendorClassID, err := makeVendorClassIdentifier()
 	if err != nil {
 		return nil, err
 	}
-	d.AddOption(dhcpv4.OptionGeneric{
-		OptionCode: dhcpv4.OptionClassIdentifier,
-		Data:       []byte(vendorClassID),
-	})
-
-	d.AddOption(dhcpv4.OptionGeneric{OptionCode: dhcpv4.OptionEnd})
+	d.AddOption(&dhcpv4.OptClassIdentifier{Identifier: vendorClassID})
+	d.AddOption(&dhcpv4.OptionGeneric{OptionCode: dhcpv4.OptionEnd})
 	return d, nil
 }
 
@@ -296,10 +285,7 @@ func InformSelectForAck(ack dhcpv4.DHCPv4, replyPort uint16, selectedImage BootI
 	if serverIP.To4() == nil {
 		return nil, fmt.Errorf("could not parse server identifier from ACK")
 	}
-	vendorOpts = append(vendorOpts, dhcpv4.OptionGeneric{
-		OptionCode: OptionServerIdentifier,
-		Data:       serverIP,
-	})
+	vendorOpts = append(vendorOpts, &dhcpv4.OptServerIdentifier{ServerID: serverIP})
 
 	// Validate replyPort if requested.
 	if needsReplyPort(replyPort) {
@@ -313,32 +299,25 @@ func InformSelectForAck(ack dhcpv4.DHCPv4, replyPort uint16, selectedImage BootI
 	if err != nil {
 		return nil, err
 	}
-	d.AddOption(dhcpv4.OptionGeneric{
-		OptionCode: dhcpv4.OptionClassIdentifier,
-		Data:       []byte(vendorClassID),
-	})
-	d.AddOption(dhcpv4.OptionGeneric{
-		OptionCode: dhcpv4.OptionParameterRequestList,
-		Data: []byte{
-			byte(dhcpv4.OptionSubnetMask),
-			byte(dhcpv4.OptionRouter),
-			byte(dhcpv4.OptionBootfileName),
-			byte(dhcpv4.OptionVendorSpecificInformation),
-			byte(dhcpv4.OptionClassIdentifier),
+	d.AddOption(&dhcpv4.OptClassIdentifier{Identifier: vendorClassID})
+	d.AddOption(&dhcpv4.OptParameterRequestList{
+		RequestedOpts: []dhcpv4.OptionCode{
+			dhcpv4.OptionSubnetMask,
+			dhcpv4.OptionRouter,
+			dhcpv4.OptionBootfileName,
+			dhcpv4.OptionVendorSpecificInformation,
+			dhcpv4.OptionClassIdentifier,
 		},
 	})
-	d.AddOption(dhcpv4.OptionGeneric{
-		OptionCode: dhcpv4.OptionDHCPMessageType,
-		Data:       []byte{byte(dhcpv4.MessageTypeInform)},
-	})
+	d.AddOption(&dhcpv4.OptMessageType{MessageType: dhcpv4.MessageTypeInform})
 	var vendorOptsBytes []byte
 	for _, opt := range vendorOpts {
 		vendorOptsBytes = append(vendorOptsBytes, opt.ToBytes()...)
 	}
-	d.AddOption(dhcpv4.OptionGeneric{
+	d.AddOption(&dhcpv4.OptionGeneric{
 		OptionCode: dhcpv4.OptionVendorSpecificInformation,
 		Data:       vendorOptsBytes,
 	})
-	d.AddOption(dhcpv4.OptionGeneric{OptionCode: dhcpv4.OptionEnd})
+	d.AddOption(&dhcpv4.OptionGeneric{OptionCode: dhcpv4.OptionEnd})
 	return d, nil
 }