updated multiaddr-net for WrapNetListener
Juan Batiz-Benet committed
Jan 19, 2015 at 02:52 UTC
eb50900fffa24ae3210f2db90d820937485a2ea8
2 files changed
+9
-5
Godeps/Godeps.json
+1
-1
@@ -143,7 +143,7 @@
143
},
144
{
145
"ImportPath": "github.com/jbenet/go-multiaddr-net",
146
- "Rev": "04044c2289504304472715d827a8f564fa3759a8"
146
+ "Rev": "eae26b653a87d02193bb261ae5c5e1f39cc033d6"
147
},
148
{
149
"ImportPath": "github.com/jbenet/go-multihash",
Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net/net.go
+8
-4
@@ -236,13 +236,17 @@ func Listen(laddr ma.Multiaddr) (Listener, error) {
236
return nil, err
237
}
238
239
- // we need to fetch the new multiaddr from the listener, as it
240
- // may have resolved to some other value.
241
- nladdr, err := FromNetAddr(nl.Addr())
239
+ // we want to fetch the new multiaddr from the listener, as it may
240
+ // have resolved to some other value. WrapNetListener does it for us.
241
+ return WrapNetListener(nl)
242
+}
243
+
244
+// WrapNetListener wraps a net.Listener with a manet.Listener.
245
+func WrapNetListener(nl net.Listener) (Listener, error) {
246
+ laddr, err := FromNetAddr(nl.Addr())
247
if err != nil {
248
return nil, err
249
}
245
- laddr = nladdr
250
251
return &maListener{
252
Listener: nl,