Move lib/ofp-print.h to include/openvswitch directory

Signed-off-by: Ben Warren <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
orimanabu · Apr 14, 2016 · 25d436f · 25d436f
1 parent 66bd43f
commit 25d436f
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 49 deletions.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -13,6 +13,7 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/ofp-errors.h \
 	include/openvswitch/ofp-msgs.h \
 	include/openvswitch/ofp-parse.h \
+	include/openvswitch/ofp-print.h \
 	include/openvswitch/ofp-prop.h \
 	include/openvswitch/ofp-util.h \
 	include/openvswitch/packets.h \

diff --git a/lib/ofp-print.h → include/openvswitch/ofp-print.h b/lib/ofp-print.h → include/openvswitch/ofp-print.h
@@ -16,8 +16,8 @@
 
 /* OpenFlow protocol pretty-printer. */
 
-#ifndef OFP_PRINT_H
-#define OFP_PRINT_H 1
+#ifndef OPENVSWITCH_OFP_PRINT_H
+#define OPENVSWITCH_OFP_PRINT_H 1
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/lib/automake.mk b/lib/automake.mk
@@ -142,7 +142,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/ofp-msgs.c \
 	lib/ofp-parse.c \
 	lib/ofp-print.c \
-	lib/ofp-print.h \
 	lib/ofp-prop.c \
 	lib/ofp-util.c \
 	lib/ofp-version-opt.h \

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -39,21 +39,22 @@
 #include "dpif.h"
 #include "dpif-provider.h"
 #include "dummy.h"
-#include "openvswitch/dynamic-string.h"
 #include "fat-rwlock.h"
 #include "flow.h"
 #include "hmapx.h"
 #include "latch.h"
-#include "openvswitch/list.h"
-#include "openvswitch/match.h"
 #include "netdev.h"
 #include "netdev-dpdk.h"
 #include "netdev-vport.h"
 #include "netlink.h"
 #include "odp-execute.h"
 #include "odp-util.h"
-#include "ofp-print.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/list.h"
+#include "openvswitch/match.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
 #include "ovs-numa.h"
 #include "ovs-rcu.h"
 #include "packets.h"
@@ -69,8 +70,6 @@
 #include "unixctl.h"
 #include "util.h"
 
-#include "openvswitch/vlog.h"
-
 VLOG_DEFINE_THIS_MODULE(dpif_netdev);
 
 #define FLOW_DUMP_MAX_BATCH 50

diff --git a/lib/dpif.c b/lib/dpif.c
@@ -33,7 +33,7 @@
 #include "netlink.h"
 #include "odp-execute.h"
 #include "odp-util.h"
-#include "ofp-print.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "packets.h"

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

diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
@@ -34,12 +34,13 @@
 #include "dp-packet.h"
 #include "dpif-netdev.h"
 #include "fatal-signal.h"
-#include "openvswitch/list.h"
 #include "netdev-dpdk.h"
 #include "netdev-provider.h"
 #include "netdev-vport.h"
 #include "odp-util.h"
-#include "ofp-print.h"
+#include "openvswitch/list.h"
+#include "openvswitch/ofp-print.h"
+#include "openvswitch/vlog.h"
 #include "ovs-numa.h"
 #include "ovs-thread.h"
 #include "ovs-rcu.h"
@@ -50,7 +51,6 @@
 #include "unaligned.h"
 #include "timeval.h"
 #include "unixctl.h"
-#include "openvswitch/vlog.h"
 
 #include "rte_config.h"
 #include "rte_mbuf.h"

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
@@ -22,14 +22,15 @@
 
 #include "dp-packet.h"
 #include "dpif-netdev.h"
-#include "openvswitch/dynamic-string.h"
 #include "flow.h"
-#include "openvswitch/list.h"
 #include "netdev-provider.h"
 #include "netdev-vport.h"
 #include "odp-util.h"
-#include "ofp-print.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/list.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
 #include "ovs-atomic.h"
 #include "packets.h"
 #include "pcap-file.h"
@@ -41,7 +42,6 @@
 #include "timeval.h"
 #include "unixctl.h"
 #include "reconnect.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netdev_dummy);
 

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
@@ -15,7 +15,6 @@
  */
 
 #include <config.h>
-#include "ofp-print.h"
 
 #include <errno.h>
 #include <inttypes.h>
@@ -30,25 +29,26 @@
 #include "byte-order.h"
 #include "colors.h"
 #include "compiler.h"
+#include "dp-packet.h"
 #include "flow.h"
 #include "learn.h"
 #include "multipath.h"
 #include "netdev.h"
 #include "nx-match.h"
+#include "odp-util.h"
 #include "openflow/nicira-ext.h"
 #include "openflow/openflow.h"
 #include "openvswitch/dynamic-string.h"
 #include "openvswitch/meta-flow.h"
 #include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-msgs.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/type-props.h"
 #include "packets.h"
-#include "dp-packet.h"
 #include "unaligned.h"
-#include "odp-util.h"
 #include "util.h"
 #include "uuid.h"
 

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
@@ -15,14 +15,14 @@
  */
 
 #include <config.h>
-#include "ofp-print.h"
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 #include <stdlib.h>
+#include "bitmap.h"
 #include "bundle.h"
 #include "byte-order.h"
 #include "classifier.h"
@@ -37,6 +37,7 @@
 #include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-msgs.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-prop.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
