Read rule type and l3mdev flag #1096
Open
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
|
Let's try to get #1095 in first, then rebase. |
stephanreiter
force-pushed
the
read-rule-type-and-l3mdev-flag
branch
2 times, most recently
from
19ea691 to
157d171
Compare
stephanreiter
force-pushed
the
read-rule-type-and-l3mdev-flag
branch
from
157d171 to
c3c34ed
Compare
This adds an implementation of Rule.Equal (and RulePortRange.Equal, RuleUIDRange.Equal) which allows us to compare two Rule objects.
stephanreiter
force-pushed
the
read-rule-type-and-l3mdev-flag
branch
11 times, most recently
from
ffee0e5 to
05f86e1
Compare
When reading rules, makes sure to populate the type field of Rule. Note that an unspecified type is interpreted as UNICAST, for example, when adding a rule. To make sure that a rule with unspecified type, which was just added, compares equal to that rule being read back, we we update Rule.Equal to treat unspecified and UNICAST types as equal. Also adds a l3mdev flag to Rule, reads it when listing rules, sets it when updating rules, and makes sure it is taken into account when comparing rules using Equal as introduced in vishvananda#1095.
stephanreiter
force-pushed
the
read-rule-type-and-l3mdev-flag
branch
from
05f86e1 to
393298d
Compare
stephanreiter
commented
Jul 23, 2025
| r.Invert == x.Invert && | ||
| r.Tos == x.Tos && | ||
| (r.Type == x.Type || | ||
| (r.Type == 0 && x.Type == 1 || r.Type == 1 && x.Type == 0)) && // 1 is unix.RTN_UNICAST |
There was a problem hiding this comment.
Not so sure about this one. Without it, tests that create a rule, then read it back and compare with the struct used for creating the rule, need to be updated because currently Type is left unset in the struct and reads back as UNICAST. Maybe that's better? It seems though that when deleting a rule again, we want to have the Type cleared in the struct. Saw some test failures when keeping Type set to unicast.
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.
When reading rules, makes sure to populate the type field of
Rule.Also adds a l3mdev flag to
Rule, reads it and makes sure it is taken into account when comparing rules usingEqualas introduced in #1095.This fixes #1055