From f4248336590110dbefa5a1494d21859b5c00c693 Mon Sep 17 00:00:00 2001 From: Ben Warren Date: Mon, 4 Apr 2016 21:32:09 -0400 Subject: [PATCH] Move lib/ofp-util.h to include/openvswitch directory This commit also adds several #include directives in source files in order to make the 'ofp-util.h' move possible Signed-off-by: Ben Warren Signed-off-by: Ben Pfaff --- OPENFLOW-1.1+.md | 2 +- include/openvswitch/automake.mk | 1 + {lib => include/openvswitch}/ofp-util.h | 11 +++++------ lib/automake.mk | 1 - lib/bundle.c | 2 +- lib/classifier.c | 2 +- lib/dpif.c | 2 +- lib/learn.c | 2 +- lib/learning-switch.c | 2 +- lib/learning-switch.h | 2 +- lib/match.c | 2 +- lib/meta-flow.c | 2 +- lib/multipath.c | 2 +- lib/nx-match.c | 2 +- lib/ofp-actions.c | 2 +- lib/ofp-actions.h | 2 +- lib/ofp-errors.c | 2 +- lib/ofp-parse.c | 2 +- lib/ofp-print.c | 2 +- lib/ofp-util.c | 2 +- lib/ofp-version-opt.c | 2 +- lib/ofp-version-opt.h | 2 +- lib/pktbuf.c | 2 +- lib/rconn.c | 2 +- lib/tun-metadata.c | 2 +- lib/vconn.c | 2 +- ofproto/bond.c | 2 +- ofproto/bundles.c | 2 +- ofproto/bundles.h | 2 +- ofproto/connmgr.c | 2 +- ofproto/connmgr.h | 2 +- ofproto/fail-open.c | 2 +- ofproto/ofproto-dpif-ipfix.c | 1 + ofproto/ofproto-dpif.c | 2 +- ofproto/ofproto-dpif.h | 2 +- ofproto/ofproto-provider.h | 2 +- ofproto/ofproto.c | 2 +- ovn/controller/ofctrl.c | 5 ++++- ovn/controller/physical.c | 2 ++ ovn/controller/pinctrl.c | 3 ++- ovn/lib/actions.c | 1 + ovn/lib/expr.c | 1 + tests/test-classifier.c | 2 +- tests/test-flows.c | 2 +- tests/test-ovn.c | 1 + tests/test-ovsdb.c | 1 + tests/test-vconn.c | 2 +- utilities/ovs-ofctl.c | 2 +- utilities/ovs-testcontroller.c | 2 +- vswitchd/bridge.c | 2 +- 50 files changed, 58 insertions(+), 48 deletions(-) rename {lib => include/openvswitch}/ofp-util.h (99%) diff --git a/OPENFLOW-1.1+.md b/OPENFLOW-1.1+.md index 62ebddcd6..a22273d93 100644 --- a/OPENFLOW-1.1+.md +++ b/OPENFLOW-1.1+.md @@ -21,7 +21,7 @@ The primary approach to compatibility is to abstract most of the details of the differences from the core code, by adding a protocol layer that translates between OF1.x and a slightly higher-level abstract representation. The core of this approach is the many struct -ofputil_* structures in lib/ofp-util.h. +ofputil_* structures in include/openvswitch/ofp-util.h. As a consequence of this approach, OVS cannot use OpenFlow protocol definitions that closely resemble those in the OpenFlow specification, diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index a96daff4c..9c8e38582 100644 --- a/include/openvswitch/automake.mk +++ b/include/openvswitch/automake.mk @@ -11,6 +11,7 @@ openvswitchinclude_HEADERS = \ include/openvswitch/ofpbuf.h \ include/openvswitch/ofp-errors.h \ include/openvswitch/ofp-parse.h \ + include/openvswitch/ofp-util.h \ include/openvswitch/packets.h \ include/openvswitch/thread.h \ include/openvswitch/token-bucket.h \ diff --git a/lib/ofp-util.h b/include/openvswitch/ofp-util.h similarity index 99% rename from lib/ofp-util.h rename to include/openvswitch/ofp-util.h index 2a849ec04..16efc0abe 100644 --- a/lib/ofp-util.h +++ b/include/openvswitch/ofp-util.h @@ -14,24 +14,23 @@ * limitations under the License. */ -#ifndef OFP_UTIL_H -#define OFP_UTIL_H 1 +#ifndef OPENVSWITCH_OFP_UTIL_H +#define OPENVSWITCH_OFP_UTIL_H 1 #include #include #include -#include "bitmap.h" -#include "compiler.h" #include "openvswitch/flow.h" #include "openvswitch/list.h" #include "openvswitch/match.h" #include "openvswitch/meta-flow.h" -#include "netdev.h" +#include "openvswitch/netdev.h" #include "openflow/netronome-ext.h" #include "openflow/nicira-ext.h" +#include "openvswitch/ofpbuf.h" #include "openvswitch/types.h" #include "openvswitch/type-props.h" -#include "uuid.h" +#include "openvswitch/uuid.h" struct ofpbuf; union ofp_action; diff --git a/lib/automake.mk b/lib/automake.mk index cd6043c29..541fe5412 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -148,7 +148,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/ofp-prop.c \ lib/ofp-prop.h \ lib/ofp-util.c \ - lib/ofp-util.h \ lib/ofp-version-opt.h \ lib/ofp-version-opt.c \ lib/ofpbuf.c \ diff --git a/lib/bundle.c b/lib/bundle.c index 31c73c690..022ac687c 100644 --- a/lib/bundle.c +++ b/lib/bundle.c @@ -27,7 +27,7 @@ #include "nx-match.h" #include "openvswitch/ofpbuf.h" #include "ofp-actions.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openflow/nicira-ext.h" #include "openvswitch/ofp-errors.h" #include "openvswitch/vlog.h" diff --git a/lib/classifier.c b/lib/classifier.c index 8bc6353fe..b30ae6627 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -22,7 +22,7 @@ #include "byte-order.h" #include "openvswitch/dynamic-string.h" #include "odp-util.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "packets.h" #include "util.h" #include "openvswitch/vlog.h" diff --git a/lib/dpif.c b/lib/dpif.c index a784de7bd..1cf894cae 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -34,7 +34,7 @@ #include "odp-execute.h" #include "odp-util.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "packets.h" #include "poll-loop.h" diff --git a/lib/learn.c b/lib/learn.c index 3aff2e6d1..fca49a33a 100644 --- a/lib/learn.c +++ b/lib/learn.c @@ -25,7 +25,7 @@ #include "openvswitch/meta-flow.h" #include "nx-match.h" #include "ofp-actions.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "openvswitch/ofp-errors.h" diff --git a/lib/learning-switch.c b/lib/learning-switch.c index 7c445b218..931798316 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -33,7 +33,7 @@ #include "ofp-actions.h" #include "ofp-msgs.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openflow/openflow.h" #include "poll-loop.h" #include "rconn.h" diff --git a/lib/learning-switch.h b/lib/learning-switch.h index b3a5d13ea..847e4beae 100644 --- a/lib/learning-switch.h +++ b/lib/learning-switch.h @@ -20,7 +20,7 @@ #include #include #include -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" struct ofpbuf; struct rconn; diff --git a/lib/match.c b/lib/match.c index 42955b804..052130a62 100644 --- a/lib/match.c +++ b/lib/match.c @@ -21,7 +21,7 @@ #include "byte-order.h" #include "colors.h" #include "openvswitch/dynamic-string.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "packets.h" #include "tun-metadata.h" diff --git a/lib/meta-flow.c b/lib/meta-flow.c index cb96bf71a..1a0caeb00 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -26,7 +26,7 @@ #include "classifier.h" #include "openvswitch/dynamic-string.h" #include "nx-match.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ovs-thread.h" #include "packets.h" #include "random.h" diff --git a/lib/multipath.c b/lib/multipath.c index 485190192..21cbfb0ff 100644 --- a/lib/multipath.c +++ b/lib/multipath.c @@ -25,7 +25,7 @@ #include "openvswitch/dynamic-string.h" #include "nx-match.h" #include "ofp-actions.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofp-errors.h" #include "openflow/nicira-ext.h" #include "packets.h" diff --git a/lib/nx-match.c b/lib/nx-match.c index 4732ea886..91f59431c 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -26,7 +26,7 @@ #include "hmap.h" #include "openvswitch/meta-flow.h" #include "ofp-actions.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/nicira-ext.h" #include "packets.h" diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index d8659e0d7..283749ec5 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -31,7 +31,7 @@ #include "nx-match.h" #include "odp-netlink.h" #include "ofp-prop.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "unaligned.h" #include "util.h" diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h index ebfc3d963..77c385af2 100644 --- a/lib/ofp-actions.h +++ b/lib/ofp-actions.h @@ -20,7 +20,7 @@ #include #include #include "openvswitch/meta-flow.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openflow/openflow.h" #include "openflow/nicira-ext.h" #include "openvswitch/ofp-errors.h" diff --git a/lib/ofp-errors.c b/lib/ofp-errors.c index ec0409636..c6a92e29c 100644 --- a/lib/ofp-errors.c +++ b/lib/ofp-errors.c @@ -19,7 +19,7 @@ #include "byte-order.h" #include "openvswitch/dynamic-string.h" #include "ofp-msgs.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "openvswitch/ofp-errors.h" diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 015b7a58b..e4400001b 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -29,7 +29,7 @@ #include "netdev.h" #include "nx-match.h" #include "ofp-actions.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "ovs-thread.h" diff --git a/lib/ofp-print.c b/lib/ofp-print.c index c38c4f478..16a075169 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -40,7 +40,7 @@ #include "ofp-actions.h" #include "openvswitch/ofpbuf.h" #include "ofp-msgs.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openflow/openflow.h" #include "openflow/nicira-ext.h" #include "openvswitch/ofp-errors.h" diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 69ae39cf3..8bcac7f98 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -36,7 +36,7 @@ #include "ofp-actions.h" #include "ofp-msgs.h" #include "ofp-prop.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/netronome-ext.h" #include "packets.h" diff --git a/lib/ofp-version-opt.c b/lib/ofp-version-opt.c index aaa58271c..89e33fa97 100644 --- a/lib/ofp-version-opt.c +++ b/lib/ofp-version-opt.c @@ -1,6 +1,6 @@ #include #include "openvswitch/dynamic-string.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ofp-version-opt.h" #include "ovs-thread.h" diff --git a/lib/ofp-version-opt.h b/lib/ofp-version-opt.h index 82b4ccce7..5c8e7b866 100644 --- a/lib/ofp-version-opt.h +++ b/lib/ofp-version-opt.h @@ -3,7 +3,7 @@ #include #include "util.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #define OFP_VERSION_LONG_OPTIONS \ {"version", no_argument, NULL, 'V'}, \ diff --git a/lib/pktbuf.c b/lib/pktbuf.c index 0ff2c6f84..e2c61fd4d 100644 --- a/lib/pktbuf.c +++ b/lib/pktbuf.c @@ -19,7 +19,7 @@ #include #include #include "coverage.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "dp-packet.h" #include "timeval.h" #include "util.h" diff --git a/lib/rconn.c b/lib/rconn.c index 6de4c6336..b765111b6 100644 --- a/lib/rconn.c +++ b/lib/rconn.c @@ -22,7 +22,7 @@ #include #include "coverage.h" #include "ofp-msgs.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "poll-loop.h" diff --git a/lib/tun-metadata.c b/lib/tun-metadata.c index 77688701d..a773aea03 100644 --- a/lib/tun-metadata.c +++ b/lib/tun-metadata.c @@ -24,7 +24,7 @@ #include "openvswitch/match.h" #include "nx-match.h" #include "odp-netlink.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ovs-thread.h" #include "ovs-rcu.h" #include "packets.h" diff --git a/lib/vconn.c b/lib/vconn.c index 50a127f42..d406bf3f9 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -28,7 +28,7 @@ #include "flow.h" #include "ofp-msgs.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" diff --git a/ofproto/bond.c b/ofproto/bond.c index 27c4c922b..4cb1c834e 100644 --- a/ofproto/bond.c +++ b/ofproto/bond.c @@ -23,7 +23,7 @@ #include #include -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ofp-actions.h" #include "openvswitch/ofpbuf.h" #include "ofproto/ofproto-provider.h" diff --git a/ofproto/bundles.c b/ofproto/bundles.c index e31cf03da..e55918ce2 100644 --- a/ofproto/bundles.c +++ b/ofproto/bundles.c @@ -24,7 +24,7 @@ #include "odp-util.h" #include "ofp-actions.h" #include "ofp-msgs.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "ofproto-provider.h" #include "pinsched.h" diff --git a/ofproto/bundles.h b/ofproto/bundles.h index 1b2e3337b..7e412d73f 100644 --- a/ofproto/bundles.h +++ b/ofproto/bundles.h @@ -23,7 +23,7 @@ #include "connmgr.h" #include "ofp-msgs.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ofproto-provider.h" #include "util.h" diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index a7f40a21e..5c13ac306 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -28,7 +28,7 @@ #include "odp-util.h" #include "ofp-actions.h" #include "ofp-msgs.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "ofproto-provider.h" #include "pinsched.h" diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h index 5b424994b..30e7ae52c 100644 --- a/ofproto/connmgr.h +++ b/ofproto/connmgr.h @@ -21,7 +21,7 @@ #include "hmap.h" #include "openvswitch/list.h" #include "openvswitch/match.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ofproto.h" #include "ofproto-provider.h" #include "openflow/nicira-ext.h" diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c index 3a41ac5cb..68a83fa96 100644 --- a/ofproto/fail-open.c +++ b/ofproto/fail-open.c @@ -25,7 +25,7 @@ #include "odp-util.h" #include "openvswitch/ofpbuf.h" #include "ofp-actions.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ofproto.h" #include "ofproto-provider.h" #include "pktbuf.h" diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 46d0bb196..6d088a6f2 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/ofproto/ofproto-dpif-ipfix.c @@ -22,6 +22,7 @@ #include "flow.h" #include "hash.h" #include "hmap.h" +#include "netdev.h" #include "openvswitch/list.h" #include "openvswitch/ofpbuf.h" #include "ofproto.h" diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 23b417871..99ed72381 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -47,7 +47,7 @@ #include "nx-match.h" #include "odp-util.h" #include "odp-execute.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "ofp-actions.h" #include "ofp-print.h" diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h index 0064178dc..91bf463b0 100644 --- a/ofproto/ofproto-dpif.h +++ b/ofproto/ofproto-dpif.h @@ -20,7 +20,7 @@ #include "fail-open.h" #include "hmapx.h" #include "odp-util.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ovs-thread.h" #include "ofproto-provider.h" #include "timer.h" diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h index 9373a2cb1..9d1a4b1b3 100644 --- a/ofproto/ofproto-provider.h +++ b/ofproto/ofproto-provider.h @@ -40,7 +40,7 @@ #include "hindex.h" #include "openvswitch/list.h" #include "ofp-actions.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ofproto/ofproto.h" #include "openvswitch/ofp-errors.h" #include "ovs-atomic.h" diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 72b1d348a..1ce765de3 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -37,7 +37,7 @@ #include "ofp-actions.h" #include "ofp-msgs.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "ofproto-provider.h" #include "openflow/nicira-ext.h" diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index b0f0932ae..77c8b4a5b 100644 --- a/ovn/controller/ofctrl.c +++ b/ovn/controller/ofctrl.c @@ -14,15 +14,17 @@ */ #include +#include "byte-order.h" #include "ofctrl.h" #include "dirs.h" +#include "hash.h" #include "openvswitch/dynamic-string.h" #include "hmap.h" #include "openvswitch/match.h" #include "ofp-actions.h" #include "ofp-msgs.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "openvswitch/vlog.h" @@ -30,6 +32,7 @@ #include "physical.h" #include "rconn.h" #include "socket-util.h" +#include "util.h" #include "vswitch-idl.h" VLOG_DEFINE_THIS_MODULE(ofctrl); diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index 3276e2e9b..85708d42f 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -15,6 +15,8 @@ #include #include "physical.h" +#include "byte-order.h" +#include "flow.h" #include "lflow.h" #include "openvswitch/match.h" #include "ofctrl.h" diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 3fcab9945..e440a8844 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -20,13 +20,14 @@ #include "coverage.h" #include "dirs.h" #include "dp-packet.h" +#include "flow.h" #include "lport.h" #include "ofp-actions.h" #include "ovn/lib/actions.h" #include "ovn/lib/logical-fields.h" #include "ofp-msgs.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ovn/lib/actions.h" #include "rconn.h" #include "openvswitch/vlog.h" diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c index 88822b5ab..92807f8f2 100644 --- a/ovn/lib/actions.c +++ b/ovn/lib/actions.c @@ -18,6 +18,7 @@ #include "actions.h" #include #include +#include "byte-order.h" #include "compiler.h" #include "openvswitch/dynamic-string.h" #include "expr.h" diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c index c4a600fda..b3c7ce36a 100644 --- a/ovn/lib/expr.c +++ b/ovn/lib/expr.c @@ -15,6 +15,7 @@ */ #include +#include "byte-order.h" #include "expr.h" #include "openvswitch/dynamic-string.h" #include "json.h" diff --git a/tests/test-classifier.c b/tests/test-classifier.c index fbd4b7b59..0242f6aa2 100644 --- a/tests/test-classifier.c +++ b/tests/test-classifier.c @@ -36,7 +36,7 @@ #include "command-line.h" #include "fatal-signal.h" #include "flow.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ovstest.h" #include "ovs-atomic.h" #include "ovs-thread.h" diff --git a/tests/test-flows.c b/tests/test-flows.c index 89c7ac0be..040953b79 100644 --- a/tests/test-flows.c +++ b/tests/test-flows.c @@ -24,7 +24,7 @@ #include "classifier.h" #include "openvswitch/ofpbuf.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openflow/openflow.h" #include "ovstest.h" #include "dp-packet.h" diff --git a/tests/test-ovn.c b/tests/test-ovn.c index 52e0ac322..fae105f07 100644 --- a/tests/test-ovn.c +++ b/tests/test-ovn.c @@ -21,6 +21,7 @@ #include #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" +#include "flow.h" #include "openvswitch/match.h" #include "ofp-actions.h" #include "openvswitch/ofpbuf.h" diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index e6af72982..dbb6897cb 100644 --- a/tests/test-ovsdb.c +++ b/tests/test-ovsdb.c @@ -23,6 +23,7 @@ #include #include +#include "byte-order.h" #include "command-line.h" #include "openvswitch/dynamic-string.h" #include "json.h" diff --git a/tests/test-vconn.c b/tests/test-vconn.c index 2dbffff9b..be53c3d02 100644 --- a/tests/test-vconn.c +++ b/tests/test-vconn.c @@ -26,7 +26,7 @@ #include "command-line.h" #include "fatal-signal.h" #include "ofp-msgs.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "ovstest.h" diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 37432b1aa..52405d0e3 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -43,7 +43,7 @@ #include "ofp-actions.h" #include "ofp-msgs.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "ofp-version-opt.h" #include "openvswitch/ofpbuf.h" #include "ofproto/ofproto.h" diff --git a/utilities/ovs-testcontroller.c b/utilities/ovs-testcontroller.c index 386826653..1db3bbe68 100644 --- a/utilities/ovs-testcontroller.c +++ b/utilities/ovs-testcontroller.c @@ -43,7 +43,7 @@ #include "openvswitch/vconn.h" #include "openvswitch/vlog.h" #include "socket-util.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" VLOG_DEFINE_THIS_MODULE(controller); diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index b40ac8311..2c224f540 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -42,7 +42,7 @@ #include "netdev.h" #include "nx-match.h" #include "ofp-print.h" -#include "ofp-util.h" +#include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "ofproto/bond.h" #include "ofproto/ofproto.h" -- 2.20.1