[ovs-dev] [of1.1 draft v2 0/7] of1.1 draft series rebased

Ben Pfaff blp at nicira.com
Fri Feb 3 20:43:48 UTC 2012


This is a revised version of the of1.1 draft series originally
posted starting here:
http://openvswitch.org/pipermail/dev/2011-December/013585.html

A few of the original patches have since been polished up and
committed, so those are not present here.  This is also true
of some parts of the contents of individual patches.  It also
took a good deal of work to rebase this series because of the
amount of churn on master (mostly my fault of course).  Other
than that, there hasn't been a lot of progress, and these
patches are still not ready for final review.

All of these patches pass "make check".

Ben Pfaff (7):
  Introduce ofputil_protocol, to abstract the protocol in use on a
    connection.
  Introduce ofpacts, an abstraction of OpenFlow actions.
  Move content of openflow.h into openflow-1.0.h.
  Begin breaking openflow-1.0.h into common and version-specific
    definitions.
  ofp-util: Add functions for working with OpenFlow 1.1 port numbers.
  Break OFPT_* constants into common value and 1.0- and 1.1-specific
    values.
  Abstract everything that uses ofp_phy_port, add OF1.1 support.

 build-aux/check-structs                         |   51 +-
 include/openflow/automake.mk                    |   32 +-
 include/openflow/{openflow.h => openflow-1.0.h} |  320 ++----
 include/openflow/openflow-1.1.h                 |  188 +++
 include/openflow/openflow-common.h              |  197 ++++
 include/openflow/openflow.h                     |  808 +-------------
 lib/automake.mk                                 |    2 +
 lib/autopath.c                                  |   70 +-
 lib/autopath.h                                  |   14 +-
 lib/bundle.c                                    |  282 +++---
 lib/bundle.h                                    |   25 +-
 lib/learn.c                                     |  626 +++++------
 lib/learn.h                                     |   14 +-
 lib/learning-switch.c                           |   57 +-
 lib/learning-switch.h                           |    8 +-
 lib/multipath.c                                 |  145 ++--
 lib/multipath.h                                 |   17 +-
 lib/netdev-linux.c                              |  115 +-
 lib/netdev-provider.h                           |   13 +-
 lib/netdev.c                                    |   60 +-
 lib/netdev.h                                    |   33 +-
 lib/netlink.c                                   |   45 +-
 lib/netlink.h                                   |    5 +
 lib/nx-match.c                                  |  188 ++--
 lib/nx-match.h                                  |   32 +-
 lib/ofp-actions.c                               |  898 +++++++++++++++
 lib/ofp-actions.h                               |  175 +++
 lib/ofp-errors.h                                |    3 +
 lib/ofp-parse.c                                 |  339 +++---
 lib/ofp-parse.h                                 |   13 +-
 lib/ofp-print.c                                 |  630 +++++------
 lib/ofp-print.h                                 |    3 +-
 lib/ofp-util.c                                  | 1383 +++++++++++++++++------
 lib/ofp-util.def                                |   30 +-
 lib/ofp-util.h                                  |  290 ++++-
 lib/rconn.c                                     |    8 +-
 lib/rconn.h                                     |    1 +
 lib/stream.c                                    |    2 +-
 lib/util.h                                      |    6 +
 lib/vconn.c                                     |   35 +-
 lib/vconn.h                                     |    1 +
 ofproto/connmgr.c                               |   81 +-
 ofproto/connmgr.h                               |   14 +-
 ofproto/fail-open.c                             |   15 +-
 ofproto/in-band.c                               |    4 +-
 ofproto/ofproto-dpif.c                          |  404 +++----
 ofproto/ofproto-provider.h                      |   42 +-
 ofproto/ofproto.c                               |  366 +++---
 tests/autopath.at                               |    8 +-
 tests/learn.at                                  |   21 +-
 tests/ofp-print.at                              |   16 +-
 tests/ofproto.at                                |   24 +-
 tests/ovs-ofctl.at                              |   65 +-
 tests/test-bundle.c                             |   59 +-
 tests/test-multipath.c                          |   11 +-
 tests/test-vconn.c                              |   20 +-
 utilities/ovs-controller.c                      |   41 +-
 utilities/ovs-ofctl.c                           |  535 +++++----
 vswitchd/ovs-vswitchd.c                         |    2 +-
 59 files changed, 5193 insertions(+), 3699 deletions(-)
 copy include/openflow/{openflow.h => openflow-1.0.h} (71%)
 create mode 100644 include/openflow/openflow-1.1.h
 create mode 100644 include/openflow/openflow-common.h
 create mode 100644 lib/ofp-actions.c
 create mode 100644 lib/ofp-actions.h

-- 
1.7.2.5




More information about the dev mailing list