dhcpv4: simplify marshaling options to binary.

- Consolidate writing the option code and length to Options.Marshal
  rather than doing it in each individual option.
- Use uio in marshaling code.

1 files changed, 1 insertions, 7 deletions

diff --git a/dhcpv4/option_generic.go b/dhcpv4/option_generic.go
index 964a655..4afcfe1 100644
--- a/dhcpv4/option_generic.go
+++ b/dhcpv4/option_generic.go
@@ -29,13 +29,7 @@ func (o OptionGeneric) Code() OptionCode {
 
 // ToBytes returns a serialized generic option as a slice of bytes.
 func (o OptionGeneric) ToBytes() []byte {
-	ret := []byte{byte(o.OptionCode)}
-	if o.OptionCode == OptionEnd || o.OptionCode == OptionPad {
-		return ret
-	}
-	ret = append(ret, byte(o.Length()))
-	ret = append(ret, o.Data...)
-	return ret
+	return o.Data
 }
 
 // String returns a human-readable representation of a generic option.