Add 64 bit host to network and network to host support

Author: peternewman

common/network/NetworkUtils.cpp

@@ -106,6 +106,17 @@ inline bool IsBigEndian() {
 #endif  // defined(HAVE_ENDIAN_H) && defined(__BIG_ENDIAN)
 }
 
+inline uint64_t ByteSwap64(uint64_t value) {
+  return ((value & 0x00000000000000ff) << 56) |
+         ((value & 0x000000000000ff00) << 40) |
+         ((value & 0x0000000000ff0000) << 24) |
+         ((value & 0x00000000ff000000) << 8) |
+         ((value & 0x000000ff00000000) >> 8) |
+         ((value & 0x0000ff0000000000) >> 24) |
+         ((value & 0x00ff000000000000) >> 40) |
+         ((value & 0xff00000000000000) >> 56);
+}
+
 inline uint32_t ByteSwap32(uint32_t value) {
   return ((value & 0x000000ff) << 24) |
          ((value & 0x0000ff00) << 8) |
@@ -148,6 +159,14 @@ uint32_t NetworkToHost(uint32_t value) {
   return ntohl(value);
 }
 
+uint64_t NetworkToHost(uint64_t value) {
+#ifdef HAVE_ENDIAN_H
+  return be64toh(value);
+#else
+#error "No be64toh for NetworkToHost, please report this."
+#endif  // HAVE_ENDIAN_H
+}
+
 int16_t NetworkToHost(int16_t value) {
   return ntohs(value);
 }
@@ -156,6 +175,14 @@ int32_t NetworkToHost(int32_t value) {
   return ntohl(value);
 }
 
+int64_t NetworkToHost(int64_t value) {
+#ifdef HAVE_ENDIAN_H
+  return be64toh(value);
+#else
+#error "No be64toh for NetworkToHost, please report this."
+#endif  // HAVE_ENDIAN_H
+}
+
 uint16_t HostToNetwork(uint16_t value) {
   return htons(value);
 }
@@ -172,6 +199,22 @@ int32_t HostToNetwork(int32_t value) {
   return htonl(value);
 }
 
+uint64_t HostToNetwork(uint64_t value) {
+#ifdef HAVE_ENDIAN_H
+  return htobe64(value);
+#else
+#error "No htobe64 for HostToNetwork, please report this."
+#endif  // HAVE_ENDIAN_H
+}
+
+int64_t HostToNetwork(int64_t value) {
+#ifdef HAVE_ENDIAN_H
+  return htobe64(value);
+#else
+#error "No htobe64 for HostToNetwork, please report this."
+#endif  // HAVE_ENDIAN_H
+}
+
 uint16_t HostToLittleEndian(uint16_t value) {
   if (IsBigEndian()) {
     return ByteSwap16(value);
@@ -204,6 +247,22 @@ int32_t HostToLittleEndian(int32_t value) {
   }
 }
 
+uint64_t HostToLittleEndian(uint64_t value) {
+  if (IsBigEndian()) {
+    return ByteSwap64(value);
+  } else {
+    return value;
+  }
+}
+
+int64_t HostToLittleEndian(int64_t value) {
+  if (IsBigEndian()) {
+    return ByteSwap64(value);
+  } else {
+    return value;
+  }
+}
+
 uint16_t LittleEndianToHost(uint16_t value) {
   if (IsBigEndian()) {
     return ByteSwap16(value);
@@ -239,6 +298,24 @@ int32_t LittleEndianToHost(int32_t value) {
   }
 }
 
+
+uint64_t LittleEndianToHost(uint64_t value) {
+  if (IsBigEndian()) {
+    return ByteSwap64(value);
+  } else {
+    return value;
+  }
+}
+
+
+int64_t LittleEndianToHost(int64_t value) {
+  if (IsBigEndian()) {
+    return ByteSwap64(value);
+  } else {
+    return value;
+  }
+}
+
 string HostnameFromFQDN(const string &fqdn) {
   string::size_type first_dot = fqdn.find_first_of(".");
   if (first_dot == string::npos) {

common/network/NetworkUtilsTest.cpp

@@ -88,6 +88,7 @@ void NetworkUtilsTest::tearDown() {
 #endif  // _WIN32
 }
 
+
 /*
  * Check that we can convert to/from network byte order
  */
@@ -101,6 +102,9 @@ void NetworkUtilsTest::testToFromNetwork() {
 
   uint32_t v3 = 0x01020304;
   OLA_ASSERT_EQ(v3, NetworkToHost(HostToNetwork(v3)));
+
+  uint64_t v4 = 0x0102030405060708;
+  OLA_ASSERT_EQ(v4, NetworkToHost(HostToNetwork(v4)));
 }
 
 
@@ -118,15 +122,21 @@ void NetworkUtilsTest::testToFromLittleEndian() {
   uint32_t v3 = 0x01020304;
   OLA_ASSERT_EQ(v3, LittleEndianToHost(HostToLittleEndian(v3)));
 
-  int8_t v4 = -10;
-  OLA_ASSERT_EQ(v4, HostToLittleEndian(v4));
+  uint64_t v4 = 0x0102030405060708;
   OLA_ASSERT_EQ(v4, LittleEndianToHost(HostToLittleEndian(v4)));
 
-  int16_t v5 = -0x0102;
+  int8_t v5 = -10;
+  OLA_ASSERT_EQ(v5, HostToLittleEndian(v5));
   OLA_ASSERT_EQ(v5, LittleEndianToHost(HostToLittleEndian(v5)));
 
-  int32_t v6 = -0x01020304;
+  int16_t v6 = -0x0102;
   OLA_ASSERT_EQ(v6, LittleEndianToHost(HostToLittleEndian(v6)));
+
+  int32_t v7 = -0x01020304;
+  OLA_ASSERT_EQ(v7, LittleEndianToHost(HostToLittleEndian(v7)));
+
+  int64_t v8 = -0x0102030405060708;
+  OLA_ASSERT_EQ(v8, LittleEndianToHost(HostToLittleEndian(v8)));
 }
 
 

include/ola/network/NetworkUtils.h

@@ -46,6 +46,11 @@ uint16_t NetworkToHost(uint16_t value);
  */
 uint32_t NetworkToHost(uint32_t value);
 
+/**
+ * @brief 64-bit unsigned network to host conversion.
+ */
+uint64_t NetworkToHost(uint64_t value);
+
 /**
  * @brief 8-bit signed network to host conversion.
  */
@@ -61,6 +66,11 @@ int16_t NetworkToHost(int16_t value);
  */
 int32_t NetworkToHost(int32_t value);
 
+/**
+ * @brief 64-bit signed network to host conversion.
+ */
+int64_t NetworkToHost(int64_t value);
+
 /**
  * @brief 8-bit unsigned host to network conversion.
  */
@@ -76,6 +86,11 @@ uint16_t HostToNetwork(uint16_t value);
  */
 uint32_t HostToNetwork(uint32_t value);
 
+/**
+ * @brief 64-bit unsigned host to network conversion.
+ */
+uint64_t HostToNetwork(uint64_t value);
+
 /**
  * @brief 8-bit signed host to network conversion.
  */
@@ -91,6 +106,11 @@ int16_t HostToNetwork(int16_t value);
  */
 int32_t HostToNetwork(int32_t value);
 
+/**
+ * @brief 64-bit signed host to network conversion.
+ */
+int64_t HostToNetwork(int64_t value);
+
 /**
  * @brief 8-bit unsigned host to little endian conversion.
  */
@@ -106,6 +126,11 @@ uint16_t HostToLittleEndian(uint16_t value);
  */
 uint32_t HostToLittleEndian(uint32_t value);
 
+/**
+ * @brief 64-bit unsigned host to little endian conversion.
+ */
+uint64_t HostToLittleEndian(uint64_t value);
+
 /**
  * @brief 8-bit signed host to little endian conversion.
  */
@@ -121,6 +146,11 @@ int16_t HostToLittleEndian(int16_t value);
  */
 int32_t HostToLittleEndian(int32_t value);
 
+/**
+ * @brief 64-bit signed host to little endian conversion.
+ */
+int64_t HostToLittleEndian(int64_t value);
+
 /**
  * @brief 8-bit unsigned little endian to host conversion.
  */
@@ -136,6 +166,11 @@ uint16_t LittleEndianToHost(uint16_t value);
  */
 uint32_t LittleEndianToHost(uint32_t value);
 
+/**
+ * @brief 64-bit unsigned little endian to host conversion.
+ */
+uint64_t LittleEndianToHost(uint64_t value);
+
 /**
  * @brief 8-bit signed little endian to host conversion.
  */
@@ -151,6 +186,11 @@ int16_t LittleEndianToHost(int16_t value);
  */
 int32_t LittleEndianToHost(int32_t value);
 
+/**
+ * @brief 64-bit signed little endian to host conversion.
+ */
+int64_t LittleEndianToHost(int64_t value);
+
 /**
  * Convert a FQDN to a hostname
  * @param fqdn a fully qualified domain name