fix: keep observed addrs alive as long as their associated connections are alive #899
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s are alive Otherwise, if we're not creating new connections, we'll eventually forget them. Up until now, this wasn't _too_ much of an issue because our peers would still remember our addresses. However, we now _tell_ our connected peers when our addresses change. That means we'll tell our peers to forget where we are, preventing anyone from finding us.
Stebalien
commented
Apr 25, 2020
|
|
||
| // ok! we have the observed version of one of our ListenAddresses! | ||
| log.Debugf("added own observed listen addr: %s --> %s", c.LocalMultiaddr(), maddr) | ||
| ids.observedAddrs.Add(maddr, c.LocalMultiaddr(), c.RemoteMultiaddr(), |
There was a problem hiding this comment.
Moved into the observed addr manager.
Comment on lines
+269
to
+298
| if manet.IsIPLoopback(observed) { | ||
| return | ||
| } | ||
|
|
||
| // we should only use ObservedAddr when our connection's LocalAddr is one | ||
| // of our ListenAddrs. If we Dial out using an ephemeral addr, knowing that | ||
| // address's external mapping is not very useful because the port will not be | ||
| // the same as the listen addr. | ||
| ifaceaddrs, err := oas.host.Network().InterfaceListenAddresses() | ||
| if err != nil { | ||
| log.Infof("failed to get interface listen addrs", err) | ||
| return | ||
| } | ||
|
|
||
| local := conn.LocalMultiaddr() | ||
| if !addrInAddrs(local, ifaceaddrs) && !addrInAddrs(local, oas.host.Network().ListenAddresses()) { | ||
| // not in our list | ||
| return | ||
| } | ||
|
|
||
| // We should reject the connection if the observation doesn't match the | ||
| // transports of one of our advertised addresses. | ||
| if !HasConsistentTransport(observed, oas.host.Addrs()) { | ||
| log.Debugw( | ||
| "observed multiaddr doesn't match the transports of any announced addresses", | ||
| "from", conn.RemoteMultiaddr(), | ||
| "observed", observed, | ||
| ) | ||
| return | ||
| } |
willscott
approved these changes
Apr 25, 2020
Stebalien
force-pushed
the
fix/obserations
branch
from
2276bfd
to
84b923c
Compare
vyzo
reviewed
Apr 25, 2020
Comment on lines
+67
to
+71
| activeConnsMu sync.Mutex | ||
| // active connection -> most recent observation | ||
| activeConns map[network.Conn]ma.Multiaddr | ||
|
|
||
| mu sync.RWMutex |
There was a problem hiding this comment.
why do we need two mutexes here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Otherwise, if we're not creating new connections, we'll eventually forget them.
Up until now, this wasn't too much of an issue because our peers would still remember our addresses. However, we now tell our connected peers when our addresses change. That means we'll tell our peers to forget where we are, preventing anyone from finding us.