From 7888d2a6cdc77a45b4247db322df64fe9211a1bb Mon Sep 17 00:00:00 2001 From: Ben Warren Date: Fri, 25 Mar 2016 14:10:23 -0700 Subject: [PATCH] Move ofp-parse.h to include/openvswitch directory Signed-off-by: Ben Warren Signed-off-by: Ben Pfaff --- include/openvswitch/automake.mk | 1 + {lib => include/openvswitch}/ofp-parse.h | 6 +++--- lib/automake.mk | 1 - lib/dpctl.c | 2 +- lib/learning-switch.c | 2 +- lib/ofp-actions.c | 2 +- lib/ofp-parse.c | 3 +-- ofproto/ofproto-dpif.c | 2 +- tests/test-odp.c | 2 +- utilities/ovs-dpctl.c | 2 +- utilities/ovs-ofctl.c | 2 +- utilities/ovs-testcontroller.c | 2 +- 12 files changed, 13 insertions(+), 14 deletions(-) rename {lib => include/openvswitch}/ofp-parse.h (97%) diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index 08dc889f4..a6343d26e 100644 --- a/include/openvswitch/automake.mk +++ b/include/openvswitch/automake.mk @@ -5,6 +5,7 @@ openvswitchinclude_HEADERS = \ include/openvswitch/geneve.h \ include/openvswitch/list.h \ include/openvswitch/ofp-errors.h \ + include/openvswitch/ofp-parse.h \ include/openvswitch/thread.h \ include/openvswitch/token-bucket.h \ include/openvswitch/types.h \ diff --git a/lib/ofp-parse.h b/include/openvswitch/ofp-parse.h similarity index 97% rename from lib/ofp-parse.h rename to include/openvswitch/ofp-parse.h index e1ebee7c4..1ab509528 100644 --- a/lib/ofp-parse.h +++ b/include/openvswitch/ofp-parse.h @@ -16,13 +16,13 @@ /* OpenFlow protocol string to flow parser. */ -#ifndef OFP_PARSE_H -#define OFP_PARSE_H 1 +#ifndef OPENVSWITCH_OFP_PARSE_H +#define OPENVSWITCH_OFP_PARSE_H 1 #include #include #include -#include "compiler.h" +#include "openvswitch/compiler.h" #include "openvswitch/types.h" struct flow; diff --git a/lib/automake.mk b/lib/automake.mk index 3eae15b65..a1d36978f 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -145,7 +145,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/ofp-msgs.c \ lib/ofp-msgs.h \ lib/ofp-parse.c \ - lib/ofp-parse.h \ lib/ofp-print.c \ lib/ofp-print.h \ lib/ofp-prop.c \ diff --git a/lib/dpctl.c b/lib/dpctl.c index 854190f73..6f4507819 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -39,7 +39,6 @@ #include "netdev-dpdk.h" #include "netlink.h" #include "odp-util.h" -#include "ofp-parse.h" #include "ofpbuf.h" #include "ovs-numa.h" #include "packets.h" @@ -50,6 +49,7 @@ #include "timeval.h" #include "unixctl.h" #include "util.h" +#include "openvswitch/ofp-parse.h" typedef int dpctl_command_handler(int argc, const char *argv[], struct dpctl_params *); diff --git a/lib/learning-switch.c b/lib/learning-switch.c index d9e284d2f..3b23a878c 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -32,7 +32,6 @@ #include "ofpbuf.h" #include "ofp-actions.h" #include "ofp-msgs.h" -#include "ofp-parse.h" #include "ofp-print.h" #include "ofp-util.h" #include "openflow/openflow.h" @@ -42,6 +41,7 @@ #include "simap.h" #include "timeval.h" #include "openvswitch/ofp-errors.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vconn.h" #include "openvswitch/vlog.h" diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 98227f720..20ad381b7 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -30,12 +30,12 @@ #include "multipath.h" #include "nx-match.h" #include "odp-netlink.h" -#include "ofp-parse.h" #include "ofp-prop.h" #include "ofp-util.h" #include "ofpbuf.h" #include "unaligned.h" #include "util.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ofp_actions); diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 9b6db3a32..e938ba13d 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -16,8 +16,6 @@ #include -#include "ofp-parse.h" - #include #include #include @@ -38,6 +36,7 @@ #include "packets.h" #include "simap.h" #include "socket-util.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vconn.h" /* Parses 'str' as an 8-bit unsigned integer into '*valuep'. diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 261dc7b2e..409672600 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -50,7 +50,6 @@ #include "ofp-util.h" #include "ofpbuf.h" #include "ofp-actions.h" -#include "ofp-parse.h" #include "ofp-print.h" #include "ofproto-dpif-ipfix.h" #include "ofproto-dpif-mirror.h" @@ -70,6 +69,7 @@ #include "unaligned.h" #include "unixctl.h" #include "vlan-bitmap.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ofproto_dpif); diff --git a/tests/test-odp.c b/tests/test-odp.c index c1ea00a34..9a2e520da 100644 --- a/tests/test-odp.c +++ b/tests/test-odp.c @@ -21,10 +21,10 @@ #include "openvswitch/dynamic-string.h" #include "flow.h" #include "match.h" -#include "ofp-parse.h" #include "ofpbuf.h" #include "ovstest.h" #include "util.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vlog.h" static int diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index 89a5a60a9..ba7fb8ed3 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -36,10 +36,10 @@ #include "dpctl.h" #include "fatal-signal.h" #include "odp-util.h" -#include "ofp-parse.h" #include "packets.h" #include "timeval.h" #include "util.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vlog.h" static struct dpctl_params dpctl_p; diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index bd6d8482f..ff8cb99be 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -42,7 +42,6 @@ #include "odp-util.h" #include "ofp-actions.h" #include "ofp-msgs.h" -#include "ofp-parse.h" #include "ofp-print.h" #include "ofp-util.h" #include "ofp-version-opt.h" @@ -61,6 +60,7 @@ #include "unixctl.h" #include "util.h" #include "openvswitch/ofp-errors.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vconn.h" #include "openvswitch/vlog.h" #include "meta-flow.h" diff --git a/utilities/ovs-testcontroller.c b/utilities/ovs-testcontroller.c index 60cc32f1c..550c33111 100644 --- a/utilities/ovs-testcontroller.c +++ b/utilities/ovs-testcontroller.c @@ -29,7 +29,6 @@ #include "daemon.h" #include "fatal-signal.h" #include "learning-switch.h" -#include "ofp-parse.h" #include "ofp-version-opt.h" #include "ofpbuf.h" #include "openflow/openflow.h" @@ -40,6 +39,7 @@ #include "timeval.h" #include "unixctl.h" #include "util.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vconn.h" #include "openvswitch/vlog.h" #include "socket-util.h" -- 2.20.1