[ovs-git] Open vSwitch: ofp-util: Improve return type of ofputil_decode_packet_in(). (master)

Wed Jun 13 04:26:36 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  f7cc6bd82f5ff86369c5719fdd81420af5ddf0c3 (commit)
       via  c9349648a944248530494b8602934814f86e9491 (commit)
       via  16d659f1f389a25ec231360ba31172efc3a1182b (commit)
       via  ff0b06eef1d7044df8220ccbed718a6fae55fc10 (commit)
       via  c08201d6645520f384bbfee3b490b99af8f2c149 (commit)
       via  410698cf7d0c9364a2ecb61b692e60da737bec78 (commit)
       via  4fba171d21dc15d69af20cfbf4f5a3f34b1f426f (commit)
       via  6c99379ed477e95e3f2fc1ff22149074ba39efc5 (commit)
       via  eec25dc1ae3ed49ad5e2eda0ca04450c4f75d6f7 (commit)
       via  7c00ccb6740ac240c7d50e3631b36553f47eb769 (commit)
      from  790897648eacc8f5effbba88f9e60dab29edcaf5 (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 f7cc6bd82f5ff86369c5719fdd81420af5ddf0c3
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=f7cc6bd82f5ff86369c5719fdd81420af5ddf0c3
Author: Ben Pfaff <blp at nicira.com>

ofp-util: Improve return type of ofputil_decode_packet_in().

"enum ofperr" is clearer than "int".

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

commit c9349648a944248530494b8602934814f86e9491
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=c9349648a944248530494b8602934814f86e9491
Author: Ben Pfaff <blp at nicira.com>

openflow-1.0.h: Clarify meaning of nw_tos in struct ofp_action_nw_tos.

So that I don't have to figure it out yet again.

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

commit 16d659f1f389a25ec231360ba31172efc3a1182b
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=16d659f1f389a25ec231360ba31172efc3a1182b
Author: Ben Pfaff <blp at nicira.com>

ofp-util: Remove unused functions make_add_simple_flow(), make_del_flow().

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

commit ff0b06eef1d7044df8220ccbed718a6fae55fc10
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=ff0b06eef1d7044df8220ccbed718a6fae55fc10
Author: Ben Pfaff <blp at nicira.com>

Allow general masking of IPv6 addresses rather than just CIDR masks.

OF1.2 and later make these fields fully maskable so we might as well also.

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

commit c08201d6645520f384bbfee3b490b99af8f2c149
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=c08201d6645520f384bbfee3b490b99af8f2c149
Author: Ben Pfaff <blp at nicira.com>

Allow general masking of IPv4 addresses rather than just CIDR masks.

OF1.1 and later make these fields fully maskable so we might as well also.

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

commit 410698cf7d0c9364a2ecb61b692e60da737bec78
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=410698cf7d0c9364a2ecb61b692e60da737bec78
Author: Ben Pfaff <blp at nicira.com>

ofp-util: Implement translation to and from OpenFlow 1.1 ofp_match.

This is another step toward OpenFlow 1.1 support.  The change does not
affect any outwardly visible OpenFlow behavior yet.

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

commit 4fba171d21dc15d69af20cfbf4f5a3f34b1f426f
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=4fba171d21dc15d69af20cfbf4f5a3f34b1f426f
Author: Ben Pfaff <blp at nicira.com>

packets: Add ETH_TYPE_MPLS and ETH_TYPE_MPLS_MCAST.

We need these for OpenFlow 1.1 ofp_match support even if we don't support
MPLS matching (which we don't, yet).

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

commit 6c99379ed477e95e3f2fc1ff22149074ba39efc5
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6c99379ed477e95e3f2fc1ff22149074ba39efc5
Author: Ben Pfaff <blp at nicira.com>

packets: Define IPPROTO_SCTP if not provided by <netinet/in.h>.

SUSv3 doesn't require IPPROTO_SCTP so some systems might not provide it.

IPPROTO_SCTP isn't used in the tree yet so this doesn't fix a real bug.

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

commit eec25dc1ae3ed49ad5e2eda0ca04450c4f75d6f7
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=eec25dc1ae3ed49ad5e2eda0ca04450c4f75d6f7
Author: Ben Pfaff <blp at nicira.com>

openflow-1.0: Rename ofp_match to ofp10_match, OFPFW_* to OFPFW10_*.

This better fits our general policy of adding a version number suffix
to structures and constants whose values differ from one OpenFlow
version to the next.

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

commit 7c00ccb6740ac240c7d50e3631b36553f47eb769
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=7c00ccb6740ac240c7d50e3631b36553f47eb769
Author: Ben Pfaff <blp at nicira.com>

openflow-1.1.h: Fix OFPFW11_* definitions.

OFPFW_DL_SRC and OFPFW_DL_DST don't exist in OpenFlow 1.1.  Replace them
by the correct enums.

Most of the change here is due to respacing since DL_VLAN_PCP is one
character wider than any previous name.

This doesn't fix a real bug because these constants didn't have any users
in the tree.

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

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

Summary of changes:
 NEWS                            |    8 +-
 include/openflow/nicira-ext.h   |   18 +-
 include/openflow/openflow-1.0.h |   60 +++---
 include/openflow/openflow-1.1.h |   22 +-
 lib/flow.h                      |    5 +-
 lib/learning-switch.c           |   10 +-
 lib/learning-switch.h           |    2 +-
 lib/meta-flow.c                 |   33 ++--
 lib/meta-flow.h                 |    1 -
 lib/ofp-print.c                 |   44 +++--
 lib/ofp-print.h                 |    6 +-
 lib/ofp-util.c                  |  403 +++++++++++++++++++++++++++++++--------
 lib/ofp-util.h                  |   31 ++--
 lib/packets.c                   |   14 +-
 lib/packets.h                   |    6 +
 ofproto/ofproto-provider.h      |    2 +-
 ofproto/ofproto.c               |    2 +-
 tests/ofp-print.at              |    6 +-
 tests/ovs-ofctl.at              |  337 ++++++++++++++++++++++++++++++++-
 tests/test-flows.c              |   12 +-
 utilities/ovs-controller.c      |    2 +-
 utilities/ovs-ofctl.8.in        |   10 +-
 utilities/ovs-ofctl.c           |   58 ++++++
 23 files changed, 878 insertions(+), 214 deletions(-)

hooks/post-receive
-- 
Open vSwitch