This is the same as v2 but rebased against current master upon request from Justin. No review is needed yet; wait for v3.
Ben Pfaff (2): classifier: Make classifier_lookup() 'flow' parameter non-const. [RFC] classifier: Add support for conjunctive matches. NEWS | 4 + lib/classifier-private.h | 3 +- lib/classifier.c | 397 +++++++++++++++++++++++++++++++++++++++--- lib/classifier.h | 12 +- lib/flow.c | 1 + lib/flow.h | 3 +- lib/match.c | 11 ++ lib/match.h | 3 +- lib/meta-flow.c | 17 ++ lib/meta-flow.h | 14 ++ lib/nx-match.c | 4 + lib/ofp-actions.c | 112 +++++++++++- lib/ofp-actions.h | 12 ++ lib/ofp-errors.h | 8 + lib/tnl-ports.c | 4 +- lib/tnl-ports.h | 3 +- ofproto/ofproto-dpif-xlate.c | 4 + ofproto/ofproto-dpif.c | 12 +- ofproto/ofproto.c | 41 +++++ tests/automake.mk | 2 + tests/ofproto.at | 3 +- tests/test-conjunction | 22 +++ utilities/ovs-ofctl.8.in | 185 ++++++++++++++++++++ 23 files changed, 841 insertions(+), 36 deletions(-) create mode 100755 tests/test-conjunction -- 1.7.10.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
