diff options
| author | Christopher Koch <chrisko@google.com> | 2018-12-28 20:19:14 -0800 |
|---|---|---|
| committer | insomniac <insomniacslk@users.noreply.github.com> | 2019-01-10 23:01:22 +0000 |
| commit | e87114a6e449d7a2e458b5529923e5668dfa3a11 (patch) | |
| tree | 7c5ec350c8eb859400a159b881081ffe0dbd4ef0 /dhcpv4/option_server_identifier_test.go | |
| parent | 108ed92e1c9901936541020bc3214533acce77bb (diff) | |
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.
Diffstat (limited to 'dhcpv4/option_server_identifier_test.go')
| -rw-r--r-- | dhcpv4/option_server_identifier_test.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/dhcpv4/option_server_identifier_test.go b/dhcpv4/option_server_identifier_test.go index 2951ebb..4a85469 100644 --- a/dhcpv4/option_server_identifier_test.go +++ b/dhcpv4/option_server_identifier_test.go @@ -29,16 +29,10 @@ func TestParseOptServerIdentifier(t *testing.T) { o, err = ParseOptServerIdentifier([]byte{}) require.Error(t, err, "empty byte stream") - o, err = ParseOptServerIdentifier([]byte{54, 4, 192}) - require.Error(t, err, "short byte stream") - - o, err = ParseOptServerIdentifier([]byte{54, 3, 192, 168, 0, 1}) + o, err = ParseOptServerIdentifier([]byte{192, 168, 0}) require.Error(t, err, "wrong IP length") - o, err = ParseOptServerIdentifier([]byte{53, 4, 192, 168, 1}) - require.Error(t, err, "wrong option code") - - o, err = ParseOptServerIdentifier([]byte{54, 4, 192, 168, 0, 1}) + o, err = ParseOptServerIdentifier([]byte{192, 168, 0, 1}) require.NoError(t, err) require.Equal(t, net.IP{192, 168, 0, 1}, o.ServerID) } |