From 2e0329565fb29b2f39a7e4306313f7dd6d3b5684 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 11 May 2022 13:02:50 -0400 Subject: [PATCH] ndp: error message tidying Signed-off-by: Matt Layher --- message.go | 2 +- option.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/message.go b/message.go index 145a9ae..096d5c1 100644 --- a/message.go +++ b/message.go @@ -411,7 +411,7 @@ func (rs *RouterSolicitation) unmarshal(b []byte) error { // checkIPv6 verifies that ip is an IPv6 address. func checkIPv6(ip netip.Addr) error { if !ip.Is6() || ip.Is4In6() { - return fmt.Errorf("ndp: invalid IPv6 address: %q", ip.String()) + return fmt.Errorf("ndp: invalid IPv6 address: %q", ip) } return nil diff --git a/option.go b/option.go index b8ae14e..bc415a5 100644 --- a/option.go +++ b/option.go @@ -88,7 +88,7 @@ func (lla *LinkLayerAddress) marshal() ([]byte, error) { } if len(lla.Addr) != ethAddrLen { - return nil, fmt.Errorf("ndp: invalid link-layer address: %q", lla.Addr.String()) + return nil, fmt.Errorf("ndp: invalid link-layer address: %q", lla.Addr) } raw := &RawOption{ @@ -286,7 +286,7 @@ func (ri *RouteInformation) marshal() ([]byte, error) { // // Therefore, any prefix, when masked with its specified length, should be // identical to the prefix itself for it to be valid. - err := fmt.Errorf("ndp: invalid route information: %s/%d", ri.Prefix.String(), ri.PrefixLength) + err := fmt.Errorf("ndp: invalid route information: %s/%d", ri.Prefix, ri.PrefixLength) p := netip.PrefixFrom(ri.Prefix, int(ri.PrefixLength)) if masked := p.Masked(); ri.Prefix != masked.Addr() { return nil, err