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

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

Hide file tree

Showing 32 changed files with 116 additions and 122 deletions.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -9,6 +9,7 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/match.h \
 	include/openvswitch/meta-flow.h \
 	include/openvswitch/ofpbuf.h \
+	include/openvswitch/ofp-actions.h \
 	include/openvswitch/ofp-errors.h \
 	include/openvswitch/ofp-msgs.h \
 	include/openvswitch/ofp-parse.h \

diff --git a/lib/ofp-actions.h → include/openvswitch/ofp-actions.h b/lib/ofp-actions.h → include/openvswitch/ofp-actions.h
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef OFP_ACTIONS_H
-#define OFP_ACTIONS_H 1
+#ifndef OPENVSWITCH_OFP_ACTIONS_H
+#define OPENVSWITCH_OFP_ACTIONS_H 1
 
 #include <stddef.h>
 #include <stdint.h>
-#include "openvswitch/meta-flow.h"
-#include "openvswitch/ofp-util.h"
 #include "openflow/openflow.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-util.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/types.h"
 

diff --git a/lib/automake.mk b/lib/automake.mk
@@ -138,7 +138,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/odp-util.c \
 	lib/odp-util.h \
 	lib/ofp-actions.c \
-	lib/ofp-actions.h \
 	lib/ofp-errors.c \
 	lib/ofp-msgs.c \
 	lib/ofp-parse.c \

diff --git a/lib/bundle.c b/lib/bundle.c
@@ -21,15 +21,15 @@
 #include <inttypes.h>
 
 #include "colors.h"
-#include "openvswitch/dynamic-string.h"
 #include "multipath.h"
-#include "openvswitch/meta-flow.h"
 #include "nx-match.h"
-#include "openvswitch/ofpbuf.h"
-#include "ofp-actions.h"
-#include "openvswitch/ofp-util.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-errors.h"
+#include "openvswitch/ofp-util.h"
+#include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(bundle);

diff --git a/lib/learn.c b/lib/learn.c
@@ -20,15 +20,15 @@
 
 #include "byte-order.h"
 #include "colors.h"
+#include "nx-match.h"
+#include "openflow/openflow.h"
 #include "openvswitch/dynamic-string.h"
 #include "openvswitch/match.h"
 #include "openvswitch/meta-flow.h"
-#include "nx-match.h"
-#include "ofp-actions.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-util.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,9 +29,9 @@
 #include "flow.h"
 #include "hmap.h"
 #include "mac-learning.h"
-#include "ofp-actions.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-util.h"

diff --git a/lib/multipath.c b/lib/multipath.c
@@ -22,12 +22,12 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include "colors.h"
-#include "openvswitch/dynamic-string.h"
 #include "nx-match.h"
