Revert changes to INIT_PROTO_VERSION #2473
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
|
ACK |
|
@zkbot r+ |
|
📌 Commit 15a9937 has been approved by |
zkbot
added a commit
that referenced
this pull request
Jun 24, 2017
Revert changes to INIT_PROTO_VERSION This reverts #2245 in order to fix degraded networking behavior for 1.0.10 clients.
str4d
approved these changes
Jun 24, 2017
| @@ -12,9 +12,26 @@ | |||
| static const int PROTOCOL_VERSION = 170002; | |||
|
|
|||
| //! initial proto version, to be increased after version/verack negotiation | |||
| static const int INIT_PROTO_VERSION = 170002; | |||
| static const int INIT_PROTO_VERSION = 209; | |||
There was a problem hiding this comment.
I believe this is the only revert we actually require, but agree with being conservative and reverting the entire PR.
There was a problem hiding this comment.
I just tried reverting solely this change, and I still encounter degraded network behaviour. So ACK on reverting the entire PR.
daira
approved these changes
Jun 24, 2017
daira
reviewed
Jun 24, 2017
| @@ -103,7 +103,8 @@ class CAddress : public CService | |||
| Init(); | |||
| if (nType & SER_DISK) | |||
| READWRITE(nVersion); | |||
| if ((nType & SER_DISK) || !(nType & SER_GETHASH)) | |||
| if ((nType & SER_DISK) || | |||
| (nVersion >= CADDR_TIME_VERSION && !(nType & SER_GETHASH))) | |||
There was a problem hiding this comment.
This reversion is also necessary. nVersion here can refer either to INIT_PROTO_VERSION (when deserializing the address fields in the initial "version" message received from a peer), or to the final negotiated version (when deserializing later messages).
daira
added
A-networking
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 reverts #2245 in order to fix degraded networking behavior for 1.0.10 clients.