summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--FAQ.md2
-rwxr-xr-xbuild-aux/extract-ofp-errors2
-rw-r--r--include/openvswitch/automake.mk1
-rw-r--r--include/openvswitch/ofp-errors.h (renamed from lib/ofp-errors.h)4
-rw-r--r--lib/automake.mk5
-rw-r--r--lib/bundle.c2
-rw-r--r--lib/bundle.h2
-rw-r--r--lib/dpif.c2
-rw-r--r--lib/learn.c2
-rw-r--r--lib/learn.h2
-rw-r--r--lib/learning-switch.c2
-rw-r--r--lib/meta-flow.c2
-rw-r--r--lib/meta-flow.h2
-rw-r--r--lib/multipath.c2
-rw-r--r--lib/multipath.h2
-rw-r--r--lib/nx-match.c2
-rw-r--r--lib/nx-match.h2
-rw-r--r--lib/ofp-actions.h2
-rw-r--r--lib/ofp-errors.c2
-rw-r--r--lib/ofp-msgs.h2
-rw-r--r--lib/ofp-print.c2
-rw-r--r--lib/ofp-prop.c2
-rw-r--r--lib/ofp-prop.h2
-rw-r--r--lib/ofp-util.c2
-rw-r--r--lib/pktbuf.h2
-rw-r--r--lib/vconn.c2
-rw-r--r--ofproto/connmgr.h2
-rw-r--r--ofproto/ofproto-provider.h2
-rw-r--r--ofproto/ofproto.c2
-rw-r--r--utilities/ovs-ofctl.c2
30 files changed, 32 insertions, 32 deletions
diff --git a/FAQ.md b/FAQ.md
index 0ebf1d5cb..9d0fd2154 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1596,7 +1596,7 @@ A: This is a Open vSwitch extension to OpenFlow error codes. Open
If you want to dissect the extended error message yourself, the
format is documented in include/openflow/nicira-ext.h in the Open
vSwitch source distribution. The extended error codes are
- documented in lib/ofp-errors.h.
+ documented in include/openvswitch/ofp-errors.h.
Q1: Some of the traffic that I'd expect my OpenFlow controller to see
doesn't actually appear through the OpenFlow connection, even
diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors
index 16bfbc721..7349644b2 100755
--- a/build-aux/extract-ofp-errors
+++ b/build-aux/extract-ofp-errors
@@ -161,7 +161,7 @@ experimenter IDs), then ERROR_HEADER to obtain OpenFlow error number.
It outputs a C source file for translating OpenFlow error codes into
strings.
-ERROR_HEADER should point to lib/ofp-errors.h.
+ERROR_HEADER should point to include/openvswitch/ofp-errors.h.
VENDOR_HEADER should point to include/openflow/openflow-common.h.
The output is suitable for use as lib/ofp-errors.inc.\
''' % {"argv0": argv0})
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
index 1e69dd8a7..4f3e9ecdc 100644
--- a/include/openvswitch/automake.mk
+++ b/include/openvswitch/automake.mk
@@ -3,6 +3,7 @@ openvswitchinclude_HEADERS = \
include/openvswitch/compiler.h \
include/openvswitch/geneve.h \
include/openvswitch/list.h \
+ include/openvswitch/ofp-errors.h \
include/openvswitch/thread.h \
include/openvswitch/token-bucket.h \
include/openvswitch/types.h \
diff --git a/lib/ofp-errors.h b/include/openvswitch/ofp-errors.h
index d40ca381b..78c4991e9 100644
--- a/lib/ofp-errors.h
+++ b/include/openvswitch/ofp-errors.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef OFP_ERRORS_H
-#define OFP_ERRORS_H 1
+#ifndef OPENVSWITCH_OFP_ERRORS_H
+#define OPENVSWITCH_OFP_ERRORS_H 1
#include <stdbool.h>
#include <stddef.h>
diff --git a/lib/automake.mk b/lib/automake.mk
index cbb0f2119..70f4deb4a 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -144,7 +144,6 @@ lib_libopenvswitch_la_SOURCES = \
lib/ofp-actions.c \
lib/ofp-actions.h \
lib/ofp-errors.c \
- lib/ofp-errors.h \
lib/ofp-msgs.c \
lib/ofp-msgs.h \
lib/ofp-parse.c \
@@ -494,10 +493,10 @@ lib/ofp-actions.lo: lib/ofp-actions.inc1 lib/ofp-actions.inc2
CLEANFILES += lib/ofp-actions.inc1 lib/ofp-actions.inc2
EXTRA_DIST += build-aux/extract-ofp-actions
-lib/ofp-errors.inc: lib/ofp-errors.h include/openflow/openflow-common.h \
+lib/ofp-errors.inc: include/openvswitch/ofp-errors.h include/openflow/openflow-common.h \
$(srcdir)/build-aux/extract-ofp-errors
$(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-errors \
- $(srcdir)/lib/ofp-errors.h \
+ $(srcdir)/include/openvswitch/ofp-errors.h \
$(srcdir)/include/openflow/openflow-common.h > $@.tmp && \
mv $@.tmp $@
lib/ofp-errors.lo: lib/ofp-errors.inc
diff --git a/lib/bundle.c b/lib/bundle.c
index 601eb1b60..371b318a2 100644
--- a/lib/bundle.c
+++ b/lib/bundle.c
@@ -27,9 +27,9 @@
#include "nx-match.h"
#include "ofpbuf.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-util.h"
#include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(bundle);
diff --git a/lib/bundle.h b/lib/bundle.h
index a1f0ef2ab..49db5d449 100644
--- a/lib/bundle.h
+++ b/lib/bundle.h
@@ -22,8 +22,8 @@
#include <stdint.h>
#include "compiler.h"
-#include "ofp-errors.h"
#include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/types.h"
struct ds;
diff --git a/lib/dpif.c b/lib/dpif.c
index a86649951..df11b22c5 100644
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -33,7 +33,6 @@
#include "netlink.h"
#include "odp-execute.h"
#include "odp-util.h"
-#include "ofp-errors.h"
#include "ofp-print.h"
#include "ofp-util.h"
#include "ofpbuf.h"
@@ -49,6 +48,7 @@
#include "util.h"
#include "uuid.h"
#include "valgrind.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(dpif);
diff --git a/lib/learn.c b/lib/learn.c
index 06da25c33..20a4ddcd8 100644
--- a/lib/learn.c
+++ b/lib/learn.c
@@ -25,10 +25,10 @@
#include "meta-flow.h"
#include "nx-match.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
+#include "openvswitch/ofp-errors.h"
#include "unaligned.h"
diff --git a/lib/learn.h b/lib/learn.h
index 1bc00ff2e..08f1990f1 100644
--- a/lib/learn.h
+++ b/lib/learn.h
@@ -18,7 +18,7 @@
#define LEARN_H 1
#include "compiler.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
struct ds;
struct flow;
diff --git a/lib/learning-switch.c b/lib/learning-switch.c
index 19a90dbc9..d9e284d2f 100644
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.c
@@ -31,7 +31,6 @@
#include "mac-learning.h"
#include "ofpbuf.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-msgs.h"
#include "ofp-parse.h"
#include "ofp-print.h"
@@ -42,6 +41,7 @@
#include "shash.h"
#include "simap.h"
#include "timeval.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vconn.h"
#include "openvswitch/vlog.h"
diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index 6c899e1fd..37027e414 100644
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -26,7 +26,6 @@
#include "classifier.h"
#include "dynamic-string.h"
#include "nx-match.h"
-#include "ofp-errors.h"
#include "ofp-util.h"
#include "ovs-thread.h"
#include "packets.h"
@@ -36,6 +35,7 @@
#include "tun-metadata.h"
#include "unaligned.h"
#include "util.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(meta_flow);
diff --git a/lib/meta-flow.h b/lib/meta-flow.h
index d6ffdfa65..c73a1afc6 100644
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -22,7 +22,7 @@
#include <netinet/ip6.h>
#include "bitmap.h"
#include "flow.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
#include "packets.h"
#include "util.h"
diff --git a/lib/multipath.c b/lib/multipath.c
index bb837ad3b..c5d2ab52e 100644
--- a/lib/multipath.c
+++ b/lib/multipath.c
@@ -25,8 +25,8 @@
#include "dynamic-string.h"
#include "nx-match.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-util.h"
+#include "openvswitch/ofp-errors.h"
#include "openflow/nicira-ext.h"
#include "packets.h"
diff --git a/lib/multipath.h b/lib/multipath.h
index 180681ea4..6dd3785ac 100644
--- a/lib/multipath.h
+++ b/lib/multipath.h
@@ -19,7 +19,7 @@
#include <stdint.h>
#include "compiler.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
struct ds;
struct flow;
diff --git a/lib/nx-match.c b/lib/nx-match.c
index 874e1fb08..ae88ff10b 100644
--- a/lib/nx-match.c
+++ b/lib/nx-match.c
@@ -26,7 +26,6 @@
#include "hmap.h"
#include "meta-flow.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/nicira-ext.h"
@@ -35,6 +34,7 @@
#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/nx-match.h b/lib/nx-match.h
index c663e54ce..ce252f08e 100644
--- a/lib/nx-match.h
+++ b/lib/nx-match.h
@@ -23,7 +23,7 @@
#include "compiler.h"
#include "flow.h"
#include "meta-flow.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/types.h"
struct ds;
diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h
index 55058ef8a..46818e33b 100644
--- a/lib/ofp-actions.h
+++ b/lib/ofp-actions.h
@@ -20,10 +20,10 @@
#include <stddef.h>
#include <stdint.h>
#include "meta-flow.h"
-#include "ofp-errors.h"
#include "ofp-util.h"
#include "openflow/openflow.h"
#include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/types.h"
/* List of OVS abstracted actions.
diff --git a/lib/ofp-errors.c b/lib/ofp-errors.c
index f9e1fa9b7..b4a1f8ff3 100644
--- a/lib/ofp-errors.c
+++ b/lib/ofp-errors.c
@@ -15,7 +15,6 @@
*/
#include <config.h>
-#include "ofp-errors.h"
#include <errno.h>
#include "byte-order.h"
#include "dynamic-string.h"
@@ -23,6 +22,7 @@
#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(ofp_errors);
diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
index e0f0c1ab1..462a25508 100644
--- a/lib/ofp-msgs.h
+++ b/lib/ofp-msgs.h
@@ -38,8 +38,8 @@
* of headers.
*/
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/types.h"
-#include "ofp-errors.h"
#include "util.h"
struct ovs_list;
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 47b88e4cf..6fa13e4ea 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -39,11 +39,11 @@
#include "nx-match.h"
#include "ofp-actions.h"
#include "ofpbuf.h"
-#include "ofp-errors.h"
#include "ofp-msgs.h"
#include "ofp-util.h"
#include "openflow/openflow.h"
#include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
#include "packets.h"
#include "dp-packet.h"
#include "type-props.h"
diff --git a/lib/ofp-prop.c b/lib/ofp-prop.c
index 151244235..618f8b085 100644
--- a/lib/ofp-prop.c
+++ b/lib/ofp-prop.c
@@ -20,7 +20,7 @@
#include "byte-order.h"
#include "ofpbuf.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vlog.h"
#include "util.h"
#include "uuid.h"
diff --git a/lib/ofp-prop.h b/lib/ofp-prop.h
index 4f8e78d56..26a1850e0 100644
--- a/lib/ofp-prop.h
+++ b/lib/ofp-prop.h
@@ -49,7 +49,7 @@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/types.h"
struct ofpbuf;
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 11374d0aa..c8e44a0df 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -34,7 +34,6 @@
#include "nx-match.h"
#include "id-pool.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-msgs.h"
#include "ofp-prop.h"
#include "ofp-util.h"
@@ -46,6 +45,7 @@
#include "tun-metadata.h"
#include "unaligned.h"
#include "type-props.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vlog.h"
#include "bitmap.h"
diff --git a/lib/pktbuf.h b/lib/pktbuf.h
index 307521ad1..ccbaed779 100644
--- a/lib/pktbuf.h
+++ b/lib/pktbuf.h
@@ -20,7 +20,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
struct pktbuf;
struct dp_packet;
diff --git a/lib/vconn.c b/lib/vconn.c
index d83594332..69b39d760 100644
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -26,7 +26,6 @@
#include "dynamic-string.h"
#include "fatal-signal.h"
#include "flow.h"
-#include "ofp-errors.h"
#include "ofp-msgs.h"
#include "ofp-print.h"
#include "ofp-util.h"
@@ -37,6 +36,7 @@
#include "poll-loop.h"
#include "random.h"
#include "util.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vlog.h"
#include "socket-util.h"
diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index 741034a06..dfc06e34a 100644
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -21,11 +21,11 @@
#include "hmap.h"
#include "list.h"
#include "match.h"
-#include "ofp-errors.h"
#include "ofp-util.h"
#include "ofproto.h"
#include "ofproto-provider.h"
#include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/types.h"
struct nlattr;
diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
index 2c6e4839f..5938ba683 100644
--- a/ofproto/ofproto-provider.h
+++ b/ofproto/ofproto-provider.h
@@ -40,9 +40,9 @@
#include "hindex.h"
#include "list.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-util.h"
#include "ofproto/ofproto.h"
+#include "openvswitch/ofp-errors.h"
#include "ovs-atomic.h"
#include "ovs-rcu.h"
#include "ovs-thread.h"
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 1335da675..058198778 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -35,7 +35,6 @@
#include "netdev.h"
#include "nx-match.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-msgs.h"
#include "ofp-print.h"
#include "ofp-util.h"
@@ -59,6 +58,7 @@
#include "tun-metadata.h"
#include "unaligned.h"
#include "unixctl.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vlog.h"
#include "bundles.h"
diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index 73dc7ea40..f25a02aad 100644
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -41,7 +41,6 @@
#include "nx-match.h"
#include "odp-util.h"
#include "ofp-actions.h"
-#include "ofp-errors.h"
#include "ofp-msgs.h"
#include "ofp-parse.h"
#include "ofp-print.h"
@@ -61,6 +60,7 @@
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
+#include "openvswitch/ofp-errors.h"
#include "openvswitch/vconn.h"
#include "openvswitch/vlog.h"
#include "meta-flow.h"
View Lorry Controller Status