-#include "ofp-actions.h"
-#include "openvswitch/ofp-util.h"
-#include "openvswitch/ofp-errors.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofp-errors.h"
+#include "openvswitch/ofp-util.h"
 #include "packets.h"
 
 /* Checks that 'mp' is valid on flow.  Returns 0 if it is valid, otherwise an

diff --git a/lib/nx-match.c b/lib/nx-match.c
@@ -22,20 +22,20 @@
 
 #include "classifier.h"
 #include "colors.h"
-#include "openvswitch/dynamic-string.h"
 #include "hmap.h"
+#include "openflow/nicira-ext.h"
+#include "openvswitch/dynamic-string.h"
 #include "openvswitch/meta-flow.h"
-#include "ofp-actions.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
-#include "openflow/nicira-ext.h"
+#include "openvswitch/vlog.h"
 #include "packets.h"
 #include "shash.h"
 #include "tun-metadata.h"
 #include "unaligned.h"
 #include "util.h"
-#include "openvswitch/ofp-errors.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(nx_match);
 

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
@@ -17,26 +17,26 @@
 #include <config.h>
 #include <netinet/in.h>
 
-#include "ofp-actions.h"
 #include "bundle.h"
 #include "byte-order.h"
 #include "colors.h"
 #include "compiler.h"
 #include "dummy.h"
-#include "openvswitch/dynamic-string.h"
 #include "hmap.h"
 #include "learn.h"
-#include "openvswitch/meta-flow.h"
 #include "multipath.h"
 #include "nx-match.h"
 #include "odp-netlink.h"
 #include "ofp-prop.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-util.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.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
@@ -22,22 +22,22 @@
 #include <netinet/in.h>
 
 #include "byte-order.h"
-#include "openvswitch/dynamic-string.h"
 #include "learn.h"
-#include "openvswitch/meta-flow.h"
 #include "multipath.h"
 #include "netdev.h"
 #include "nx-match.h"
-#include "ofp-actions.h"
+#include "openflow/openflow.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
-#include "openflow/openflow.h"
+#include "openvswitch/vconn.h"
 #include "ovs-thread.h"
 #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/lib/ofp-print.c b/lib/ofp-print.c
@@ -35,11 +35,11 @@
 #include "multipath.h"
 #include "netdev.h"
 #include "nx-match.h"
-#include "ofp-actions.h"
-#include "openflow/openflow.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-util.h"

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
@@ -31,11 +31,11 @@
 #include "netdev.h"
 #include "nx-match.h"
 #include "id-pool.h"
-#include "ofp-actions.h"
 #include "ofp-prop.h"
 #include "openflow/netronome-ext.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-util.h"

diff --git a/ofproto/bond.c b/ofproto/bond.c
@@ -23,31 +23,30 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "openvswitch/ofp-util.h"
-#include "ofp-actions.h"
-#include "openvswitch/ofpbuf.h"
-#include "ofproto/ofproto-provider.h"
-#include "ofproto/ofproto-dpif.h"
-#include "ofproto/ofproto-dpif-rid.h"
 #include "connectivity.h"
 #include "coverage.h"
-#include "openvswitch/dynamic-string.h"
+#include "dp-packet.h"
 #include "flow.h"
 #include "hmap.h"
 #include "lacp.h"
-#include "openvswitch/list.h"
 #include "netdev.h"
 #include "odp-util.h"
+#include "ofproto/ofproto-dpif.h"
+#include "ofproto/ofproto-dpif-rid.h"
+#include "ofproto/ofproto-provider.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/list.h"
+#include "openvswitch/match.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
 #include "packets.h"
-#include "dp-packet.h"
 #include "poll-loop.h"
 #include "seq.h"
-#include "openvswitch/match.h"
 #include "shash.h"
 #include "timeval.h"
 #include "unixctl.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(bond);
 

diff --git a/ofproto/bundles.c b/ofproto/bundles.c
@@ -18,12 +18,13 @@
 
 #include <config.h>
 
+#include "bundles.h"
 #include "coverage.h"
 #include "fail-open.h"
 #include "in-band.h"
 #include "odp-util.h"
-#include "ofp-actions.h"
 #include "ofproto-provider.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-msgs.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
@@ -38,8 +39,6 @@
 #include "stream.h"
 #include "timeval.h"
 
-#include "bundles.h"
-
 VLOG_DEFINE_THIS_MODULE(bundles);
 
 static struct ofp_bundle *

diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
@@ -15,19 +15,18 @@
  */
 
 #include <config.h>
-
-#include "connmgr.h"
-
 #include <errno.h>
 #include <stdlib.h>
 
+#include "bundles.h"
+#include "connmgr.h"
 #include "coverage.h"
 #include "fail-open.h"
 #include "in-band.h"
 #include "odp-util.h"
-#include "ofp-actions.h"
 #include "ofproto-provider.h"
 #include "openvswitch/dynamic-string.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-msgs.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
@@ -42,8 +41,6 @@
 #include "stream.h"
 #include "timeval.h"
 
-#include "bundles.h"
-
 VLOG_DEFINE_THIS_MODULE(connmgr);
 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
 

diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c
@@ -15,26 +15,26 @@
  */
 
 #include <config.h>
-#include "fail-open.h"
 #include <inttypes.h>
 #include <stdlib.h>
 #include "classifier.h"
 #include "connmgr.h"
+#include "dp-packet.h"
+#include "fail-open.h"
 #include "flow.h"
 #include "mac-learning.h"
 #include "odp-util.h"
-#include "openvswitch/ofpbuf.h"
-#include "ofp-actions.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-util.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
 #include "ofproto.h"
 #include "ofproto-provider.h"
 #include "pktbuf.h"
-#include "dp-packet.h"
 #include "poll-loop.h"
 #include "rconn.h"
 #include "timeval.h"
-#include "openvswitch/vconn.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(fail_open);
 

diff --git a/ofproto/in-band.c b/ofproto/in-band.c
@@ -15,7 +15,6 @@
  */
 
 #include <config.h>
-#include "in-band.h"
 #include <arpa/inet.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -26,18 +25,19 @@
 #include "classifier.h"
 #include "dhcp.h"
 #include "flow.h"
+#include "in-band.h"
 #include "netdev.h"
 #include "netlink.h"
 #include "odp-util.h"
-#include "ofp-actions.h"
 #include "ofproto.h"
-#include "openvswitch/ofpbuf.h"
 #include "ofproto-provider.h"
 #include "openflow/openflow.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "timeval.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(in_band);
 

diff --git a/ofproto/ofproto-dpif-rid.h b/ofproto/ofproto-dpif-rid.h
@@ -21,9 +21,9 @@
 #include <stdint.h>
 
 #include "cmap.h"
-#include "openvswitch/list.h"
-#include "ofp-actions.h"
 #include "ofproto-dpif-mirror.h"
+#include "openvswitch/list.h"
+#include "openvswitch/ofp-actions.h"
 #include "ovs-thread.h"
 #include "uuid.h"