Moved I2PEndian to util/

util/I2PEndian.cpp

@@ -0,0 +1,83 @@
+#include "I2PEndian.h"
+
+// http://habrahabr.ru/post/121811/
+// http://codepad.org/2ycmkz2y
+
+#include "LittleBigEndian.h"
+
+#ifdef NEEDS_LOCAL_ENDIAN
+uint16_t htobe16(uint16_t int16)
+{
+    BigEndian<uint16_t> u16(int16);
+    return u16.raw_value;
+}
+
+uint32_t htobe32(uint32_t int32)
+{
+    BigEndian<uint32_t> u32(int32);
+    return u32.raw_value;
+}
+
+uint64_t htobe64(uint64_t int64)
+{
+    BigEndian<uint64_t> u64(int64);
+    return u64.raw_value;
+}
+
+uint16_t be16toh(uint16_t big16)
+{
+    LittleEndian<uint16_t> u16(big16);
+    return u16.raw_value;
+}
+
+uint32_t be32toh(uint32_t big32)
+{
+    LittleEndian<uint32_t> u32(big32);
+    return u32.raw_value;
+}
+
+uint64_t be64toh(uint64_t big64)
+{
+    LittleEndian<uint64_t> u64(big64);
+    return u64.raw_value;
+}
+#endif
+
+/* it can be used in Windows 8
+#include <Winsock2.h>
+
+uint16_t htobe16(uint16_t int16)
+{
+    return htons(int16);
+}
+
+uint32_t htobe32(uint32_t int32)
+{
+    return htonl(int32);
+}
+
+uint64_t htobe64(uint64_t int64)
+{
+    // http://msdn.microsoft.com/en-us/library/windows/desktop/jj710199%28v=vs.85%29.aspx
+    //return htonll(int64);
+    return 0;
+}
+
+
+uint16_t be16toh(uint16_t big16)
+{
+    return ntohs(big16);
+}
+
+uint32_t be32toh(uint32_t big32)
+{
+    return ntohl(big32);
+}
+
+uint64_t be64toh(uint64_t big64)
+{
+    // http://msdn.microsoft.com/en-us/library/windows/desktop/jj710199%28v=vs.85%29.aspx
+    //return ntohll(big64);
+    return 0;
+}
+*/

util/I2PEndian.h

@@ -0,0 +1,119 @@
+#ifndef I2PENDIAN_H__
+#define I2PENDIAN_H__
+#include <inttypes.h>
+#include <string.h>
+
+#if defined(__linux__) || defined(__FreeBSD_kernel__)
+#include <endian.h>
+#elif __FreeBSD__
+#include <sys/endian.h>
+#elif defined(__APPLE__) && defined(__MACH__)
+
+#include <libkern/OSByteOrder.h>
+
+#define htobe16(x) OSSwapHostToBigInt16(x)
+#define htole16(x) OSSwapHostToLittleInt16(x)
+#define be16toh(x) OSSwapBigToHostInt16(x)
+#define le16toh(x) OSSwapLittleToHostInt16(x)
+
+#define htobe32(x) OSSwapHostToBigInt32(x)
+#define htole32(x) OSSwapHostToLittleInt32(x)
+#define be32toh(x) OSSwapBigToHostInt32(x)
+#define le32toh(x) OSSwapLittleToHostInt32(x)
+
+#define htobe64(x) OSSwapHostToBigInt64(x)
+#define htole64(x) OSSwapHostToLittleInt64(x)
+#define be64toh(x) OSSwapBigToHostInt64(x)
+#define le64toh(x) OSSwapLittleToHostInt64(x)
+
+#else
+#define NEEDS_LOCAL_ENDIAN
+#include <cstdint>
+uint16_t htobe16(uint16_t int16);
+uint32_t htobe32(uint32_t int32);
+uint64_t htobe64(uint64_t int64);
+
+uint16_t be16toh(uint16_t big16);
+uint32_t be32toh(uint32_t big32);
+uint64_t be64toh(uint64_t big64);
+
+// assume LittleEndine
+#define htole16
+#define htole32
+#define htole64
+#define le16toh
+#define le32toh
+#define le64toh
+
+#endif
+
+inline uint16_t buf16toh(const void *buf)
+{
+    uint16_t b16;
+    memcpy(&b16, buf, sizeof(uint16_t));
+    return b16;
+}
+
+inline uint32_t buf32toh(const void *buf)
+{
+    uint32_t b32;
+    memcpy(&b32, buf, sizeof(uint32_t));
+    return b32;
+}
+
+inline uint64_t buf64toh(const void *buf)
+{
+    uint64_t b64;
+    memcpy(&b64, buf, sizeof(uint64_t));
+    return b64;
+}
+
+inline uint16_t bufbe16toh(const void *buf)
+{
+    return be16toh(buf16toh(buf));
+}
+
+inline uint32_t bufbe32toh(const void *buf)
+{
+    return be32toh(buf32toh(buf));
+}
+
+inline uint64_t bufbe64toh(const void *buf)
+{
+    return be64toh(buf64toh(buf));
+}
+
+inline void htobuf16(void *buf, uint16_t b16)
+{
+    memcpy(buf, &b16, sizeof(uint16_t));
+}
+
+inline void htobuf32(void *buf, uint32_t b32)
+{
+    memcpy(buf, &b32, sizeof(uint32_t));
+}
+
+inline void htobuf64(void *buf, uint64_t b64)
+{
+    memcpy(buf, &b64, sizeof(uint64_t));
+}
+
+inline void htobe16buf(void *buf, uint16_t big16)
+{
+    htobuf16(buf, htobe16(big16));
+}
+
+inline void htobe32buf(void *buf, uint32_t big32)
+{
+    htobuf32(buf, htobe32(big32));
+}
+
+inline void htobe64buf(void *buf, uint64_t big64)
+{
+    htobuf64(buf, htobe64(big64));
+}
+
+
+
+#endif // I2PENDIAN_H__
+