2 files changed, 151 insertions, 18 deletions

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index fc5cb80d9..880fc1fee 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -655,37 +655,125 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 /* ************************* endianess conversion ****************** */
 
 /**
- * Convert unsigned 64-bit integer to host-byte-order.
- * @param n the value in network byte order
- * @return the same value in host byte order
+ * Convert unsigned 64-bit integer to network byte order.
+ *
+ * @param n
+ *        The value in host byte order.
+ *
+ * @return The same value in network byte order.
  */
 uint64_t
-GNUNET_ntohll (uint64_t n);
+GNUNET_htonll (uint64_t n);
+
 
 /**
- * Convert unsigned 64-bit integer to network-byte-order.
- * @param n the value in host byte order
- * @return the same value in network byte order
+ * Convert unsigned 64-bit integer to host byte order.
+ *
+ * @param n
+ *        The value in network byte order.
+ *
+ * @return The same value in host byte order.
  */
 uint64_t
-GNUNET_htonll (uint64_t n);
+GNUNET_ntohll (uint64_t n);
+
 
 /**
- * Convert double to network-byte-order.
- * @param d the value in network byte order
- * @return the same value in host byte order
+ * Convert double to network byte order.
+ *
+ * @param d
+ *        The value in network byte order.
+ *
+ * @return The same value in host byte order.
  */
 double
 GNUNET_hton_double (double d);
 
+
 /**
- * Convert double to host-byte-order
- * @param d the value in network byte order
- * @return the same value in host byte order
+ * Convert double to host byte order
+ *
+ * @param d
+ *        The value in network byte order.
+ *
+ * @return The same value in host byte order.
  */
 double
 GNUNET_ntoh_double (double d);
 
+
+/**
+ * Convert signed 64-bit integer to network byte order.
+ *
+ * @param n
+ *        The value in host byte order.
+ *
+ * @return The same value in network byte order.
+ */
+uint64_t
+GNUNET_htonll_signed (int64_t n);
+
+
+/**
+ * Convert signed 64-bit integer to host byte order.
+ *
+ * @param n
+ *        The value in network byte order.
+ *
+ * @return The same value in host byte order.
+ */
+int64_t
+GNUNET_ntohll_signed (uint64_t n);
+
+
+/**
+ * Convert signed 32-bit integer to network byte order.
+ *
+ * @param n
+ *        The value in host byte order.
+ *
+ * @return The same value in network byte order.
+ */
+uint32_t
+GNUNET_htonl_signed (int32_t n);
+
+
+/**
+ * Convert signed 32-bit integer to host byte order.
+ *
+ * @param n
+ *        The value in network byte order.
+ *
+ * @return The same value in host byte order.
+ */
+int32_t
+GNUNET_ntohl_signed (uint32_t n);
+
+
+/**
+ * Convert signed 16-bit integer to network byte order.
+ *
+ * @param n
+ *        The value in host byte order.
+ *
+ * @return The same value in network byte order.
+ */
+uint16_t
+GNUNET_htons_signed (int16_t n);
+
+
+/**
+ * Convert signed 16-bit integer to host byte order.
+ *
+ * @param n
+ *        The value in network byte order.
+ *
+ * @return The same value in host byte order.
+ */
+int16_t
+GNUNET_ntohs_signed (uint16_t n);
+
+
 /* ************************* allocation functions ****************** */
 
 /**
diff --git a/src/util/common_endian.c b/src/util/common_endian.c
index 218875e0c..4a8a01664 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -22,6 +22,7 @@
  * @file util/common_endian.c
  * @brief endian conversion helpers
  * @author Christian Grothoff
+ * @author Gabor X Toth
  */
 
 #include "platform.h"
@@ -29,25 +30,27 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
 
+
 uint64_t
-GNUNET_ntohll (uint64_t n)
+GNUNET_htonll (uint64_t n)
 {
 #if __BYTE_ORDER == __BIG_ENDIAN
   return n;
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
-  return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
+  return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
 #else
   #error byteorder undefined
 #endif
 }
 
+
 uint64_t
-GNUNET_htonll (uint64_t n)
+GNUNET_ntohll (uint64_t n)
 {
 #if __BYTE_ORDER == __BIG_ENDIAN
   return n;
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
-  return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
+  return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
 #else
   #error byteorder undefined
 #endif
@@ -90,5 +93,47 @@ GNUNET_ntoh_double (double d)
 }
 
 
+uint64_t
+GNUNET_htonll_signed (int64_t n)
+{
+  return GNUNET_htonll (n - INT64_MIN);
+}
+
+
+int64_t
+GNUNET_ntohll_signed (uint64_t n)
+{
+  return GNUNET_ntohll (n) + INT64_MIN;
+}
+
+
+uint32_t
+GNUNET_htonl_signed (int32_t n)
+{
+  return htonl (n - INT32_MIN);
+}
+
+
+int32_t
+GNUNET_ntohl_signed (uint32_t n)
+{
+  return ntohl (n) + INT32_MIN;
+}
+
+
+uint16_t
+GNUNET_htons_signed (int16_t n)
+{
+  return htons (n - INT16_MIN);
+}
+
+
+int16_t
+GNUNET_ntohs_signed (uint16_t n)
+{
+  return ntohs (n) + INT16_MIN;
+}
+
+
 
 /* end of common_endian.c */