Skip to content

Commit 40aea2a

Browse files
committed
handshake: log whether new addr observed
1 parent 4989dca commit 40aea2a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

net/handshake/handshake3.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ func Handshake3Update(lpeer, rpeer peer.Peer, msg *pb.Handshake3) (*Handshake3Re
4848
if err != nil {
4949
return res, err
5050
}
51-
lpeer.AddAddress(observedAddr)
51+
if lpeer.AddAddress(observedAddr) {
52+
log.Infof("(nat) added new local, remote-observed address: %s", observedAddr)
53+
}
5254
res.LocalObservedAddress = observedAddr
5355

5456
// remote's reported addresses

peer/peer.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ type Peer interface {
6666
Addresses() []ma.Multiaddr
6767

6868
// AddAddress adds the given Multiaddr address to Peer's addresses.
69-
AddAddress(a ma.Multiaddr)
69+
// returns whether this was a newly added address.
70+
AddAddress(a ma.Multiaddr) bool
7071

7172
// NetAddress returns the first Multiaddr found for a given network.
7273
NetAddress(n string) ma.Multiaddr
@@ -141,16 +142,18 @@ func (p *peer) Addresses() []ma.Multiaddr {
141142
}
142143

143144
// AddAddress adds the given Multiaddr address to Peer's addresses.
144-
func (p *peer) AddAddress(a ma.Multiaddr) {
145+
// Returns whether this address was a newly added address
146+
func (p *peer) AddAddress(a ma.Multiaddr) bool {
145147
p.Lock()
146148
defer p.Unlock()
147149

148150
for _, addr := range p.addresses {
149151
if addr.Equal(a) {
150-
return
152+
return false
151153
}
152154
}
153155
p.addresses = append(p.addresses, a)
156+
return true
154157
}
155158

156159
// NetAddress returns the first Multiaddr found for a given network.

0 commit comments

Comments
 (0)