[ovs-git] Open vSwitch: ofp-util: Update Capabilities for Open Flow 1.2 (master)

dev at openvswitch.org dev at openvswitch.org
Tue Jul 31 04:52:30 UTC 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  6020298704dccb6d3f058ae854d00df77126704c (commit)
       via  3f192f2330cf2630c98b587e7fc5cd93165c5b48 (commit)
       via  d299965a175df682c90fd6e0e08000d53ad09764 (commit)
       via  210d8d9cc1f46d874b9d3a8dc08f8d7dee8ce41d (commit)
       via  2e3fa633aad59f9687e2b6e3aad3b0a308aa89fc (commit)
      from  aa319503aa099030d4e4796710b0ebace8907f2b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6020298704dccb6d3f058ae854d00df77126704c
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6020298704dccb6d3f058ae854d00df77126704c
Author: Simon Horman <horms at verge.net.au>
		
ofp-util: Update Capabilities for Open Flow 1.2
		
There are capabilities which are present in one, two and three
of Open Flow 1.0, 1.1 and 1.2. Update OFPC_COMMON to only include
capabilities that are present in all three Open Flow versions and
add ofputil_capabilities_mask() to return the mask of capabilities
for each version.

This does not cover OFPUTIL_C_STP and OFPUTIL_C_GROUP_STATS, which
both use capability bit 3 and are treated as special cases in
ofputil_encode_switch_features() and ofputil_decode_switch_features().

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 3f192f2330cf2630c98b587e7fc5cd93165c5b48
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=3f192f2330cf2630c98b587e7fc5cd93165c5b48
Author: Simon Horman <horms at verge.net.au>
		
ofp-util: Reduce scope of variables in ofputil_encode_flow_mod()
		
Reduce scope of per-protocol variables in ofputil_encode_flow_mod()

These variables are only needed in one of the cases covered by the switch
statement and will increase in number as more cases (protocols) are
supported.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit d299965a175df682c90fd6e0e08000d53ad09764
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=d299965a175df682c90fd6e0e08000d53ad09764
Author: Simon Horman <horms at verge.net.au>
		
ofp-util: Add of12_action_bits
		
Add action bits for Open Flow 1.2, these are not the same as Open Flow 1.1.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 210d8d9cc1f46d874b9d3a8dc08f8d7dee8ce41d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=210d8d9cc1f46d874b9d3a8dc08f8d7dee8ce41d
Author: Simon Horman <horms at verge.net.au>
		
ofproto: As of Open Flow 1.1 switch_features has no capabilities field
		
In Open Flow 1.0 switch_features has a capabilities field.
However, in Open Flow 1.1, 1.2 and 1.3 this field is reserved.
Thus it should not be read on decode and it seems most appropriate
to set as zero on encode.

This patch takes the approach of setting the features field to
all available features for Open Flow 1.1+. I am unsure if it would
be sufficient to just set it to zero.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 2e3fa633aad59f9687e2b6e3aad3b0a308aa89fc
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=2e3fa633aad59f9687e2b6e3aad3b0a308aa89fc
Author: Simon Horman <horms at verge.net.au>
		
openflow: Add enum ofp_version
		
Use an enum for ofp_version in ofp-util and ofp-msg.
This in conjunction with the use of switch() statements
allows the compiler to warn when a new ofp_version isn't handled.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 include/openflow/openflow-common.h |    8 +-
 lib/ofp-msgs.c                     |   47 ++++++--
 lib/ofp-print.c                    |   18 +++-
 lib/ofp-util.c                     |  211 ++++++++++++++++++++++++++++--------
 lib/ofp-util.h                     |   18 ++-
 lib/vconn-provider.h               |    5 +-
 lib/vconn.c                        |    5 +-
 lib/vconn.h                        |    5 +-
 ofproto/ofproto.c                  |    5 +-
 tests/ofp-print.at                 |   61 ++++++++++-
 10 files changed, 305 insertions(+), 78 deletions(-)


hooks/post-receive
-- 
Open vSwitch



More information about the git mailing list