byte-order: htole*/letoh* and htobe*/betoh* for forced endian conversions

Signed-off-by: Anand Avati <avati@gluster.com>

BUG: 2815 (Server-enforced ACLs)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2815

1 files changed, 166 insertions, 6 deletions

diff --git a/libglusterfs/src/byte-order.h b/libglusterfs/src/byte-order.h
index cabfcf4c6..c74caa371 100644
--- a/libglusterfs/src/byte-order.h
+++ b/libglusterfs/src/byte-order.h
@@ -38,6 +38,23 @@ static uint64_t (*hton64) (uint64_t);
 #define ntoh32 hton32
 #define ntoh64 hton64
 
+static uint16_t (*htole16) (uint16_t);
+static uint32_t (*htole32) (uint32_t);
+static uint64_t (*htole64) (uint64_t);
+
+#define letoh16 htole16
+#define letoh32 htole32
+#define letoh64 htole64
+
+static uint16_t (*htobe16) (uint16_t);
+static uint32_t (*htobe32) (uint32_t);
+static uint64_t (*htobe64) (uint64_t);
+
+#define betoh16 htobe16
+#define betoh32 htobe32
+#define betoh64 htobe64
+
+
 #define do_swap2(x) (((x&LS1) << 8)|(((x&MS1) >> 8)))
 #define do_swap4(x) ((do_swap2(x&LS2) << 16)|(do_swap2((x&MS2) >> 16)))
 #define do_swap8(x) ((do_swap4(x&LS4) << 32)|(do_swap4((x&MS4) >> 32)))
@@ -86,15 +103,17 @@ __noswap64 (uint64_t x)
 
 
 static inline uint16_t
-__byte_order_init16 (uint16_t i)
+__byte_order_n16 (uint16_t i)
 {
 	uint32_t num = 1;
 
 	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
 		hton16 = __swap16;
 		hton32 = __swap32;
 		hton64 = __swap64;
 	} else {
+                /* cpu is be */
 		hton16 = __noswap16;
 		hton32 = __noswap32;
 		hton64 = __noswap64;
@@ -105,15 +124,17 @@ __byte_order_init16 (uint16_t i)
 
 
 static inline uint32_t
-__byte_order_init32 (uint32_t i)
+__byte_order_n32 (uint32_t i)
 {
 	uint32_t num = 1;
 
 	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
 		hton16 = __swap16;
 		hton32 = __swap32;
 		hton64 = __swap64;
 	} else {
+                /* cpu is be */
 		hton16 = __noswap16;
 		hton32 = __noswap32;
 		hton64 = __noswap64;
@@ -124,15 +145,17 @@ __byte_order_init32 (uint32_t i)
 
 
 static inline uint64_t
-__byte_order_init64 (uint64_t i)
+__byte_order_n64 (uint64_t i)
 {
 	uint32_t num = 1;
 
 	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
 		hton16 = __swap16;
 		hton32 = __swap32;
 		hton64 = __swap64;
 	} else {
+                /* cpu is be */
 		hton16 = __noswap16;
 		hton32 = __noswap32;
 		hton64 = __noswap64;
@@ -142,9 +165,146 @@ __byte_order_init64 (uint64_t i)
 }
 
 
-static uint16_t (*hton16) (uint16_t) = __byte_order_init16;
-static uint32_t (*hton32) (uint32_t) = __byte_order_init32;
-static uint64_t (*hton64) (uint64_t) = __byte_order_init64;
+static uint16_t (*hton16) (uint16_t) = __byte_order_n16;
+static uint32_t (*hton32) (uint32_t) = __byte_order_n32;
+static uint64_t (*hton64) (uint64_t) = __byte_order_n64;
+
+
+static inline uint16_t
+__byte_order_le16 (uint16_t i)
+{
+	uint32_t num = 1;
+
+	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
+		htole16 = __noswap16;
+		htole32 = __noswap32;
+		htole64 = __noswap64;
+	} else {
+                /* cpu is be */
+		htole16 = __swap16;
+		htole32 = __swap32;
+		htole64 = __swap64;
+	}
+
+	return htole16 (i);
+}
+
+
+static inline uint32_t
+__byte_order_le32 (uint32_t i)
+{
+	uint32_t num = 1;
+
+	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
+		htole16 = __noswap16;
+		htole32 = __noswap32;
+		htole64 = __noswap64;
+	} else {
+                /* cpu is be */
+		htole16 = __swap16;
+		htole32 = __swap32;
+		htole64 = __swap64;
+	}
+
+	return htole32 (i);
+}
+
+
+static inline uint64_t
+__byte_order_le64 (uint64_t i)
+{
+	uint32_t num = 1;
+
+	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
+		htole16 = __noswap16;
+		htole32 = __noswap32;
+		htole64 = __noswap64;
+	} else {
+                /* cpu is be */
+		htole16 = __swap16;
+		htole32 = __swap32;
+		htole64 = __swap64;
+	}
+
+	return htole64 (i);
+}
+
+
+static uint16_t (*htole16) (uint16_t) = __byte_order_le16;
+static uint32_t (*htole32) (uint32_t) = __byte_order_le32;
+static uint64_t (*htole64) (uint64_t) = __byte_order_le64;
+
+
+static inline uint16_t
+__byte_order_be16 (uint16_t i)
+{
+	uint32_t num = 1;
+
+	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
+		htobe16 = __swap16;
+		htobe32 = __swap32;
+		htobe64 = __swap64;
+	} else {
+                /* cpu is be */
+		htobe16 = __noswap16;
+		htobe32 = __noswap32;
+		htobe64 = __noswap64;
+	}
+
+	return htobe16 (i);
+}
+
+
+static inline uint32_t
+__byte_order_be32 (uint32_t i)
+{
+	uint32_t num = 1;
+
+	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
+		htobe16 = __swap16;
+		htobe32 = __swap32;
+		htobe64 = __swap64;
+	} else {
+                /* cpu is be */
+		htobe16 = __noswap16;
+		htobe32 = __noswap32;
+		htobe64 = __noswap64;
+	}
+
+	return htobe32 (i);
+}
+
+
+static inline uint64_t
+__byte_order_be64 (uint64_t i)
+{
+	uint32_t num = 1;
+
+	if (((char *)(&num))[0] == 1) {
+                /* cpu is le */
+		htobe16 = __swap16;
+		htobe32 = __swap32;
+		htobe64 = __swap64;
+	} else {
+                /* cpu is be */
+		htobe16 = __noswap16;
+		htobe32 = __noswap32;
+		htobe64 = __noswap64;
+	}
+
+	return htobe64 (i);
+}
+
+
+static uint16_t (*htobe16) (uint16_t) = __byte_order_be16;
+static uint32_t (*htobe32) (uint32_t) = __byte_order_be32;
+static uint64_t (*htobe64) (uint64_t) = __byte_order_be64;
+
 
 
 #endif /* _BYTE_ORDER_H */