NAT: Split stateful/stateless, move to own crate #635
Merged
Conversation
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
qmonnet
force-pushed
the
pr/qmonnet/refactor-nat
branch
from
2a08309 to
b5e75a6
Compare
Fredi-raspall
requested changes
Jun 26, 2025
There was a problem hiding this comment.
LGTM @qmonnet!!. There seems to be a small issue with the rust docs. Can you please fix it so that we can merge? Thanks!
Move the NAT code to a dedicated crate to keep the dataplane a thin binary relying on libraries (rather than implementing all the NAT logics inside of the dataplane package). Suggested-by: Fredi Raspall <[email protected]> Signed-off-by: Quentin Monnet <[email protected]>
Most of the code for stateful and stateless NAT is already dissociated, but the two modes share a common infrastructure whitin the "Nat" object. This commit separates them entirely, by duplicating the shared code to create a copy in the "stateless" submodule, and introducing a new StatelessNat object. The remaining code in lib.rs for stateful NAT is to be moved in a future commit. Motivations for separating the two modes into distinct pipeline stages include: - They have little code in common anyway - It will be clearer, when programming the dataplane, to explicitly handle a stateless or statefull object - The structures used by the two modes, in terms of configuration and internal state (for stateful NAT), are not the same. As a consequence, having both modes in a same object means instances need to keep some useless empty context for the chosen running mode, and it also makes it more difficult to protect the different objects for concurrent access. Signed-off-by: Quentin Monnet <[email protected]>
Following the separation of stateful and stateless NAT code into two different pipeline stages, rename the object for stateful NAT as StatefulNat, and move it to the dedicated module. Signed-off-by: Quentin Monnet <[email protected]>
Following the move of the NAT code to a dedicated crate, let's make sure we pass the correct directives to Clippy and for rustdoc. Also fix the minor reports for Clippy, and make it ignore "dead_code" only in the stateful module where it's relevant, not the whole crate. Also fix two rustdoc warnings emitted from the "routing" package. Signed-off-by: Quentin Monnet <[email protected]>
qmonnet
force-pushed
the
pr/qmonnet/refactor-nat
branch
from
b5e75a6 to
98c6439
Compare
|
@Fredi-raspall sorry I thought these checks had run locally (they hadn't) and I didn't check CI results yesterday. It should be addressed now, let's see. Thanks for the review! |
Fredi-raspall
approved these changes
Jun 26, 2025
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.
Please see individual commit descriptions for details.