add ip+net back in

This commit is contained in:
Jeromy 2016-05-16 14:40:20 -07:00
parent 4508ee69c5
commit d4cfd691db
2 changed files with 17 additions and 0 deletions

View File

@ -505,3 +505,10 @@ func testSliceEqual(t *testing.T, a, b []ma.Multiaddr) {
}
}
}
func TestInterfaceAddressesWorks(t *testing.T) {
_, err := InterfaceMultiaddrs()
if err != nil {
t.Fatal(err)
}
}

View File

@ -20,6 +20,7 @@ func init() {
defaultCodecs.RegisterNetCodec(utpAddrSpec)
defaultCodecs.RegisterNetCodec(ip4AddrSpec)
defaultCodecs.RegisterNetCodec(ip6AddrSpec)
defaultCodecs.RegisterNetCodec(ipnetAddrSpec)
}
type CodecMap struct {
@ -105,6 +106,15 @@ var ip6AddrSpec = &NetCodec{
ConvertMultiaddr: parseBasicNetMaddr,
}
var ipnetAddrSpec = &NetCodec{
ProtocolName: "ip+net",
NetAddrNetworks: []string{"ip+net"},
ParseNetAddr: parseIpPlusNetAddr,
ConvertMultiaddr: func(ma.Multiaddr) (net.Addr, error) {
return nil, fmt.Errorf("converting ip+net multiaddr not supported")
},
}
func (cm *CodecMap) getAddrParser(net string) (FromNetAddrFunc, error) {
cm.lk.Lock()
defer cm.lk.Unlock()