p2p/net/swrm: InterfaceListenAddrs now method
Juan Batiz-Benet committed
Jan 13, 2015 at 05:58 UTC
af889dc182892576602ccc48ac4364eaac322540
3 files changed
+4
-4
p2p/net/swarm/swarm_addr.go
+2
-2
@@ -22,14 +22,14 @@ func (s *Swarm) ListenAddresses() []ma.Multiaddr {
22
// InterfaceListenAddresses returns a list of addresses at which this swarm
23
// listens. It expands "any interface" addresses (/ip4/0.0.0.0, /ip6/::) to
24
// use the known local interfaces.
25
-func InterfaceListenAddresses(s *Swarm) ([]ma.Multiaddr, error) {
25
+func (s *Swarm) InterfaceListenAddresses() ([]ma.Multiaddr, error) {
26
return addrutil.ResolveUnspecifiedAddresses(s.ListenAddresses(), nil)
27
}
28
29
// checkNATWarning checks if our observed addresses differ. if so,
30
// informs the user that certain things might not work yet
31
func checkNATWarning(s *Swarm, observed ma.Multiaddr, expected ma.Multiaddr) {
32
- listen, err := InterfaceListenAddresses(s)
32
+ listen, err := s.InterfaceListenAddresses()
33
if err != nil {
34
log.Errorf("Error retrieving swarm.InterfaceListenAddresses: %s", err)
35
return
p2p/net/swarm/swarm_dial.go
+1
-1
@@ -252,7 +252,7 @@ func (s *Swarm) dial(ctx context.Context, p peer.ID) (*Conn, error) {
252
remoteAddrs = addrutil.FilterUsableAddrs(remoteAddrs)
253
// drop out any addrs that would just dial ourselves. use ListenAddresses
254
// as that is a more authoritative view than localAddrs.
255
- ila, _ := InterfaceListenAddresses(s)
255
+ ila, _ := s.InterfaceListenAddresses()
256
remoteAddrs = addrutil.Subtract(remoteAddrs, ila)
257
remoteAddrs = addrutil.Subtract(remoteAddrs, s.peers.Addresses(s.local))
258
log.Debugf("%s swarm dialing %s -- remote:%s local:%s", s.local, p, remoteAddrs, s.ListenAddresses())
p2p/net/swarm/swarm_net.go
+1
-1
@@ -111,7 +111,7 @@ func (n *Network) ListenAddresses() []ma.Multiaddr {
111
// listens. It expands "any interface" addresses (/ip4/0.0.0.0, /ip6/::) to
112
// use the known local interfaces.
113
func (n *Network) InterfaceListenAddresses() ([]ma.Multiaddr, error) {
114
- return InterfaceListenAddresses(n.Swarm())
114
+ return n.Swarm().InterfaceListenAddresses()
115
}
116
117
// Connectedness returns a state signaling connection capabilities