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

Disable OF1.4 in ovs-vswitchd and ovs-ofctl without specially enabling.

Browse Source 
When the OF1.4 is made safe, so that receiving an unimplemented message
cannot crash the switch, this commit should be reverted.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2014-03-23 14:47:47 -07:00
parent c37c03826c
commit ecb229bebb
10 changed files with 202 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ofp-util.c
View File

@@ -651,12 +651,16 @@ struct proto_abbrev {
};
/* Most users really don't care about some of the differences between
* protocols. These abbreviations help with that. */
* protocols. These abbreviations help with that.
*
* Until it is safe to use the OpenFlow 1.4 protocol (which currently can
* cause aborts due to unimplemented features), we omit OpenFlow 1.4 from all
* abbrevations. */
static const struct proto_abbrev proto_abbrevs[] = {
{ OFPUTIL_P_ANY, "any" },
{ OFPUTIL_P_OF10_STD_ANY, "OpenFlow10" },
{ OFPUTIL_P_OF10_NXM_ANY, "NXM" },
{ OFPUTIL_P_ANY_OXM, "OXM" },
{ OFPUTIL_P_ANY & ~OFPUTIL_P_OF14_OXM, "any" },
{ OFPUTIL_P_OF10_STD_ANY & ~OFPUTIL_P_OF14_OXM, "OpenFlow10" },
{ OFPUTIL_P_OF10_NXM_ANY & ~OFPUTIL_P_OF14_OXM, "NXM" },
{ OFPUTIL_P_ANY_OXM & ~OFPUTIL_P_OF14_OXM, "OXM" },
};
#define N_PROTO_ABBREVS ARRAY_SIZE(proto_abbrevs)