Skip to content

Commit 5c39a31

Browse files
authored
Merge pull request #152 from multiformats/fix/export-register
fix(net): export new net.Addr conversion registration functions
2 parents 32974f6 + 1617759 commit 5c39a31

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

net/registry.go

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ type ToNetAddrFunc func(ma ma.Multiaddr) (net.Addr, error)
1717
var defaultCodecs = NewCodecMap()
1818

1919
func init() {
20-
defaultCodecs.RegisterFromNetAddr(parseTCPNetAddr, "tcp", "tcp4", "tcp6")
21-
defaultCodecs.RegisterFromNetAddr(parseUDPNetAddr, "udp", "udp4", "udp6")
22-
defaultCodecs.RegisterFromNetAddr(parseIPNetAddr, "ip", "ip4", "ip6")
23-
defaultCodecs.RegisterFromNetAddr(parseIPPlusNetAddr, "ip+net")
24-
defaultCodecs.RegisterFromNetAddr(parseUnixNetAddr, "unix")
20+
RegisterFromNetAddr(parseTCPNetAddr, "tcp", "tcp4", "tcp6")
21+
RegisterFromNetAddr(parseUDPNetAddr, "udp", "udp4", "udp6")
22+
RegisterFromNetAddr(parseIPNetAddr, "ip", "ip4", "ip6")
23+
RegisterFromNetAddr(parseIPPlusNetAddr, "ip+net")
24+
RegisterFromNetAddr(parseUnixNetAddr, "unix")
2525

26-
defaultCodecs.RegisterToNetAddr(parseBasicNetMaddr, "tcp", "udp", "ip6", "ip4", "unix")
26+
RegisterToNetAddr(parseBasicNetMaddr, "tcp", "udp", "ip6", "ip4", "unix")
2727
}
2828

2929
// CodecMap holds a map of NetCodecs indexed by their Protocol ID
@@ -77,6 +77,16 @@ func RegisterNetCodec(a *NetCodec) {
7777
defaultCodecs.RegisterNetCodec(a)
7878
}
7979

80+
// RegisterFromNetAddr registers a conversion from net.Addr instances to multiaddrs.
81+
func RegisterFromNetAddr(from FromNetAddrFunc, networks ...string) {
82+
defaultCodecs.RegisterFromNetAddr(from, networks...)
83+
}
84+
85+
// RegisterToNetAddr registers a conversion from multiaddrs to net.Addr instances.
86+
func RegisterToNetAddr(to ToNetAddrFunc, protocols ...string) {
87+
defaultCodecs.RegisterToNetAddr(to, protocols...)
88+
}
89+
8090
// RegisterNetCodec adds a new NetCodec to the CodecMap. This function is
8191
// thread safe.
8292
func (cm *CodecMap) RegisterNetCodec(a *NetCodec) {

0 commit comments

Comments
 (0)