[ovs-git] Open vSwitch: meta-flow: Use OXM-defined constant for TCP flags in OpenFlow 1.5. (master)

dev at openvswitch.org dev at openvswitch.org
Wed May 14 18:05:15 UTC 2014


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  52ca734e820d6b183aba5ca1c7d714f3c7e7a781 (commit)
       via  9d84066c6dd18d5066fc6b8c54adad0c6d9a7cf2 (commit)
       via  5e10215d5de38a5d5a5b1df1767dd803026b7313 (commit)
       via  70ae4f930cf99d0604f5e724f8f79bf08d11f263 (commit)
       via  19187a715fcaf09840cbf9e994972152d0cb9880 (commit)
       via  42dccab5501bded63bdce95aac1b84ffb789fd1d (commit)
       via  aa233d5772c21c7190fd8aa51b33d37ba35dec42 (commit)
       via  13e1aff8b96166af5283e21a10d2d7cc7896dc6a (commit)
       via  942130c5f8b910ef2ea92541721a0eb5d438110e (commit)
       via  1bb2cdbef2dbbd946fb3f8e82417303ae801c2f8 (commit)
       via  5469537be57efb7c49c848706fbe16772c11771d (commit)
       via  37ab26e80c9510c0c5c0c184b381149afbdeb05a (commit)
       via  18cc69d926518d53d3bbdeaff3f3b164a7fe4c5f (commit)
       via  8c3cc78538c22db9f78abbd374503a2e9034ac0a (commit)
       via  6b0f20ac52a8652e716808bb5d704624fd5f0d3a (commit)
       via  9a4eddbb6e7b570c9acc2b11a9f7e18183e6d98a (commit)
       via  9b77a3364471bfb72279db08dec700e54c579f86 (commit)
       via  e28ac5cf361eabee7a224954b99229b379496a8b (commit)
       via  ab12d917764c1ae0c036144a053faba8eccf885c (commit)
       via  fca6d553da248dac1b03f7f3741c85b031cae6c4 (commit)
       via  226cb5bf14e5df6c5b427715b605635890907cd0 (commit)
       via  2ddc1f1d4fbb2ddf7419ac233a65543357d961a0 (commit)
      from  97a360ced33fe81e29a585aa29b3c7c90c916835 (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 52ca734e820d6b183aba5ca1c7d714f3c7e7a781
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=52ca734e820d6b183aba5ca1c7d714f3c7e7a781
Author: Ben Pfaff <blp at nicira.com>
		
meta-flow: Use OXM-defined constant for TCP flags in OpenFlow 1.5.
		
This also adds the definitions of a few other OXM headers we didn't have
yet.

EXT-109.
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 9d84066c6dd18d5066fc6b8c54adad0c6d9a7cf2
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=9d84066c6dd18d5066fc6b8c54adad0c6d9a7cf2
Author: Ben Pfaff <blp at nicira.com>
		
meta-flow: Encode OXM version information into struct mf_field.
		
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 5e10215d5de38a5d5a5b1df1767dd803026b7313
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=5e10215d5de38a5d5a5b1df1767dd803026b7313
Author: Ben Pfaff <blp at nicira.com>
		
nx-match: Refactor nxm_put_ip() to handle all IPv4 and IPv6 fields.
		
Until now, some fields have been handled in the caller, and the caller has
been responsible for distinguishing ICMPv4 from ICMPv6.  This
implementation seems to make the code a little easier to understand.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 70ae4f930cf99d0604f5e724f8f79bf08d11f263
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=70ae4f930cf99d0604f5e724f8f79bf08d11f263
Author: Ben Pfaff <blp at nicira.com>
		
Implement OpenFlow 1.5 port desc stats request.
		
OpenFlow 1.4 and earlier always send the description of every port in
response to an OFPMP_PORT_DESC request.  OpenFlow 1.5 proposes allowing
the controller to request a description of a single port.  This commit
implements a prototype.

EXT-69.
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 19187a715fcaf09840cbf9e994972152d0cb9880
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=19187a715fcaf09840cbf9e994972152d0cb9880
Author: Ben Pfaff <blp at nicira.com>
		
Implement OpenFlow 1.5 group desc stats request.
		
OpenFlow 1.4 and earlier always send the description of every group in
response to an OFPMP_GROUP_DESC request.  OpenFlow 1.5 proposes allowing
the controller to request a description of a single group.  This commit
implements a prototype.

EXT-69.
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 42dccab5501bded63bdce95aac1b84ffb789fd1d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=42dccab5501bded63bdce95aac1b84ffb789fd1d
Author: Ben Pfaff <blp at nicira.com>
		
Add skeleton for OF1.5 support.
		
This allows OF1.5 prototyping to take place in a natural way.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit aa233d5772c21c7190fd8aa51b33d37ba35dec42
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=aa233d5772c21c7190fd8aa51b33d37ba35dec42
Author: Ben Pfaff <blp at nicira.com>
		
Remove --enable-of14 option because the implementation is now safe.
		
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 13e1aff8b96166af5283e21a10d2d7cc7896dc6a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=13e1aff8b96166af5283e21a10d2d7cc7896dc6a
Author: Ben Pfaff <blp at nicira.com>
		
ofp-util: Remove ofputil_get_phy_port_size().
		
The size is not fixed for OpenFLow 1.4 and later, so it's a little
deceptive to return any particular value.  This function was only used in
one place, so move it inline there.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 942130c5f8b910ef2ea92541721a0eb5d438110e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=942130c5f8b910ef2ea92541721a0eb5d438110e
Author: Ben Pfaff <blp at nicira.com>
		
ofp-util: Simplify ofputil_decode_switch_features().
		
It does not need to check the size, because the decoder in ofp-msgs.c
checks for a valid size.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 1bb2cdbef2dbbd946fb3f8e82417303ae801c2f8
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=1bb2cdbef2dbbd946fb3f8e82417303ae801c2f8
Author: Ben Pfaff <blp at nicira.com>
		
Implement OpenFlow 1.4 queue statistics.
		
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 5469537be57efb7c49c848706fbe16772c11771d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=5469537be57efb7c49c848706fbe16772c11771d
Author: Ben Pfaff <blp at nicira.com>
		
Implement OpenFlow 1.4 port statistics.
		
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 37ab26e80c9510c0c5c0c184b381149afbdeb05a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=37ab26e80c9510c0c5c0c184b381149afbdeb05a
Author: Ben Pfaff <blp at nicira.com>
		
Implement basic OpenFlow 1.4 table-mod message.
		
Vacancy events and eviction are not yet implemented--see OPENFLOW-1.1+.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 18cc69d926518d53d3bbdeaff3f3b164a7fe4c5f
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=18cc69d926518d53d3bbdeaff3f3b164a7fe4c5f
Author: Ben Pfaff <blp at nicira.com>
		
Implement OpenFlow 1.4 port_mod messages.
		
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 8c3cc78538c22db9f78abbd374503a2e9034ac0a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=8c3cc78538c22db9f78abbd374503a2e9034ac0a
Author: Ben Pfaff <blp at nicira.com>
		
ofp-util: Implement OpenFlow 1.4 port status and port desc reply messages.
		
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 6b0f20ac52a8652e716808bb5d704624fd5f0d3a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6b0f20ac52a8652e716808bb5d704624fd5f0d3a
Author: Ben Pfaff <blp at nicira.com>
		
ofp-util: Reduce duplicate code.
		
ofputil_put_phy_port() and ofputil_append_port_desc_stats_reply() had a
lot of code duplication.  This reduces it: it deletes some specialized
code from ofputil_put_phy_port(), moving it into its caller
ofputil_put_switch_features_port() that actually needed it.  That change
then allows ofputil_append_port_desc_stats_reply() to become a simple
wrapper around ofputil_put_phy_port().

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 9a4eddbb6e7b570c9acc2b11a9f7e18183e6d98a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=9a4eddbb6e7b570c9acc2b11a9f7e18183e6d98a
Author: Ben Pfaff <blp at nicira.com>
		
ofp-util: Generalize functions for parsing OF1.3+ properties.
		
The main effect is to move these functions a little earlier in the file.

Also, OpenFlow 1.4 changed the table-features specific error codes to new
values that apply to all property sets, so this commit updates the error
code names and adds the appropriate OpenFlow 1.4+ codes.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 9b77a3364471bfb72279db08dec700e54c579f86
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=9b77a3364471bfb72279db08dec700e54c579f86
Author: Ben Pfaff <blp at nicira.com>
		
ofp-util: Remove ofputil_count_phy_ports().
		
It's harder to calculate the number of ports in a given amount of space in
OpenFlow 1.4 and later, because the ofp_port structure becomes variable
length in those versions.  This commit removes the one caller, replacing
it by a version that doesn't need to know the number of ports in advance.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit e28ac5cf361eabee7a224954b99229b379496a8b
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e28ac5cf361eabee7a224954b99229b379496a8b
Author: Ben Pfaff <blp at nicira.com>
		
ofp-msgs: New functions ofpmp_version() and ofpmp_decode_raw().
		
Each of these allows code in ofp-util.c to be simplified.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit ab12d917764c1ae0c036144a053faba8eccf885c
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=ab12d917764c1ae0c036144a053faba8eccf885c
Author: Ben Pfaff <blp at nicira.com>
		
ofp-util: Fix definition of OFPUTIL_P_OF13_UP.
		
It should include OF1.4.

Signed-off-by: Ben Pfaff <blp at nicira.com>


commit fca6d553da248dac1b03f7f3741c85b031cae6c4
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=fca6d553da248dac1b03f7f3741c85b031cae6c4
Author: Ben Pfaff <blp at nicira.com>
		
ovs-ofctl: Fix port lookup and "ovs-ofctl" behavior for OpenFlow 1.3+.
		
ovs-ofctl supports using port names in commands that operate on ports.  It
does this by connecting to the switch, listing the ports, and picking out
the one with the specified name.  However, this didn't work properly for
OpenFlow 1.3+, because it always used an OFPT_FEATURES_REQUEST to list the
ports, and in OpenFlow 1.3+ the reply to this request does not include a
list of ports.  This commit fixes the problem (using code that previously
was just a fallback when there were too many ports to fit in an
OFPT_FEATURES_REPLY).

For similar reasons, "ovs-ofctl show" wasn't listing the switch's ports
when it connected to a switch over OpenFlow 1.3 or later.  This commit
fixes that bug also.

Signed-off-by: Ben Pfaff <blp at nicira.com>

Conflicts:
	utilities/ovs-ofctl.c


commit 226cb5bf14e5df6c5b427715b605635890907cd0
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=226cb5bf14e5df6c5b427715b605635890907cd0
Author: Ben Pfaff <blp at nicira.com>
		
AUTHORS: Add Ashwin Swaminathan.
		
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 2ddc1f1d4fbb2ddf7419ac233a65543357d961a0
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=2ddc1f1d4fbb2ddf7419ac233a65543357d961a0
Author: Anoob Soman <anoob.soman at citrix.com>
		
ofproto-dpif-xlate: Fix null pointer dereference
		
actions (in xlate_actions__) would be NULL when xlate_actions()
is called from packet_out()->ofproto_dpif_execute_actions().
This causes a NULL pointer to be dereferenced when
ctx.xbridge->netflow is set.

Signed-off-by: Anoob Soman <anoob.soman at citrix.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


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

Summary of changes:
 AUTHORS                            |    2 +
 FAQ                                |   44 +-
 build-aux/extract-ofp-errors       |    3 +-
 build-aux/extract-ofp-msgs         |   52 ++-
 include/openflow/openflow-1.2.h    |   15 +-
 include/openflow/openflow-1.4.h    |  188 +++++++-
 include/openflow/openflow-common.h |   11 +-
 lib/meta-flow.c                    |  122 ++---
 lib/meta-flow.h                    |   13 +-
 lib/nx-match.c                     |  186 ++++----
 lib/nx-match.h                     |    2 +-
 lib/ofp-actions.c                  |    7 +-
 lib/ofp-errors.c                   |    2 +
 lib/ofp-errors.h                   |   46 +-
 lib/ofp-msgs.c                     |   32 +-
 lib/ofp-msgs.h                     |   63 ++-
 lib/ofp-print.c                    |   67 ++-
 lib/ofp-util.c                     |  863 ++++++++++++++++++++++++++----------
 lib/ofp-util.h                     |   39 +-
 ofproto/ofproto-dpif-xlate.c       |    3 -
 ofproto/ofproto.c                  |  131 +++---
 tests/learn.at                     |    8 +-
 tests/ofp-errors.at                |    2 +
 tests/ofp-print.at                 |  142 +++++-
 tests/ofproto-macros.at            |    4 +-
 tests/ofproto.at                   |  101 +++++
 tests/ovs-ofctl.at                 |  246 +++++-----
 utilities/ovs-ofctl.8.in           |   44 +-
 utilities/ovs-ofctl.c              |  147 +++---
 vswitchd/bridge.c                  |   23 +-
 vswitchd/bridge.h                  |    2 -
 vswitchd/ovs-vswitchd.8.in         |   10 -
 vswitchd/ovs-vswitchd.c            |    7 -
 vswitchd/vswitch.ovsschema         |    7 +-
 vswitchd/vswitch.xml               |   18 +-
 35 files changed, 1859 insertions(+), 793 deletions(-)


hooks/post-receive
-- 
Open vSwitch



More information about the git mailing list