dhcpv4: simplify option parsing.

option's codes and lengths were being parsed twice: once in ParseOption
and once in each option type's Parse implementation. Consolidate such
that it only happens once.

Additionally, only pass data to options that they should parse -- we
know the length before the Parse function is called, so the option only
gets to see the data it needs to see.

Also, use uio.Lexer to simplify parsing code in general. Easier to read
and reason about.

1 files changed, 1 insertions, 13 deletions

diff --git a/dhcpv4/option_class_identifier.go b/dhcpv4/option_class_identifier.go
index ae5dba2..1a49b87 100644
--- a/dhcpv4/option_class_identifier.go
+++ b/dhcpv4/option_class_identifier.go
@@ -15,19 +15,7 @@ type OptClassIdentifier struct {
 // ParseOptClassIdentifier constructs an OptClassIdentifier struct from a sequence of
 // bytes and returns it, or an error.
 func ParseOptClassIdentifier(data []byte) (*OptClassIdentifier, error) {
-	// Should at least have code and length
-	if len(data) < 2 {
-		return nil, ErrShortByteStream
-	}
-	code := OptionCode(data[0])
-	if code != OptionClassIdentifier {
-		return nil, fmt.Errorf("expected option %v, got %v instead", OptionClassIdentifier, code)
-	}
-	length := int(data[1])
-	if len(data) < 2+length {
-		return nil, ErrShortByteStream
-	}
-	return &OptClassIdentifier{Identifier: string(data[2 : 2+length])}, nil
+	return &OptClassIdentifier{Identifier: string(data)}, nil
 }
 
 // Code returns the option code.