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 <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
nicboul · Apr 14, 2016 · f424833 · f424833
1 parent ae06a56
commit f424833
Show file tree

Hide file tree

Showing 50 changed files with 58 additions and 48 deletions.
diff --git 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
@@ -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 → include/openvswitch/ofp-util.h b/lib/ofp-util.h → 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 <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -20,7 +20,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include "ofp-util.h"
+#include "openvswitch/ofp-util.h"
 
 struct ofpbuf;
 struct rconn;

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 #include <config.h>
 #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
@@ -3,7 +3,7 @@
 
 #include <openflow/openflow-common.h>
 #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
@@ -19,7 +19,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #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
@@ -22,7 +22,7 @@
 #include <string.h>
 #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
@@ -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
@@ -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
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,22 +14,25 @@
  */
 
 #include <config.h>
+#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"
 #include "ovn-controller.h"
 #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
@@ -15,6 +15,8 @@
 
 #include <config.h>
 #include "physical.h"
+#include "byte-order.h"
+#include "flow.h"
 #include "lflow.h"
 #include "openvswitch/match.h"
 #include "ofctrl.h"