tls / noise: prefer the client's muxer preferences #1888
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
MarcoPolo
approved these changes
Nov 16, 2022
| for _, proto := range info.SupportedProtos { | ||
| for _, m := range muxers { | ||
| if m == proto { | ||
| config.NextProtos = []string{proto} |
There was a problem hiding this comment.
Don't we have to append the "libp2p" ALPN here? (It seems like were doing that below? with config.NextProtos = append(muxers, config.NextProtos...)). I'm pretty sure this doesn't matter, since we know the client supports the ALPN we set here. So maybe just a comment would be fine.
There was a problem hiding this comment.
Technically we have to, but we can short-circuit it, since we know that we'll select the muxer. I'll add a comment.
marten-seemann
force-pushed
the
early-muxer-negotiation-preferences
branch
from
f9d777a
to
e047c22
Compare
marten-seemann
force-pushed
the
early-muxer-negotiation-preferences
branch
from
e047c22
to
0957a9d
Compare
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.
As the integration test (#1887) has revealed, TLS and Noise both selected the muxer according to the server's preferences, whereas the multistream negotiation selects according to the client's preferences. This PR changes TLS' and Noise's behavior to match the multistream behavior.
Since TLS' ALPN selection algorithm also selects according to the server's preferences, we have to play a little trick to overwrite that behavior.