Move lib/ofpbuf.h to include/openvswitch directory

Signed-off-by: Ben Warren <[email protected]> Acked-by: Ryan Moats <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
dkarhi · Mar 30, 2016 · 64c9677 · 64c9677
1 parent 7888d2a
commit 64c9677
Show file tree

Hide file tree

Showing 79 changed files with 84 additions and 83 deletions.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -4,6 +4,7 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/dynamic-string.h \
 	include/openvswitch/geneve.h \
 	include/openvswitch/list.h \
+	include/openvswitch/ofpbuf.h \
 	include/openvswitch/ofp-errors.h \
 	include/openvswitch/ofp-parse.h \
 	include/openvswitch/thread.h \

diff --git a/lib/ofpbuf.h → include/openvswitch/ofpbuf.h b/lib/ofpbuf.h → include/openvswitch/ofpbuf.h
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-#ifndef OFPBUF_H
-#define OFPBUF_H 1
+#ifndef OPENVSWITCH_OFPBUF_H
+#define OPENVSWITCH_OFPBUF_H 1
 
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include "openvswitch/dynamic-string.h"
 #include "openvswitch/list.h"
-#include "util.h"
-
-struct ds;
+#include "openvswitch/util.h"
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/lib/automake.mk b/lib/automake.mk
@@ -154,7 +154,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/ofp-version-opt.h \
 	lib/ofp-version-opt.c \
 	lib/ofpbuf.c \
-	lib/ofpbuf.h \
 	lib/ovs-atomic-c11.h \
 	lib/ovs-atomic-clang.h \
 	lib/ovs-atomic-flag-gcc4.7+.h \

diff --git a/lib/bfd.c b/lib/bfd.c
@@ -33,7 +33,7 @@
 #include "openvswitch/list.h"
 #include "netdev.h"
 #include "odp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-thread.h"
 #include "openvswitch/types.h"
 #include "packets.h"

diff --git a/lib/bundle.c b/lib/bundle.c
@@ -25,7 +25,7 @@
 #include "multipath.h"
 #include "meta-flow.h"
 #include "nx-match.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ofp-actions.h"
 #include "ofp-util.h"
 #include "openflow/nicira-ext.h"

diff --git a/lib/dpctl.c b/lib/dpctl.c
@@ -39,7 +39,7 @@
 #include "netdev-dpdk.h"
 #include "netlink.h"
 #include "odp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-numa.h"
 #include "packets.h"
 #include "shash.h"

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -53,7 +53,7 @@
 #include "odp-execute.h"
 #include "odp-util.h"
 #include "ofp-print.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-numa.h"
 #include "ovs-rcu.h"
 #include "packets.h"

diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
@@ -45,7 +45,7 @@
 #include "netlink-socket.h"
 #include "netlink.h"
 #include "odp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "random.h"

diff --git a/lib/dpif.c b/lib/dpif.c
@@ -35,7 +35,7 @@
 #include "odp-util.h"
 #include "ofp-print.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "route-table.h"

diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
@@ -25,7 +25,7 @@
 #include "fatal-signal.h"
 #include "json.h"
 #include "openvswitch/list.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-thread.h"
 #include "poll-loop.h"
 #include "reconnect.h"

diff --git a/lib/learn.c b/lib/learn.c
@@ -26,7 +26,7 @@
 #include "nx-match.h"
 #include "ofp-actions.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "openvswitch/ofp-errors.h"
 #include "unaligned.h"

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
@@ -29,7 +29,7 @@
 #include "flow.h"
 #include "hmap.h"
 #include "mac-learning.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ofp-actions.h"
 #include "ofp-msgs.h"
 #include "ofp-print.h"

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
@@ -29,7 +29,7 @@
 #include "netdev-vport.h"
 #include "odp-util.h"
 #include "ofp-print.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-atomic.h"
 #include "packets.h"
 #include "pcap-file.h"

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
@@ -61,7 +61,7 @@
 #include "netlink-notifier.h"
 #include "netlink-socket.h"
 #include "netlink.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "ovs-atomic.h"
 #include "packets.h"

diff --git a/lib/netdev-windows.c b/lib/netdev-windows.c
@@ -24,7 +24,7 @@
 #include "coverage.h"
 #include "fatal-signal.h"
 #include "netdev-provider.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "shash.h"

diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c
@@ -30,7 +30,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "netlink.h"
 #include "netlink-socket.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
 #include "poll-loop.h"
 #include "timeval.h"

diff --git a/lib/netlink-conntrack.h b/lib/netlink-conntrack.h
@@ -22,7 +22,7 @@
 #include "ct-dpif.h"
 #include "openvswitch/dynamic-string.h"
 #include "hmap.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "timeval.h"
 #include "unixctl.h"
 #include "util.h"

diff --git a/lib/netlink-notifier.c b/lib/netlink-notifier.c
@@ -25,7 +25,7 @@
 #include "coverage.h"
 #include "netlink.h"
 #include "netlink-socket.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netlink_notifier);

diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
@@ -29,7 +29,7 @@
 #include "netlink.h"
 #include "netlink-protocol.h"
 #include "odp-netlink.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-thread.h"
 #include "poll-loop.h"
 #include "seq.h"

