Add support for IP masks #127
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
* Regenerate Oasis * Detangle conflicts * Add lattice structure for IP masks Conflicts: _oasis lib/META lib/SDN_OpenFlow0x01.ml lib/SDN_OpenFlow0x04.ml lib/SDN_Types.ml lib/SDN_Types.mli setup.ml
|
Entangled with frenetic-lang/frenetic#307 |
|
Travis is failing for reasons that seem to not my fault! |
| && check (=) p1.dlTyp p2.dlTyp | ||
| && check (=) p1.dlVlan p2.dlVlan | ||
| && check (=) p1.dlVlanPcp p2.dlVlanPcp | ||
| && check (fun x y -> ip_subseteq x y || ip_subseteq y x) p1.nwSrc p2.nwSrc |
There was a problem hiding this comment.
Should be ip_subseteq x y && ip_subseteq y x rather than ip_subseteq x y || ip_subseteq y x, correct?
Move ip mask-related operations to a submodule of Pattern to keep the namespaces organized. In addition, reimplement the operations in terms of the shift operations, which was redundant with the compatible operation. There was also an issue with the meet operation not returning the most exact result. Consider these two masks: 11000000.0.0.0/4 11010000.0.0.0/4 Their meet is 11000000.0.0.0/2, but the previous implementation would have returned 0.0.0.0/0.
Some of the tests that were ifs should have actually been iffs.
Join goes up (least upper bound) and meet goes down (greatest lower bound).
Was more or less implemented as less_eq.
|
This is ready to merge once frenetic-lang/frenetic#307 is ready to merge. |
|
+100 |
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.
Adds IP masks to OpenFlow patterns. This request should only be merged with an accompanying pull request for Frenetic.