From d4cfd691db9f50e430528f682ca603237b0eaae0 Mon Sep 17 00:00:00 2001
From: Jeromy <why@ipfs.io>
Date: Mon, 16 May 2016 14:40:20 -0700
Subject: [PATCH] add ip+net back in

---
 net_test.go |  7 +++++++
 registry.go | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/net_test.go b/net_test.go
index 4617c6d..fc2e374 100644
--- a/net_test.go
+++ b/net_test.go
@@ -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)
+	}
+}
diff --git a/registry.go b/registry.go
index 816e554..be492ea 100644
--- a/registry.go
+++ b/registry.go
@@ -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()