diff --git a/lib/netlink-socket.h b/lib/netlink-socket.h
@@ -193,7 +193,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-atomic.h"
 #include "ovs-thread.h"
 

diff --git a/lib/netlink.c b/lib/netlink.c
@@ -23,7 +23,7 @@
 #include "coverage.h"
 #include "flow.h"
 #include "netlink-protocol.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "timeval.h"
 #include "unaligned.h"
 #include "openvswitch/vlog.h"

diff --git a/lib/nx-match.c b/lib/nx-match.c
@@ -27,7 +27,7 @@
 #include "meta-flow.h"
 #include "ofp-actions.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/nicira-ext.h"
 #include "packets.h"
 #include "shash.h"

diff --git a/lib/odp-util.c b/lib/odp-util.c
@@ -32,7 +32,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "netlink.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "packets.h"
 #include "simap.h"
 #include "timeval.h"

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
@@ -32,7 +32,7 @@
 #include "odp-netlink.h"
 #include "ofp-prop.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "unaligned.h"
 #include "util.h"
 #include "openvswitch/ofp-parse.h"

diff --git a/lib/ofp-errors.c b/lib/ofp-errors.c
@@ -20,7 +20,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "ofp-msgs.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"

diff --git a/lib/ofp-msgs.c b/lib/ofp-msgs.c
@@ -20,7 +20,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "hmap.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/nicira-ext.h"
 #include "openflow/openflow.h"
 #include "ovs-thread.h"

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
@@ -30,7 +30,7 @@
 #include "nx-match.h"
 #include "ofp-actions.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "ovs-thread.h"
 #include "packets.h"

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
@@ -38,7 +38,7 @@
 #include "netdev.h"
 #include "nx-match.h"
 #include "ofp-actions.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ofp-msgs.h"
 #include "ofp-util.h"
 #include "openflow/openflow.h"

diff --git a/lib/ofp-prop.c b/lib/ofp-prop.c
@@ -19,7 +19,7 @@
 #include "ofp-prop.h"
 
 #include "byte-order.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 #include "util.h"

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
@@ -37,7 +37,7 @@
 #include "ofp-msgs.h"
 #include "ofp-prop.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/netronome-ext.h"
 #include "packets.h"
 #include "pktbuf.h"

diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c
@@ -15,7 +15,7 @@
  */
 
 #include <config.h>
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include <stdlib.h>
 #include <string.h>
 #include "openvswitch/dynamic-string.h"

diff --git a/lib/rconn.c b/lib/rconn.c
@@ -23,7 +23,7 @@
 #include "coverage.h"
 #include "ofp-msgs.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "poll-loop.h"
 #include "sat-math.h"

diff --git a/lib/route-table.c b/lib/route-table.c
@@ -28,7 +28,7 @@
 #include "netlink.h"
 #include "netlink-notifier.h"
 #include "netlink-socket.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-router.h"
 #include "packets.h"
 #include "rtnetlink.h"

diff --git a/lib/rstp-state-machines.c b/lib/rstp-state-machines.c
@@ -38,7 +38,7 @@
 #include <sys/types.h>
 #include "byte-order.h"
 #include "connectivity.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "dp-packet.h"
 #include "packets.h"
 #include "seq.h"

diff --git a/lib/rstp.c b/lib/rstp.c
@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #include "byte-order.h"
 #include "connectivity.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ofproto/ofproto.h"
 #include "dp-packet.h"
 #include "packets.h"

diff --git a/lib/rtnetlink.c b/lib/rtnetlink.c
@@ -24,7 +24,7 @@
 
 #include "netlink.h"
 #include "netlink-notifier.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "packets.h"
 
 static struct nln *nln = NULL;

diff --git a/lib/stp.c b/lib/stp.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include "byte-order.h"
 #include "connectivity.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-atomic.h"
 #include "dp-packet.h"
 #include "packets.h"

diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
@@ -35,7 +35,7 @@
 #include "coverage.h"
 #include "openvswitch/dynamic-string.h"
 #include "entropy.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "packets.h"
 #include "poll-loop.h"

diff --git a/lib/stream.c b/lib/stream.c
@@ -28,7 +28,7 @@
 #include "flow.h"
 #include "jsonrpc.h"
 #include "ofp-print.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/nicira-ext.h"
 #include "openflow/openflow.h"
 #include "ovs-thread.h"

diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c
@@ -27,7 +27,7 @@
 #include "hash.h"
 #include "openvswitch/list.h"
 #include "netdev.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "ovs-thread.h"
 #include "odp-util.h"
 #include "ovs-thread.h"

diff --git a/lib/tun-metadata.h b/lib/tun-metadata.h
@@ -21,7 +21,7 @@
 
 #include "openvswitch/dynamic-string.h"
 #include "netlink.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "openvswitch/geneve.h"
 

diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include "fatal-signal.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "poll-loop.h"
 #include "socket-util.h"

diff --git a/lib/vconn.c b/lib/vconn.c
@@ -29,7 +29,7 @@
 #include "ofp-msgs.h"
 #include "ofp-print.h"
 #include "ofp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
 #include "openflow/nicira-ext.h"
 #include "openflow/openflow.h"
 #include "packets.h"