Merge pull request #546 from Bogdan-Denisenko/remove-padding-check

Remove zero padding check

Author: pmazzini

dhcpv4/options.go

@@ -21,11 +21,6 @@ var (
 	// ErrZeroLengthByteStream is an error that is thrown any time a zero-length
 	// byte stream is encountered.
 	ErrZeroLengthByteStream = errors.New("zero-length byte stream")
-
-	// ErrInvalidOptions is returned when invalid options data is
-	// encountered during parsing. The data could report an incorrect
-	// length or have trailing bytes which are not part of the option.
-	ErrInvalidOptions = errors.New("invalid options data")
 )
 
 // OptionValue is an interface that all DHCP v4 options adhere to.
@@ -161,14 +156,6 @@ func (o Options) fromBytesCheckEnd(data []byte, checkEndOption bool) error {
 		return io.ErrUnexpectedEOF
 	}
 
-	// Any bytes left must be padding.
-	var pad uint8
-	for buf.Len() >= 1 {
-		pad = buf.Read8()
-		if pad != optPad && pad != optEnd {
-			return ErrInvalidOptions
-		}
-	}
 	return nil
 }
 

dhcpv4/options_test.go

@@ -255,9 +255,9 @@ func TestOptionsUnmarshal(t *testing.T) {
 			wantError: true,
 		},
 		{
-			// Option present after the End is a nono.
-			input:     []byte{byte(OptionEnd), 3},
-			wantError: true,
+			// Option present after the End.
+			input: []byte{byte(OptionEnd), 3},
+			want:  Options{},
 		},
 		{
 			input: []byte{byte(OptionEnd)},