Skip to content

Commit 576a251

Browse files
sukunrtsukunrt
committed
upgrade go-multiaddr
1 parent 8f46fc8 commit 576a251

File tree

6 files changed

+15
-14
lines changed

6 files changed

+15
-14
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/minio/sha256-simd v1.0.1
3636
github.com/mr-tron/base58 v1.2.0
3737
github.com/multiformats/go-base32 v0.1.0
38-
github.com/multiformats/go-multiaddr v0.11.0
38+
github.com/multiformats/go-multiaddr v0.12.0
3939
github.com/multiformats/go-multiaddr-dns v0.3.1
4040
github.com/multiformats/go-multiaddr-fmt v0.1.0
4141
github.com/multiformats/go-multibase v0.2.0

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9
351351
github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
352352
github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
353353
github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
354-
github.com/multiformats/go-multiaddr v0.11.0 h1:XqGyJ8ufbCE0HmTDwx2kPdsrQ36AGPZNZX6s6xfJH10=
355-
github.com/multiformats/go-multiaddr v0.11.0/go.mod h1:gWUm0QLR4thQ6+ZF6SXUw8YjtwQSPapICM+NmCkxHSM=
354+
github.com/multiformats/go-multiaddr v0.12.0 h1:1QlibTFkoXJuDjjYsMHhE73TnzJQl8FSWatk/0gxGzE=
355+
github.com/multiformats/go-multiaddr v0.12.0/go.mod h1:WmZXgObOQOYp9r3cslLlppkrz1FYSHmE834dfz/lWu8=
356356
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
357357
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
358358
github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=

‎p2p/protocol/identify/id.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ func filterAddrs(addrs []ma.Multiaddr, remote ma.Multiaddr) []ma.Multiaddr {
996996
return addrs
997997
}
998998
if manet.IsPrivateAddr(remote) {
999-
return ma.FilterAddrs(addrs, func(a ma.Multiaddr) bool { return !manet.IsThinWaist(a) || !manet.IsIPLoopback(a) })
999+
return ma.FilterAddrs(addrs, func(a ma.Multiaddr) bool { return !manet.IsIPLoopback(a) })
10001000
}
1001-
return ma.FilterAddrs(addrs, func(a ma.Multiaddr) bool { return !manet.IsThinWaist(a) || manet.IsPublicAddr(a) })
1001+
return ma.FilterAddrs(addrs, manet.IsPublicAddr)
10021002
}

‎p2p/protocol/identify/id_glass_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,30 @@ func TestIncomingAddrFilter(t *testing.T) {
179179
lhAddr := ma.StringCast("/ip4/127.0.0.1/udp/123/quic-v1")
180180
privAddr := ma.StringCast("/ip4/192.168.1.101/tcp/123")
181181
pubAddr := ma.StringCast("/ip6/2::1/udp/123/quic-v1")
182-
dnsAddr := ma.StringCast("/dns/example.com/udp/123/quic-v1")
182+
pubDNSAddr := ma.StringCast("/dns/example.com/udp/123/quic-v1")
183+
privDNSAddr := ma.StringCast("/dns4/localhost/udp/123/quic-v1")
183184
tests := []struct {
184185
output []ma.Multiaddr
185186
remote ma.Multiaddr
186187
}{
187188
{
188-
output: []ma.Multiaddr{lhAddr, privAddr, pubAddr, dnsAddr},
189+
output: []ma.Multiaddr{lhAddr, privAddr, pubAddr, pubDNSAddr, privDNSAddr},
189190
remote: lhAddr,
190191
},
191192
{
192-
output: []ma.Multiaddr{privAddr, pubAddr, dnsAddr},
193+
output: []ma.Multiaddr{privAddr, pubAddr, pubDNSAddr, privDNSAddr},
193194
remote: privAddr,
194195
},
195196
{
196-
output: []ma.Multiaddr{pubAddr, dnsAddr},
197+
output: []ma.Multiaddr{pubAddr, pubDNSAddr},
197198
remote: pubAddr,
198199
},
199200
}
200201
for _, tc := range tests {
201202
t.Run(fmt.Sprintf("remote:%s", tc.remote), func(t *testing.T) {
202-
input := []ma.Multiaddr{lhAddr, privAddr, pubAddr, dnsAddr}
203+
input := []ma.Multiaddr{lhAddr, privAddr, pubAddr, pubDNSAddr, privDNSAddr}
203204
got := filterAddrs(input, tc.remote)
204-
require.ElementsMatch(t, tc.output, got)
205+
require.ElementsMatch(t, tc.output, got, "%s\n%s", tc.output, got)
205206
})
206207
}
207208
}

‎test-plans/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
require (
66
github.com/go-redis/redis/v8 v8.11.5
77
github.com/libp2p/go-libp2p v0.0.0
8-
github.com/multiformats/go-multiaddr v0.11.0
8+
github.com/multiformats/go-multiaddr v0.12.0
99
)
1010

1111
require (

‎test-plans/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9
200200
github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
201201
github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
202202
github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
203-
github.com/multiformats/go-multiaddr v0.11.0 h1:XqGyJ8ufbCE0HmTDwx2kPdsrQ36AGPZNZX6s6xfJH10=
204-
github.com/multiformats/go-multiaddr v0.11.0/go.mod h1:gWUm0QLR4thQ6+ZF6SXUw8YjtwQSPapICM+NmCkxHSM=
203+
github.com/multiformats/go-multiaddr v0.12.0 h1:1QlibTFkoXJuDjjYsMHhE73TnzJQl8FSWatk/0gxGzE=
204+
github.com/multiformats/go-multiaddr v0.12.0/go.mod h1:WmZXgObOQOYp9r3cslLlppkrz1FYSHmE834dfz/lWu8=
205205
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
206206
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
207207
github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=

0 commit comments

Comments
 (0)