/*
This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2006 Christian Grothoff (and other contributing authors)
+ (C) 2001, 2002, 2003, 2004, 2006, 2012 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
*/
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
{
#if __BYTE_ORDER == __BIG_ENDIAN
return n;
-#else
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
+#else
+ #error byteorder undefined
#endif
}
{
#if __BYTE_ORDER == __BIG_ENDIAN
return n;
-#else
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
+#else
+ #error byteorder undefined
#endif
}
-double
-GNUNET_hton_double (double d)
+/**
+ * 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)
{
double res;
- unsigned int *in = (unsigned int *) &d;
- unsigned int *out = (unsigned int *) &res;
+ uint64_t *in = (uint64_t *) &d;
+ uint64_t *out = (uint64_t *) &res;
+
+ out[0] = GNUNET_htonll(in[0]);
- out[0] = htonl(in[0]);
- out[1] = htonl(in[1]);
-
return res;
}
-double
-GNUNET_ntoh_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
+ */
+double
+GNUNET_ntoh_double (double d)
{
double res;
- unsigned int *in = (unsigned int *) &d;
- unsigned int *out = (unsigned int *) &res;
+ uint64_t *in = (uint64_t *) &d;
+ uint64_t *out = (uint64_t *) &res;
+
+ out[0] = GNUNET_ntohll(in[0]);
- out[0] = ntohl(in[0]);
- out[1] = ntohl(in[1]);
-
return res;
}