server: fix inbound/outbound peer connection logic #1008
Merged
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
halseth
previously approved these changes
Apr 5, 2018
|
cACK for now, gonna run this on testnet for a bit to make sure the issues from before don't resurface. My current reasoning that this wasn't working in the past because the persistent connection requests weren't being canceled, causing this to end up in a weird state or flap unnecessarily. |
wpaulino
force-pushed
the
peer-connection-logic
branch
from
c9d74f1
to
2762e17
Compare
wpaulino
commented
May 2, 2018
server.go
Outdated
| @@ -1368,7 +1369,7 @@ func (s *server) peerConnected(conn net.Conn, connReq *connmgr.ConnReq, | |||
|
|
|||
| // We'll ensure that we locate the proper port to use within the peer's | |||
| // address for reconnecting purposes. | |||
| if tcpAddr, ok := addr.(*net.TCPAddr); ok && !inbound { | |||
| if tcpAddr, ok := addr.(*net.TCPAddr); ok && inbound { | |||
There was a problem hiding this comment.
Rebased this to include a recent change that depends on the flipped behavior.
wpaulino
force-pushed
the
peer-connection-logic
branch
from
2762e17
to
9c6711b
Compare
|
Aight, been seeing some errors that may be attributed to this issue, time to revive. Gonna some more testing with this on current master |
|
Can you rebase this? Thanks! |
wpaulino
force-pushed
the
peer-connection-logic
branch
from
9c6711b
to
f7002cf
Compare
In this commit, we address the meaning of the inbound parameter to peerConnected. An inbound connection is defined as a connection initiated by the peer, rather than ourselves. We also update the inbound value for the peerConnected calls within OutboundPeerConnected and InboundPeerConnected to reflect the definition above.
This reverts commit 5126e43 since the underlying issue has now been fixed.
wpaulino
force-pushed
the
peer-connection-logic
branch
from
f7002cf
to
077b1ff
Compare
|
Rebased. |
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.
This PR attempts to fix a small bug where inbound peers were being tracked as outbound and outbound as inbound.
I went through the rest of the connection logic and our uses of inbound/outbound connections seem to be consistent with their respective meanings. Inbound connections should be connections initiated by the remote peer, while outbound connections should be initiated locally.
I believe the small patch below should be enough to remedy this issue, although I might have missed something.
Fixes #997.