refactor: introduce the packetmuxer layer #49
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
I've tried to achieve te minimal incremental change that adds resilience in the face of network noise. To achieve that, the simple thing to do was to make session an object owned by an implementation of reliableTransport. I've reused the reliableUDP implementation in govpn, and I like the simplicity of that implementation a lot. A lot of our current logic (ackqueue/retries) needed to move from the tlsTransport minivpn implementation into reliableTransport. Although the DoS documented in the MIV-01 report is not done, we add the e2e testing script to facilitate further development. - Related: ooni#32 more tests
Discussed with @ainghazal extensively.
In particular, make sure it's ~easy to connect them all.
ainghazal
commented
Jan 10, 2024
ainghazal
commented
Jan 11, 2024
bassosimone
reviewed
Jan 12, 2024
bassosimone
reviewed
Jan 12, 2024
bassosimone
reviewed
Jan 12, 2024
| // increments the counter for the local data packet ID. | ||
| func (m *Manager) localDataPacketIDLocked() (model.PacketID, error) { | ||
| pid := m.localDataPacketID | ||
| if pid == math.MaxUint32 { |
There was a problem hiding this comment.
Suggested change
| if pid == math.MaxUint32 { | |
| if pid >= math.MaxUint32 { |
There was a problem hiding this comment.
I think this is not correct right? PacketID is a uint32 so it should not overflow.
This is a very improbable error, but the only way of returning it meaningfully is to error on the last usable PacketID, I think.
There was a problem hiding this comment.
I tend to like expressing this kind of checks in a more defensive way which makes them more robust to refactoring like "let's change this to int64 now", but feel free to ignore if you don't like it.
bassosimone
reviewed
Jan 12, 2024
| // increments the counter for the local control packet ID. | ||
| func (m *Manager) localControlPacketIDLocked() (model.PacketID, error) { | ||
| pid := m.localControlPacketID | ||
| if pid == math.MaxUint32 { |
There was a problem hiding this comment.
Suggested change
| if pid == math.MaxUint32 { | |
| if pid >= math.MaxUint32 { |
Co-authored-by: Simone Basso <[email protected]>
Co-authored-by: Simone Basso <[email protected]>
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 is the second commit in the series of incremental refactoring of the current minivpn tree.
In this commit, we introduce the packet muxer, which is the layer just above the networkio. The packet muxer handles and routes data or control packets, and it also handles reset packets.
As dependencies for
packetmuxer, we're also introducing theoptionalandsessionpackages.Reference issue: #47