From: Florian Forster <octo@collectd.org>
Date: Thu, 9 Nov 2017 15:42:22 +0000 (+0100)
Subject: libcollectdclient/network_parse.c: Implement be{16,64}toh() if not provided by the... 
X-Git-Tag: collectd-5.8.0~13^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=890f917d8e907420f884a8d45af734575e13037c

libcollectdclient/network_parse.c: Implement be{16,64}toh() if not provided by the system.
---

diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c
index d158b937..2365ab0a 100644
--- a/src/libcollectdclient/network_parse.c
+++ b/src/libcollectdclient/network_parse.c
@@ -43,10 +43,23 @@
 #include <endian.h>
 #elif HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
-#elif defined(_AIX) && defined(__GNUC__)
-/* AIX is always big endian */
-#define be16toh(x) (x)
-#define be64toh(x) (x)
+#else /* fallback */
+__attribute__((const)) static uint16_t be16toh(uint16_t n) {
+  uint8_t tmp[2];
+  memmove(tmp, &n, sizeof(tmp));
+
+  return ((uint16_t)tmp[0] << 8) | ((uint16_t)tmp[1] << 0);
+}
+
+__attribute__((const)) static uint64_t be64toh(uint64_t n) {
+  uint8_t tmp[8];
+  memmove(tmp, &n, sizeof(tmp));
+
+  return ((uint64_t)tmp[0] << 56) | ((uint64_t)tmp[1] << 48) |
+         ((uint64_t)tmp[2] << 40) | ((uint64_t)tmp[3] << 32) |
+         ((uint64_t)tmp[4] << 24) | ((uint64_t)tmp[5] << 16) |
+         ((uint64_t)tmp[6] << 8) | ((uint64_t)tmp[7] << 0);
+}
 #endif
 
 #if HAVE_GCRYPT_H