ofproto.c has grown too large and unwieldy. This series removes well over 1000 lines of code from it, primarily by factoring all of its OpenFlow connection management logic into a new "connmgr" object.
Ben Pfaff (15): ofproto: Don't include unneeded header file. ofproto: Fix comment on send_packet_in(). ofproto: Fix obsolete comments. ofproto: Get rid of archaic "switch status" OpenFlow extension. ofproto: Remove controller discovery support. ofproto: Factor building of flow_removed messages out into ofp-util. ofproto: Break packet_in encoding out of ofproto into ofp-util. ofproto: Move hton_ofp_phy_port() to ofp-util. ofproto: Introduce ofconn_get_ofproto() accessor function. ofproto: Use ofconn_send_reply() for sending OpenFlow replies. ofproto: Add ofconn_get_flow_format(), ofconn_set_flow_format(). ofproto: Add ofconn_get_miss_send_len(), ofconn_set_miss_send_len(). ofproto: Add functions to get and set ofconn type and role. ofproto: New function ofconn_pktbuf_retrieve(). ofproto: Factor OpenFlow connection management into new "connmgr". INSTALL.OpenFlow | 20 +- debian/openvswitch-controller.README.Debian | 8 +- debian/openvswitch-switch.install | 1 - debian/openvswitch-switch.manpages | 1 - include/openflow/nicira-ext.h | 11 +- lib/automake.mk | 5 +- lib/dhcp-client.c | 1105 ---------------------- lib/dhcp-client.h | 57 -- lib/dhcp.c | 824 ----------------- lib/dhcp.h | 220 +----- lib/learning-switch.c | 4 +- lib/netdev-provider.h | 14 +- lib/ofp-print.c | 17 - lib/ofp-util.c | 113 +++- lib/ofp-util.h | 21 +- lib/rconn.c | 44 - lib/rconn.h | 3 +- ofproto/automake.mk | 10 +- ofproto/connmgr.c | 1316 +++++++++++++++++++++++++++ ofproto/connmgr.h | 123 +++ ofproto/discovery.c | 295 ------ ofproto/discovery.h | 40 - ofproto/fail-open.c | 160 +--- ofproto/fail-open.h | 8 +- ofproto/in-band.c | 51 +- ofproto/in-band.h | 20 +- ofproto/ofproto.c | 1265 +++----------------------- ofproto/ofproto.h | 6 +- ofproto/pinsched.c | 24 +- ofproto/pinsched.h | 6 +- ofproto/status.c | 229 ----- ofproto/status.h | 44 - tests/.gitignore | 1 - tests/automake.mk | 6 - tests/ofp-print.at | 23 - tests/test-dhcp-client.c | 184 ---- utilities/.gitignore | 2 - utilities/automake.mk | 7 - utilities/ovs-appctl.8.in | 3 +- utilities/ovs-discover.8.in | 118 --- utilities/ovs-discover.c | 403 -------- utilities/ovs-ofctl.8.in | 7 - utilities/ovs-ofctl.c | 32 - utilities/ovs-openflowd.8.in | 122 +--- utilities/ovs-openflowd.c | 45 +- vswitchd/bridge.c | 9 - vswitchd/vswitch.ovsschema | 8 +- vswitchd/vswitch.xml | 48 +- xenserver/openvswitch-xen.spec | 2 - 49 files changed, 1781 insertions(+), 5304 deletions(-) delete mode 100644 lib/dhcp-client.c delete mode 100644 lib/dhcp-client.h delete mode 100644 lib/dhcp.c create mode 100644 ofproto/connmgr.c create mode 100644 ofproto/connmgr.h delete mode 100644 ofproto/discovery.c delete mode 100644 ofproto/discovery.h delete mode 100644 ofproto/status.c delete mode 100644 ofproto/status.h delete mode 100644 tests/test-dhcp-client.c delete mode 100644 utilities/ovs-discover.8.in delete mode 100644 utilities/ovs-discover.c _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
