From 6a0950fe9e07d442698668c07472a76936cee576 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Tue, 21 Dec 2021 12:10:08 +0400 Subject: [PATCH] rename AddrOverNonLocalIP to IsIpv6LinkLocal --- net/ip.go | 4 ++-- net/resolve.go | 2 +- net/resolve_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ip.go b/net/ip.go index be26fc7..fab5ee5 100644 --- a/net/ip.go +++ b/net/ip.go @@ -95,8 +95,8 @@ func IsIPUnspecified(m ma.Multiaddr) bool { return net.IP(c.RawValue()).IsUnspecified() } -// AddrOverNonLocalIP returns whether the addr uses a non-local ip link -func AddrOverNonLocalIP(a ma.Multiaddr) bool { +// IsIpv6LinkLocal returns whether the addr uses a non-local ip link +func IsIpv6LinkLocal(a ma.Multiaddr) bool { split := ma.Split(a) if len(split) < 1 { return false diff --git a/net/resolve.go b/net/resolve.go index 2879929..d9d0a4d 100644 --- a/net/resolve.go +++ b/net/resolve.go @@ -74,7 +74,7 @@ func interfaceAddresses() ([]ma.Multiaddr, error) { var out []ma.Multiaddr for _, a := range maddrs { - if !AddrOverNonLocalIP(a) { + if !IsIpv6LinkLocal(a) { continue } out = append(out, a) diff --git a/net/resolve_test.go b/net/resolve_test.go index 08fab28..f2472f8 100644 --- a/net/resolve_test.go +++ b/net/resolve_test.go @@ -67,9 +67,9 @@ func TestAddrOverNonLocalIP(t *testing.T) { newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/utp"), } for _, addr := range bad { - require.Falsef(t, AddrOverNonLocalIP(addr), "%s is a link local addr", addr) + require.Falsef(t, IsIpv6LinkLocal(addr), "%s is a link local addr", addr) } for _, addr := range good { - require.Truef(t, AddrOverNonLocalIP(addr), "%s is not a link local addr", addr) + require.Truef(t, IsIpv6LinkLocal(addr), "%s is not a link local addr", addr) } }