From 158f5061e020f35166a66db7fb100b2d23025211 Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Mon, 26 Jan 2015 09:59:50 -0800 Subject: [PATCH] p2p: own addresses gotten from host --- p2p/net/mock/mock_net.go | 5 ----- p2p/protocol/identify/id.go | 16 ++++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go index 6146c4e52..f3a560cb9 100644 --- a/p2p/net/mock/mock_net.go +++ b/p2p/net/mock/mock_net.go @@ -67,11 +67,6 @@ func (mn *mocknet) AddPeer(k ic.PrivKey, a ma.Multiaddr) (host.Host, error) { } h := bhost.New(n) - - // make sure to add listening address! - // this makes debugging things simpler as remembering to register - // an address may cause unexpected failure. - n.Peerstore().AddAddress(n.LocalPeer(), a) log.Debugf("mocknet added listen addr for peer: %s -- %s", n.LocalPeer(), a) mn.cg.AddChildGroup(n.cg) diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go index c1c799b66..a8cd5329a 100644 --- a/p2p/protocol/identify/id.go +++ b/p2p/protocol/identify/id.go @@ -141,17 +141,13 @@ func (ids *IDService) populateMessage(mes *pb.Identify, c inet.Conn) { // "public" address, at least in relation to us. mes.ObservedAddr = c.RemoteMultiaddr().Bytes() - // set listen addrs - laddrs, err := ids.Host.Network().InterfaceListenAddresses() - if err != nil { - log.Error(err) - } else { - mes.ListenAddrs = make([][]byte, len(laddrs)) - for i, addr := range laddrs { - mes.ListenAddrs[i] = addr.Bytes() - } - log.Debugf("%s sent listen addrs to %s: %s", c.LocalPeer(), c.RemotePeer(), laddrs) + // set listen addrs, get our latest addrs from Host. + laddrs := ids.Host.Addrs() + mes.ListenAddrs = make([][]byte, len(laddrs)) + for i, addr := range laddrs { + mes.ListenAddrs[i] = addr.Bytes() } + log.Debugf("%s sent listen addrs to %s: %s", c.LocalPeer(), c.RemotePeer(), laddrs) // set protocol versions s := IpfsVersion.String()