opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 18:13:54 +08:00
Code Issues Projects Releases Wiki Activity

listen addresses: add Interface addresses

Browse Source 
network.ListenAddresses() are general.
Interface addresses are specific.
This commit is contained in:
Juan Batiz-Benet
2014-12-23 02:56:19 -08:00
parent 0dbd86c4f8
commit 64a4abcd6c
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/core.go
View File

@ -130,7 +130,12 @@ func NewIpfsNode(ctx context.Context, cfg *config.Config, online bool) (n *IpfsN
// explicitly set these as our listen addrs.
// (why not do it inside inet.NewNetwork? because this way we can
// listen on addresses without necessarily advertising those publicly.)
n.Peerstore.AddAddresses(n.Identity, n.Network.ListenAddresses())
addrs, err := n.Network.InterfaceListenAddresses()
if err != nil {
return nil, debugerror.Wrap(err)
}
n.Peerstore.AddAddresses(n.Identity, addrs)
// setup diagnostics service
n.Diagnostics = diag.NewDiagnostics(n.Identity, n.Network)

14
net/id.go
View File

@ -112,12 +112,16 @@ func (ids *IDService) populateMessage(mes *pb.Handshake3, c Conn) {
mes.ObservedAddr = c.RemoteMultiaddr().Bytes()
// set listen addrs
laddrs := ids.Network.ListenAddresses()
mes.ListenAddrs = make([][]byte, len(laddrs))
for i, addr := range laddrs {
mes.ListenAddrs[i] = addr.Bytes()
laddrs, err := ids.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)
}
log.Debugf("%s sent listen addrs to %s: %s", c.LocalPeer(), c.RemotePeer(), laddrs)
// set protocol versions
mes.H1 = handshake.NewHandshake1("", "")