@@ -47,7 +48,6 @@
 #include "random.h"
 #include "tun-metadata.h"
 #include "unaligned.h"
-#include "bitmap.h"
 #include "uuid.h"
 
 VLOG_DEFINE_THIS_MODULE(ofp_util);

diff --git a/lib/stream.c b/lib/stream.c
@@ -23,21 +23,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include "coverage.h"
-#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "flow.h"
 #include "jsonrpc.h"
-#include "ofp-print.h"
-#include "openvswitch/ofpbuf.h"
 #include "openflow/nicira-ext.h"
 #include "openflow/openflow.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/ofp-print.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
 #include "ovs-thread.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "random.h"
 #include "socket-util.h"
 #include "util.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(stream);
 

diff --git a/lib/vconn.c b/lib/vconn.c
@@ -25,12 +25,12 @@
 #include "coverage.h"
 #include "fatal-signal.h"
 #include "flow.h"
-#include "ofp-print.h"
 #include "openflow/nicira-ext.h"
 #include "openflow/openflow.h"
 #include "openvswitch/dynamic-string.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-msgs.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
@@ -40,7 +40,6 @@
 #include "nx-match.h"
 #include "odp-util.h"
 #include "odp-execute.h"
-#include "ofp-print.h"
 #include "ofproto/ofproto-dpif.h"
 #include "ofproto/ofproto-provider.h"
 #include "ofproto-dpif-ipfix.h"
@@ -54,6 +53,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "openvswitch/meta-flow.h"
 #include "openvswitch/ofp-parse.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
@@ -34,7 +34,6 @@
 #include "hmap.h"
 #include "netdev.h"
 #include "nx-match.h"
-#include "ofp-print.h"
 #include "ofproto.h"
 #include "ofproto-provider.h"
 #include "openflow/nicira-ext.h"
@@ -44,6 +43,7 @@
 #include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-msgs.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"

diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
@@ -19,12 +19,12 @@
 #include "hash.h"
 #include "hmap.h"
 #include "ofctrl.h"
-#include "ofp-print.h"
 #include "openflow/openflow.h"
 #include "openvswitch/dynamic-string.h"
 #include "openvswitch/match.h"
 #include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-msgs.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"

diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c
@@ -22,9 +22,9 @@
 #include "dp-packet.h"
 #include "flow.h"
 #include "lport.h"
-#include "ofp-print.h"
 #include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-msgs.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/vlog.h"
 #include "ovn-controller.h"

diff --git a/tests/test-flows.c b/tests/test-flows.c
@@ -22,16 +22,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include "classifier.h"
-#include "openvswitch/ofpbuf.h"
-#include "ofp-print.h"
-#include "openvswitch/ofp-util.h"
 #include "openflow/openflow.h"
+#include "openvswitch/ofp-print.h"
+#include "openvswitch/ofp-util.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
 #include "ovstest.h"
 #include "dp-packet.h"
 #include "pcap-file.h"
 #include "timeval.h"
 #include "util.h"
-#include "openvswitch/vlog.h"
 
 static void
 test_flows_main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)

diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch
@@ -93,7 +93,7 @@
 +
 +#include "interface.h"
 +#include "openflow/openflow.h"
-+#include "../../lib/ofp-print.h"
++#include "openvswitch/ofp-print.h"
 +
 +void
 +openflow_print(const u_char *sp, u_int length)

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
@@ -40,7 +40,6 @@
 #include "fatal-signal.h"
 #include "nx-match.h"
 #include "odp-util.h"
-#include "ofp-print.h"
 #include "ofp-version-opt.h"
 #include "ofproto/ofproto.h"
 #include "openflow/nicira-ext.h"
@@ -50,6 +49,7 @@
 #include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-msgs.h"
+#include "openvswitch/ofp-print.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofp-parse.h"
 #include "openvswitch/ofpbuf.h"

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
@@ -28,28 +28,31 @@
 #include "daemon.h"
 #include "dirs.h"
 #include "dpif.h"
-#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "hmap.h"
 #include "hmapx.h"
+#include "if-notifier.h"
 #include "jsonrpc.h"
 #include "lacp.h"
-#include "openvswitch/list.h"
-#include "ovs-lldp.h"
 #include "mac-learning.h"
 #include "mcast-snooping.h"
-#include "openvswitch/meta-flow.h"
 #include "netdev.h"
 #include "nx-match.h"
-#include "ofp-print.h"
-#include "openvswitch/ofp-util.h"
-#include "openvswitch/ofpbuf.h"
 #include "ofproto/bond.h"
 #include "ofproto/ofproto.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/list.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-print.h"
+#include "openvswitch/ofp-util.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
+#include "ovs-lldp.h"
 #include "ovs-numa.h"
+#include "packets.h"
 #include "poll-loop.h"
-#include "if-notifier.h"
 #include "seq.h"
+#include "sflow_api.h"
 #include "sha1.h"
 #include "shash.h"
 #include "smap.h"
@@ -64,10 +67,7 @@
 #include "vlandev.h"
 #include "lib/vswitch-idl.h"
 #include "xenserver.h"
-#include "openvswitch/vlog.h"
-#include "sflow_api.h"
 #include "vlan-bitmap.h"
-#include "packets.h"
 
 VLOG_DEFINE_THIS_MODULE(bridge);