updated multiaddr-net for WrapNetListener

This commit is contained in:
Juan Batiz-Benet 2015-01-19 02:52:30 -08:00
parent 7a322c9538
commit eb50900fff
2 changed files with 9 additions and 5 deletions

2
Godeps/Godeps.json generated
View File

@ -143,7 +143,7 @@
},
{
"ImportPath": "github.com/jbenet/go-multiaddr-net",
"Rev": "04044c2289504304472715d827a8f564fa3759a8"
"Rev": "eae26b653a87d02193bb261ae5c5e1f39cc033d6"
},
{
"ImportPath": "github.com/jbenet/go-multihash",

View File

@ -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,