From 79aba137cf3ea8e0c1c980cad412cc034e145c0e Mon Sep 17 00:00:00 2001 From: Hu Jun Date: Sat, 5 Sep 2020 19:54:16 -0700 Subject: - restore OptionGeneric.String() - add raiValue in option_relay_agent_information.go to implement fmt.Stringer - change test cases accordingly Signed-off-by: Hu Jun --- dhcpv4/option_relay_agent_information.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'dhcpv4/option_relay_agent_information.go') diff --git a/dhcpv4/option_relay_agent_information.go b/dhcpv4/option_relay_agent_information.go index a6a2c34..b2e84d8 100644 --- a/dhcpv4/option_relay_agent_information.go +++ b/dhcpv4/option_relay_agent_information.go @@ -4,6 +4,14 @@ import ( "fmt" ) +type raiValue struct { + val []byte +} + +func (rv raiValue) String() string { + return fmt.Sprintf("%s (%v)", string([]byte(rv.val)), rv.val) +} + // RelayOptions is like Options, but stringifies using the Relay Agent Specific // option space. type RelayOptions struct { @@ -12,7 +20,7 @@ type RelayOptions struct { var relayHumanizer = OptionHumanizer{ ValueHumanizer: func(code OptionCode, data []byte) fmt.Stringer { - return OptionGeneric{data} + return raiValue{val: data} }, CodeHumanizer: func(c uint8) OptionCode { return raiSubOptionCode(c) -- cgit v1.2.3