Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for IP masks #127

Merged
merged 15 commits into from
Jun 23, 2014
Merged

Add support for IP masks #127

merged 15 commits into from
Jun 23, 2014

Commits on May 2, 2014

  1. Add IP mask to patterns.

    Bryan Cuccioli committed May 2, 2014
    Configuration menu
    Copy the full SHA
    6b741d3 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2014

  1. Checkpoint

    @jnfoster
    jnfoster committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    f76789f View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2014

  1. Expose prtty printing for par

    @jnfoster
    jnfoster committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    d2f0137 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ip-mask 

    * 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
    @jnfoster
    jnfoster committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    d6334a3 View commit details
    Browse the repository at this point in the history

  3. Remove bogus (?) test

    @jnfoster
    jnfoster committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    39d60ad View commit details
    Browse the repository at this point in the history

  4. Fix bugs in IP operations and remove disjoint

    @jnfoster
    jnfoster committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    6e21a68 View commit details
    Browse the repository at this point in the history

  5. Remove disjoint

    @jnfoster
    jnfoster committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    6e8c47f View commit details
    Browse the repository at this point in the history

  6. Fix typo in Pattern.eq

    @jnfoster
    jnfoster committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    ffdc978 View commit details
    Browse the repository at this point in the history

  7. Don't pick ports larger than OFPP_MAX

    @jnfoster
    jnfoster committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    8f66363 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2014

  1. ip-mask: reorg into Pattern.Ip submodule, fix meet 

    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.
    @seliopou
    seliopou committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    29483d2 View commit details
    Browse the repository at this point in the history

  2. ip-mask: Expose Pattern.Ip format and string_of functions

    @seliopou
    seliopou committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    8522001 View commit details
    Browse the repository at this point in the history

  3. ip-mask: quickcheck tests for ip pattern

    @seliopou
    seliopou committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    5e3e950 View commit details
    Browse the repository at this point in the history

  4. ip-mask: strengthen lattice quickcheck properties 

    Some of the tests that were ifs should have actually been iffs.
    @seliopou
    seliopou committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    9d45a16 View commit details
    Browse the repository at this point in the history

  5. ip-mask: rename meet to join 

    Join goes up (least upper bound) and meet goes down (greatest lower
bound).
    @seliopou
    seliopou committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    e3ea688 View commit details
    Browse the repository at this point in the history

  6. ip-mask: fix bug in Pattern.eq 

    Was more or less implemented as less_eq.
    @seliopou
    seliopou committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    39faf5c View commit details
    Browse the repository at this point in the history