From 41068aa69ccdf2e558d406f150743ffc98d01aa6 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sun, 30 Sep 2018 16:41:00 -0700 Subject: [PATCH] correctly format ip4-in-6 addresses fixes part one of #77 --- multiaddr_test.go | 1 + transcoders.go | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/multiaddr_test.go b/multiaddr_test.go index 2cb0cb7..8c64a79 100644 --- a/multiaddr_test.go +++ b/multiaddr_test.go @@ -451,6 +451,7 @@ func TestBinaryRepresentation(t *testing.T) { func TestRoundTrip(t *testing.T) { for _, s := range []string{ "/unix/a/b/c/d", + "/ip6/::ffff:127.0.0.1/tcp/111", "/ip4/127.0.0.1/tcp/123", "/ip4/127.0.0.1/udp/123", "/ip4/127.0.0.1/udp/123/ip6/::", diff --git a/transcoders.go b/transcoders.go index 3aef4a2..86ce200 100644 --- a/transcoders.go +++ b/transcoders.go @@ -46,8 +46,8 @@ func (t twrp) ValidateBytes(b []byte) error { return t.validbyte(b) } -var TranscoderIP4 = NewTranscoderFromFunctions(ip4StB, ipBtS, nil) -var TranscoderIP6 = NewTranscoderFromFunctions(ip6StB, ipBtS, nil) +var TranscoderIP4 = NewTranscoderFromFunctions(ip4StB, ip4BtS, nil) +var TranscoderIP6 = NewTranscoderFromFunctions(ip6StB, ip6BtS, nil) var TranscoderIP6Zone = NewTranscoderFromFunctions(ip6zoneStB, ip6zoneBtS, ip6zoneVal) func ip4StB(s string) ([]byte, error) { @@ -88,7 +88,16 @@ func ip6StB(s string) ([]byte, error) { return i, nil } -func ipBtS(b []byte) (string, error) { +func ip6BtS(b []byte) (string, error) { + ip := net.IP(b) + if ip4 := ip.To4(); ip4 != nil { + // Go fails to prepend the `::ffff:` part. + return "::ffff:" + ip4.String(), nil + } + return ip.String(), nil +} + +func ip4BtS(b []byte) (string, error) { return net.IP(b).String(), nil }