fix(p2p): unify TCP/QUIC transport building - #694
Open
varex83agent wants to merge 1 commit into
Open
Conversation
Collapse the four near-identical swarm builders into one transport builder parameterized by `NodeType`, so transport and address selection are made together as Charon does in `p2p.go`. This fixes a `NodeType::QUIC` server running `QuicUpgradeBehaviour` with `quic_enabled = false` and installing both transports regardless of node type, and lets the relay server pass `NodeType::QUIC` (as Charon's relay does) instead of `NodeType::TCP` plus a manual UDP `listen_on` loop. Folds the six copy-paste `_tcp_`/`_udp_` helper pairs into single functions taking a `TransportProtocol`. Closes #621. Co-Authored-By: Bohdan Ohorodnii <35969035+varex83@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Closes #621.
Collapses the four near-identical swarm builders into a single
base_transportparameterized byNodeType, so transport and address selection are made in one place — Charon's shape inp2p/p2p.go. TCP is always installed; QUIC is chained onto it only forNodeType::QUIC.This fixes a
NodeType::QUICserver runningQuicUpgradeBehaviourwithquic_enabled = falsewhile installing both transports regardless of node type, and lets the relay server passNodeType::QUIC(as Charon's relay does) instead ofNodeType::TCPplus a manual UDPlisten_onworkaround. The six copy-paste_tcp_/_udp_helper pairs acrossp2p/src/config.rs,p2p/src/utils.rsandrelay-server/src/utils.rsare folded into single functions taking aTransportProtocol.Co-Authored-By: Bohdan Ohorodnii 35969035+varex83@users.noreply.github.com