mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-27 15:18:06 +00:00
Code Issues Releases Wiki Activity

ofproto: Add OF1.4 elements to enum ofp_table_config

Browse Source 
Add elements to enum ofp_table_config for table mod bits
defined in OpenFlow1.4.

Also tidy up the indentation of existing elements.

Signed-off-by: Simon Horman <horms@verge.net.au>
Co-authored-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Simon Horman
2013-11-26 16:34:23 +09:00
committed by Ben Pfaff
parent 8249a1fe96
commit 41b34c7d25
3 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/openflow/openflow-1.1.h
View File

@@ -443,18 +443,6 @@ struct ofp11_table_mod {
};
OFP_ASSERT(sizeof(struct ofp11_table_mod) == 8);
/* Flags to indicate behavior of the flow table for unmatched packets.
These flags are used in ofp_table_stats messages to describe the current
configuration and in ofp_table_mod messages to configure table behavior. */
enum ofp11_table_config {
OFPTC11_TABLE_MISS_CONTROLLER = 0 << 0, /* Send to controller. */
OFPTC11_TABLE_MISS_CONTINUE = 1 << 0, /* Continue to the next table in the
pipeline (OpenFlow 1.0
behavior). */
OFPTC11_TABLE_MISS_DROP = 2 << 0, /* Drop the packet. */
#define OFPTC11_TABLE_MISS_MASK (3 << 0)
};
/* Flow setup and teardown (controller -> datapath). */
struct ofp11_flow_mod {
ovs_be64 cookie; /* Opaque controller-issued identifier. */

16
include/openflow/openflow-common.h
View File

@@ -476,11 +476,17 @@ enum ofp_table {
};
enum ofp_table_config {
OFPTC_TABLE_MISS_CONTROLLER = 0 << 0, /* Send to controller. */
OFPTC_TABLE_MISS_CONTINUE = 1 << 0, /* Continue to the next table in the
pipeline (OpenFlow 1.0 behavior). */
OFPTC_TABLE_MISS_DROP = 2 << 0, /* Drop the packet. */
OFPTC_TABLE_MISS_MASK = 3 << 0
/* OpenFlow 1.1 and 1.2 defined this field as shown.
* OpenFlow 1.3 and later mark this field as deprecated, but have not
* reused it for any new purpose. */
OFPTC11_TABLE_MISS_CONTROLLER = 0 << 0, /* Send to controller. */
OFPTC11_TABLE_MISS_CONTINUE = 1 << 0, /* Go to next table, like OF1.0. */
OFPTC11_TABLE_MISS_DROP = 2 << 0, /* Drop the packet. */
OFPTC11_TABLE_MISS_MASK = 3 << 0,
/* OpenFlow 1.4. */
OFPTC14_EVICTION = 1 << 2, /* Allow table to evict flows. */
OFPTC14_VACANCY_EVENTS = 1 << 3, /* Enable vacancy events. */
};
#endif /* openflow/openflow-common.h */