p2p: own addresses gotten from host
Juan Batiz-Benet committed
Jan 26, 2015 at 09:59 UTC
158f5061e020f35166a66db7fb100b2d23025211
2 files changed
+6
-15
p2p/net/mock/mock_net.go
-5
@@ -67,11 +67,6 @@ func (mn *mocknet) AddPeer(k ic.PrivKey, a ma.Multiaddr) (host.Host, error) {
67
}
68
69
h := bhost.New(n)
70
-
71
- // make sure to add listening address!
72
- // this makes debugging things simpler as remembering to register
73
- // an address may cause unexpected failure.
74
- n.Peerstore().AddAddress(n.LocalPeer(), a)
70
log.Debugf("mocknet added listen addr for peer: %s -- %s", n.LocalPeer(), a)
71
72
mn.cg.AddChildGroup(n.cg)
p2p/protocol/identify/id.go
+6
-10
@@ -141,17 +141,13 @@ func (ids *IDService) populateMessage(mes *pb.Identify, c inet.Conn) {
141
// "public" address, at least in relation to us.
142
mes.ObservedAddr = c.RemoteMultiaddr().Bytes()
143
144
- // set listen addrs
145
- laddrs, err := ids.Host.Network().InterfaceListenAddresses()
146
- if err != nil {
147
- log.Error(err)
148
- } else {
149
- mes.ListenAddrs = make([][]byte, len(laddrs))
150
- for i, addr := range laddrs {
151
- mes.ListenAddrs[i] = addr.Bytes()
152
- }
153
- log.Debugf("%s sent listen addrs to %s: %s", c.LocalPeer(), c.RemotePeer(), laddrs)
144
+ // set listen addrs, get our latest addrs from Host.
145
+ laddrs := ids.Host.Addrs()
146
+ mes.ListenAddrs = make([][]byte, len(laddrs))
147
+ for i, addr := range laddrs {
148
+ mes.ListenAddrs[i] = addr.Bytes()
149
}
150
+ log.Debugf("%s sent listen addrs to %s: %s", c.LocalPeer(), c.RemotePeer(), laddrs)
151
152
// set protocol versions
153
s := IpfsVersion.String()