This comprises most of the previously posted "of1.1 draft" series, that is, all of it with the exception of the patch that introduces "ofpacts" translation. It should provide a reasonable base on which to do further OF1.1 (and OF1.2) development.
This series obsoletes the single patch that I posted earlier as: http://openvswitch.org/pipermail/dev/2012-February/014914.html The previous patch comprises patch 2 of the present series. Ben Pfaff (11): ofp-print: Remove unused function ofp_message_type_to_string(). Introduce ofputil_protocol, to abstract the protocol in use on a connection. Move content of openflow.h into openflow-1.0.h. Begin breaking openflow-1.0.h into common and version-specific definitions. ofp-print: Print OpenFlow version number of message, unless it's 1.0. 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. ofp-util: Don't decode some OF1.1 messages as OF1.0 stats messages. netdev: Abstract "features" interface away from OpenFlow 1.0. openflow: Split OFPAT_* into OFPAT10_* and OFPAT11_*. 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} | 308 ++---- include/openflow/openflow-1.1.h | 204 ++++ include/openflow/openflow-common.h | 197 ++++ include/openflow/openflow.h | 808 +--------------- lib/learn.c | 2 +- lib/learning-switch.c | 86 ++- lib/learning-switch.h | 8 +- lib/netdev-linux.c | 115 ++- lib/netdev-provider.h | 13 +- lib/netdev.c | 60 +- lib/netdev.h | 35 +- lib/ofp-errors.h | 3 + lib/ofp-parse.c | 109 +-- lib/ofp-parse.h | 12 +- lib/ofp-print.c | 462 +++++---- lib/ofp-print.h | 4 +- lib/ofp-util.c | 1217 ++++++++++++++++++++--- lib/ofp-util.def | 30 +- lib/ofp-util.h | 269 +++++- lib/rconn.c | 12 +- lib/rconn.h | 1 + lib/stream.c | 2 +- lib/util.h | 14 + lib/vconn.c | 33 +- lib/vconn.h | 1 + ofproto/connmgr.c | 67 +- ofproto/connmgr.h | 12 +- ofproto/fail-open.c | 4 +- ofproto/in-band.c | 4 +- ofproto/ofproto-dpif-sflow.c | 4 +- ofproto/ofproto-dpif.c | 98 +- ofproto/ofproto-provider.h | 30 +- ofproto/ofproto.c | 205 ++-- tests/autopath.at | 8 +- tests/learn.at | 19 +- tests/ofp-print.at | 122 +++- tests/ofproto.at | 30 +- tests/ovs-ofctl.at | 65 +- tests/test-vconn.c | 20 +- utilities/ovs-controller.c | 41 +- utilities/ovs-ofctl.8.in | 62 +- utilities/ovs-ofctl.c | 484 +++++----- vswitchd/bridge.c | 4 +- vswitchd/ovs-vswitchd.c | 2 +- 46 files changed, 3157 insertions(+), 2212 deletions(-) copy include/openflow/{openflow.h => openflow-1.0.h} (72%) create mode 100644 include/openflow/openflow-1.1.h create mode 100644 include/openflow/openflow-common.h -- 1.7.2.5 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
