Make the ovs_be<N> types generally available.

Using these types for data in network byte order makes code clearer, and
allows the "sparse" checker to give warnings for misuse.

diff --git a/build-aux/check-structs b/build-aux/check-structs
index 545c80a89543135498dc45f58b2969b1a93f0b18..f582e2bd7ba53cb28f6928d3688d987ef6130fef 100755 (executable)
--- a/build-aux/check-structs
+++ b/build-aux/check-structs
@@ -13,6 +13,9 @@ types['uint8_t'] = {"size": 1, "alignment": 1}
 types['uint16_t'] = {"size": 2, "alignment": 2}
 types['uint32_t'] = {"size": 4, "alignment": 4}
 types['uint64_t'] = {"size": 8, "alignment": 8}
+types['ovs_be16'] = {"size": 2, "alignment": 2}
+types['ovs_be32'] = {"size": 4, "alignment": 4}
+types['ovs_be64'] = {"size": 8, "alignment": 8}
 
 token = None
 line = ""

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index b0e9dfbb3cf44988291f96435a2251c6918f1714..15c05e0d05b71a6d9ade01707b96a1e874af7c93 100644 (file)
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -56,10 +56,7 @@
 #define ovs_be32 __be32
 #define ovs_be64 __be64
 #else
-#include <stdint.h>
-#define ovs_be16 uint16_t
-#define ovs_be32 uint32_t
-#define ovs_be64 uint64_t
+#include "openvswitch/types.h"
 #endif
 
 #define ODP_MAX 256             /* Maximum number of datapaths. */

diff --git a/include/openvswitch/types.h b/include/openvswitch/types.h
new file mode 100644 (file)
index 0000000..2f670c0
--- /dev/null
+++ b/include/openvswitch/types.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010 Nicira Networks.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_TYPES_H
+#define OPENVSWITCH_TYPES_H 1
+
+#include <stdint.h>
+
+#ifdef __CHECKER__
+#define OVS_BITWISE __attribute__((bitwise))
+#else
+#define OVS_BITWISE
+#endif
+
+/* The ovs_be<N> types indicate that an object is in big-endian, not
+ * native-endian, byte order.  They are otherwise equivalent to uint<N>_t.
+ *
+ * The OVS_BITWISE annotation allows the sparse checker to issue warnings
+ * for incorrect use of values in network byte order. */
+typedef uint16_t OVS_BITWISE ovs_be16;
+typedef uint32_t OVS_BITWISE ovs_be32;
+typedef uint64_t OVS_BITWISE ovs_be64;
+
+#endif /* openvswitch/types.h */