diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 577a44ffe..14427cb81 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -143,7 +143,7 @@ }, { "ImportPath": "github.com/jbenet/go-multiaddr-net", - "Rev": "04044c2289504304472715d827a8f564fa3759a8" + "Rev": "eae26b653a87d02193bb261ae5c5e1f39cc033d6" }, { "ImportPath": "github.com/jbenet/go-multihash", diff --git a/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net/net.go b/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net/net.go index 2fec9663f..dd8cf68fa 100644 --- a/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net/net.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net/net.go @@ -236,13 +236,17 @@ func Listen(laddr ma.Multiaddr) (Listener, error) { return nil, err } - // we need to fetch the new multiaddr from the listener, as it - // may have resolved to some other value. - nladdr, err := FromNetAddr(nl.Addr()) + // we want to fetch the new multiaddr from the listener, as it may + // have resolved to some other value. WrapNetListener does it for us. + return WrapNetListener(nl) +} + +// WrapNetListener wraps a net.Listener with a manet.Listener. +func WrapNetListener(nl net.Listener) (Listener, error) { + laddr, err := FromNetAddr(nl.Addr()) if err != nil { return nil, err } - laddr = nladdr return &maListener{ Listener: nl,