diff options
79 files changed, 84 insertions, 83 deletions
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index a6343d26e..67c164d09 100644 --- 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 b/include/openvswitch/ofpbuf.h index 2acca4818..bc25bb8a1 100644 --- a/lib/ofpbuf.h +++ b/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 index a1d36978f..7b829d0db 100644 --- 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 \ @@ -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 index 09a8eb9a6..0626cb29b 100644 --- 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 index 6f4507819..5f7003127 100644 --- 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 index f25c32c57..119dc2dd4 100644 --- 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 index 6ac973ed4..015ba20e0 100644 --- 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 index 33783e1de..a784de7bd 100644 --- 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 index c1e50adeb..1112b4a2d 100644 --- 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 index fe67351b2..effb827a9 100644 --- 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 index 3b23a878c..7c445b218 100644 --- 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 index 7758943f8..edc86fa1a 100644 --- 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 index 994a27cb4..3f5b60879 100644 --- 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 index ab91632f5..c21ffe78a 100644 --- 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 index bd01c35a8..47a3c6252 100644 --- 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 index 04a1ee10b..f75259c1b 100644 --- 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 index 4db5e3ccf..c2b4f7bf5 100644 --- 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 index 88e986c5c..cad949096 100644 --- 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 index 992528b2e..f73fc7d99 100644 --- 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 index a2be59d02..5d8a147f1 100644 --- 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 index fcd2e5704..9f0f452dd 100644 --- 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 index b53de4e68..b4689ccf4 100644 --- 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 index 20ad381b7..aac4ff098 100644 --- 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 index f20dcdbdd..ec0409636 100644 --- 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 index 9f623c0fa..0cfea4f18 100644 --- 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 index e938ba13d..13f6bd6be 100644 --- 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 index fe55cbc36..69050cfad 100644 --- 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 index 618f8b085..4f66d88f0 100644 --- 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 index 772913810..71d1bef40 100644 --- 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 index 22ebce6e4..3019c4a95 100644 --- 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 index bfed74508..6de4c6336 100644 --- 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 index f45f9fdbf..2d095dc73 100644 --- 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 index 9768e4636..5643c1028 100644 --- 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 index 280bc6caf..907a90785 100644 --- 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 index 1c95933c9..f4d8f220f 100644 --- 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; @@ -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 index 6ef9803a5..bf80fc8a4 100644 --- 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 index f6602b266..3fc69c1a4 100644 --- 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 index 12e03db0a..f399d04d0 100644 --- 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 index 37cf3ce69..f52c4fa7a 100644 --- 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 index 2858462be..33f1388a2 100644 --- 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 index e63489211..50a127f42 100644 --- 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" diff --git a/lib/vlog.c b/lib/vlog.c index 6babdca0e..30b5bc2ca 100644 --- a/lib/vlog.c +++ b/lib/vlog.c @@ -32,7 +32,7 @@ #include "coverage.h" #include "dirs.h" #include "openvswitch/dynamic-string.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovs-thread.h" #include "sat-math.h" #include "socket-util.h" diff --git a/ofproto/bond.c b/ofproto/bond.c index e5b2fdf77..f668a24f1 100644 --- a/ofproto/bond.c +++ b/ofproto/bond.c @@ -25,7 +25,7 @@ #include "ofp-util.h" #include "ofp-actions.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto/ofproto-provider.h" #include "ofproto/ofproto-dpif.h" #include "ofproto/ofproto-dpif-rid.h" @@ -38,7 +38,7 @@ #include "openvswitch/list.h" #include "netdev.h" #include "odp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "packets.h" #include "dp-packet.h" #include "poll-loop.h" diff --git a/ofproto/bundles.c b/ofproto/bundles.c index 85ea79fc5..e31cf03da 100644 --- a/ofproto/bundles.c +++ b/ofproto/bundles.c @@ -25,7 +25,7 @@ #include "ofp-actions.h" #include "ofp-msgs.h" #include "ofp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto-provider.h" #include "pinsched.h" #include "poll-loop.h" diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 326d10e4e..a7f40a21e 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -29,7 +29,7 @@ #include "ofp-actions.h" #include "ofp-msgs.h" #include "ofp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto-provider.h" #include "pinsched.h" #include "poll-loop.h" diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c index a288054e2..3a41ac5cb 100644 --- a/ofproto/fail-open.c +++ b/ofproto/fail-open.c @@ -23,7 +23,7 @@ #include "flow.h" #include "mac-learning.h" #include "odp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofp-actions.h" #include "ofp-util.h" #include "ofproto.h" diff --git a/ofproto/in-band.c b/ofproto/in-band.c index ea7e31596..9c0499909 100644 --- a/ofproto/in-band.c +++ b/ofproto/in-band.c @@ -31,7 +31,7 @@ #include "odp-util.h" #include "ofp-actions.h" #include "ofproto.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto-provider.h" #include "openflow/openflow.h" #include "packets.h" diff --git a/ofproto/netflow.c b/ofproto/netflow.c index f1b6fbe2d..55f781497 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -25,7 +25,7 @@ #include "dpif.h" #include "flow.h" #include "lib/netflow.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto.h" #include "ofproto/netflow.h" #include "packets.h" diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 4607fc348..46d0bb196 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/ofproto/ofproto-dpif-ipfix.c @@ -23,7 +23,7 @@ #include "hash.h" #include "hmap.h" #include "openvswitch/list.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto.h" #include "ofproto-dpif.h" #include "dp-packet.h" diff --git a/ofproto/ofproto-dpif-monitor.c b/ofproto/ofproto-dpif-monitor.c index 054840016..ace4e735c 100644 --- a/ofproto/ofproto-dpif-monitor.c +++ b/ofproto/ofproto-dpif-monitor.c @@ -27,7 +27,7 @@ #include "heap.h" #include "hmap.h" #include "latch.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto-dpif.h" #include "ovs-lldp.h" #include "ovs-thread.h" diff --git a/ofproto/ofproto-dpif-rid.c b/ofproto/ofproto-dpif-rid.c index 67027c1cf..b3f64f99e 100644 --- a/ofproto/ofproto-dpif-rid.c +++ b/ofproto/ofproto-dpif-rid.c @@ -16,7 +16,7 @@ #include <config.h> -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto-dpif.h" #include "ofproto-dpif-rid.h" #include "ofproto-provider.h" diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c index df915ff7d..fbc82b735 100644 --- a/ofproto/ofproto-dpif-sflow.c +++ b/ofproto/ofproto-dpif-sflow.c @@ -29,7 +29,7 @@ #include "hmap.h" #include "netdev.h" #include "netlink.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto.h" #include "packets.h" #include "poll-loop.h" diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c index 55e6b4cac..2612b7d72 100644 --- a/ofproto/ofproto-dpif-upcall.c +++ b/ofproto/ofproto-dpif-upcall.c @@ -29,7 +29,7 @@ #include "latch.h" #include "openvswitch/list.h" #include "netlink.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto-dpif-ipfix.h" #include "ofproto-dpif-sflow.h" #include "ofproto-dpif-xlate.h" diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h index 640ed4b53..cf9932cf1 100644 --- a/ofproto/ofproto-dpif-xlate.h +++ b/ofproto/ofproto-dpif-xlate.h @@ -19,7 +19,7 @@ #include "flow.h" #include "meta-flow.h" #include "odp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto-dpif-mirror.h" #include "ofproto-dpif-rid.h" #include "ofproto-dpif.h" diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 409672600..99c96de60 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -48,7 +48,7 @@ #include "odp-util.h" #include "odp-execute.h" #include "ofp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofp-actions.h" #include "ofp-print.h" #include "ofproto-dpif-ipfix.h" diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 82559d21d..6e74e5efd 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -38,7 +38,7 @@ #include "ofp-msgs.h" #include "ofp-print.h" #include "ofp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto-provider.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c index 469ba2342..4b2dfd898 100644 --- a/ofproto/pinsched.c +++ b/ofproto/pinsched.c @@ -24,7 +24,7 @@ #include "flow.h" #include "hash.h" #include "hmap.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "poll-loop.h" #include "random.h" diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index 6f307ff43..743099449 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -27,7 +27,7 @@ #include "hmap.h" #include "netdev.h" #include "odp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "packets.h" #include "route-table.h" #include "seq.h" diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c index 0614a5452..33ff2f1b7 100644 --- a/ovn/controller/lflow.c +++ b/ovn/controller/lflow.c @@ -19,7 +19,7 @@ #include "openvswitch/dynamic-string.h" #include "ofctrl.h" #include "ofp-actions.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" #include "ovn-controller.h" #include "ovn/lib/actions.h" diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index a1e5d50d1..55ca98dd2 100644 --- a/ovn/controller/ofctrl.c +++ b/ovn/controller/ofctrl.c @@ -23,7 +23,7 @@ #include "ofp-msgs.h" #include "ofp-print.h" #include "ofp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "openvswitch/vlog.h" #include "ovn-controller.h" diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index 657c3e2b0..b6996644c 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -19,7 +19,7 @@ #include "match.h" #include "ofctrl.h" #include "ofp-actions.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovn-controller.h" #include "ovn/lib/ovn-sb-idl.h" #include "openvswitch/vlog.h" diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c index 6f67b93e5..44957c7cd 100644 --- a/ovn/lib/actions.c +++ b/ovn/lib/actions.c @@ -24,7 +24,7 @@ #include "lex.h" #include "logical-fields.h" #include "ofp-actions.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "simap.h" /* Context maintained during actions_parse(). */ diff --git a/tests/test-bundle.c b/tests/test-bundle.c index 4f6eb0c1f..d19c23a4a 100644 --- a/tests/test-bundle.c +++ b/tests/test-bundle.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include "flow.h" #include "ofp-actions.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovstest.h" #include "util.h" diff --git a/tests/test-flows.c b/tests/test-flows.c index 0e8b148bf..89c7ac0be 100644 --- a/tests/test-flows.c +++ b/tests/test-flows.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <string.h> #include "classifier.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofp-print.h" #include "ofp-util.h" #include "openflow/openflow.h" diff --git a/tests/test-netflow.c b/tests/test-netflow.c index fa0920e2d..6d199ba30 100644 --- a/tests/test-netflow.c +++ b/tests/test-netflow.c @@ -25,7 +25,7 @@ #include "command-line.h" #include "daemon.h" #include "openvswitch/dynamic-string.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovstest.h" #include "packets.h" #include "poll-loop.h" diff --git a/tests/test-odp.c b/tests/test-odp.c index 9a2e520da..b1e20c3e9 100644 --- a/tests/test-odp.c +++ b/tests/test-odp.c @@ -21,7 +21,7 @@ #include "openvswitch/dynamic-string.h" #include "flow.h" #include "match.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovstest.h" #include "util.h" #include "openvswitch/ofp-parse.h" diff --git a/tests/test-ofpbuf.c b/tests/test-ofpbuf.c index d88fefef5..3d7fab90f 100644 --- a/tests/test-ofpbuf.c +++ b/tests/test-ofpbuf.c @@ -17,7 +17,7 @@ #include <config.h> #undef NDEBUG #include <stdio.h> -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovstest.h" #include "util.h" diff --git a/tests/test-ovn.c b/tests/test-ovn.c index 19a19ed2f..92906922c 100644 --- a/tests/test-ovn.c +++ b/tests/test-ovn.c @@ -23,7 +23,7 @@ #include "fatal-signal.h" #include "match.h" #include "ofp-actions.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovn/lib/actions.h" #include "ovn/lib/expr.h" #include "ovn/lib/lex.h" diff --git a/tests/test-rstp.c b/tests/test-rstp.c index 3eca15c0b..2ee8c7ea0 100644 --- a/tests/test-rstp.c +++ b/tests/test-rstp.c @@ -7,7 +7,7 @@ #include <inttypes.h> #include <stdarg.h> #include <stdlib.h> -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovstest.h" #include "dp-packet.h" #include "packets.h" diff --git a/tests/test-sflow.c b/tests/test-sflow.c index aa003fd64..60870dff0 100644 --- a/tests/test-sflow.c +++ b/tests/test-sflow.c @@ -28,7 +28,7 @@ #include "command-line.h" #include "daemon.h" #include "openvswitch/dynamic-string.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovstest.h" #include "packets.h" #include "poll-loop.h" diff --git a/tests/test-stp.c b/tests/test-stp.c index ce3b689b8..c072108c7 100644 --- a/tests/test-stp.c +++ b/tests/test-stp.c @@ -24,7 +24,7 @@ #include <stdarg.h> #include <stdlib.h> #include "dp-packet.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovstest.h" #include "packets.h" #include "openvswitch/vlog.h" diff --git a/tests/test-vconn.c b/tests/test-vconn.c index 17f4c1a38..2dbffff9b 100644 --- a/tests/test-vconn.c +++ b/tests/test-vconn.c @@ -27,7 +27,7 @@ #include "fatal-signal.h" #include "ofp-msgs.h" #include "ofp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "ovstest.h" #include "poll-loop.h" diff --git a/utilities/nlmon.c b/utilities/nlmon.c index 9baa1c283..2e16222cb 100644 --- a/utilities/nlmon.c +++ b/utilities/nlmon.c @@ -25,7 +25,7 @@ #include <linux/rtnetlink.h> #include "netlink.h" #include "netlink-socket.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "poll-loop.h" #include "timeval.h" #include "util.h" diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index ff8cb99be..6fbf361f3 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -45,7 +45,7 @@ #include "ofp-print.h" #include "ofp-util.h" #include "ofp-version-opt.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto/ofproto.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" diff --git a/utilities/ovs-testcontroller.c b/utilities/ovs-testcontroller.c index 550c33111..386826653 100644 --- a/utilities/ovs-testcontroller.c +++ b/utilities/ovs-testcontroller.c @@ -30,7 +30,7 @@ #include "fatal-signal.h" #include "learning-switch.h" #include "ofp-version-opt.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "poll-loop.h" #include "rconn.h" diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index fc58da7ee..cfe313b4a 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -43,7 +43,7 @@ #include "nx-match.h" #include "ofp-print.h" #include "ofp-util.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ofproto/bond.h" #include "ofproto/ofproto.h" #include "ovs-numa.h" diff --git a/vswitchd/system-stats.c b/vswitchd/system-stats.c index e83b659f6..df4971eaf 100644 --- a/vswitchd/system-stats.c +++ b/vswitchd/system-stats.c @@ -36,7 +36,7 @@ #include "openvswitch/dynamic-string.h" #include "json.h" #include "latch.h" -#include "ofpbuf.h" +#include "openvswitch/ofpbuf.h" #include "ovs-thread.h" #include "poll-loop.h" #include "shash.h" |