This series adds many of the missing OpenFlow 1.1 actions. Due to the different semantics, the vlan actions are annotated based on the policy on missing vlan header.
A native OF 1.2 Set Field action with translation to/from OF 1.0/1.1 actions is added. Action consistency is enforced for OF 1.1+, as suggested in the specification. Jarno Rajahalme (11): v3: - Rebase - Fix issues raised by Ben: - Fix reported offset error in ofp-actions.c - Do not enforce consistency for Write-Actions - Silence a compiler warning about mf_fields. - Fix byte-order errors in MPLS label handling found with sparse. ofp-actions: Make union ofp_action more generic. lib/ofp-actions: Enforce action consistency. OF 1.1 set vlan vid/pcp compatibility. OF 1.1 pop vlan compatibility. Inline mf_from_id(), add OXM names. Native OpenFlow 1.2 set field action. lib/ofp-actions: Set field OF 1.0/1.1 compatibility. lib/ofp-action: Simplify interface and internal structure. lib/ofp-actions: Translate deprecated actions as set fields. lib/ofp-actions: Log a warning on deprecated actions. Add OF11 SET MPLS LABEL and SET MPLS TC actions. include/openflow/nicira-ext.h | 24 + lib/meta-flow.c | 225 +++++--- lib/meta-flow.h | 38 +- lib/nx-match.c | 135 +---- lib/nx-match.h | 2 - lib/ofp-actions.c | 1218 ++++++++++++++++++++++++++++++----------- lib/ofp-actions.h | 95 +++- lib/ofp-parse.c | 116 +++- lib/ofp-parse.h | 12 +- lib/ofp-util.c | 151 +++-- lib/ofp-util.def | 8 +- lib/ofp-util.h | 3 + ofproto/ofproto-dpif-xlate.c | 90 ++- ofproto/ofproto.c | 21 +- tests/learn.at | 2 + tests/ofp-actions.at | 6 +- tests/ovs-ofctl.at | 39 +- utilities/ovs-controller.c | 2 +- utilities/ovs-ofctl.c | 54 +- 19 files changed, 1553 insertions(+), 688 deletions(-) -- 1.7.10.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
