remove multiple implementations of htonll(), ntohll()

use a single #define in include/netlink-private/utils.h

Signed-off-by: Davide Caratti <davide.caratti@gmail.com>

diff --git a/include/netlink-private/utils.h b/include/netlink-private/utils.h
index 77aadb3b465587dd9c14489e37926aa589fabfaa..d9c55d013d1760ab9d14429e0cea4ff580e9c47e 100644 (file)
--- a/include/netlink-private/utils.h
+++ b/include/netlink-private/utils.h
@@ -12,6 +12,14 @@
 #ifndef NETLINK_UTILS_PRIV_H_
 #define NETLINK_UTILS_PRIV_H_
 
+#include <byteswap.h>
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define ntohll(x) (x)
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+#define ntohll(x) bswap_64((x))
+#endif
+#define htonll(x) ntohll(x)
+
 extern const char *    nl_strerror_l(int err);
 
 #endif

diff --git a/lib/netfilter/ct.c b/lib/netfilter/ct.c
index 62ee77f3b5144d245ad58fc7e4c3393de7d3d879..1b29cf6f80903f5045ebf37c0a44cc04cc70ff5b 100644 (file)
--- a/lib/netfilter/ct.c
+++ b/lib/netfilter/ct.c
@@ -27,20 +27,10 @@
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/ct.h>
+#include <netlink-private/utils.h>
 
 static struct nl_cache_ops nfnl_ct_ops;
 
-#if __BYTE_ORDER == __BIG_ENDIAN
-static uint64_t ntohll(uint64_t x)
-{
-       return x;
-}
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-static uint64_t ntohll(uint64_t x)
-{
-       return bswap_64(x);
-}
-#endif
 
 static struct nla_policy ct_policy[CTA_MAX+1] = {
        [CTA_TUPLE_ORIG]        = { .type = NLA_NESTED },

diff --git a/lib/netfilter/log_msg.c b/lib/netfilter/log_msg.c
index 5ffdaf80e0edf0dc88873bc369d87119f5448cbb..30fb8b32db077d18eaa08aac0e477bacfce6bace 100644 (file)
--- a/lib/netfilter/log_msg.c
+++ b/lib/netfilter/log_msg.c
@@ -26,19 +26,7 @@
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log_msg.h>
-#include <byteswap.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-static uint64_t ntohll(uint64_t x)
-{
-       return x;
-}
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-static uint64_t ntohll(uint64_t x)
-{
-       return bswap_64(x);
-}
-#endif
+#include <netlink-private/utils.h>
 
 static struct nla_policy log_msg_policy[NFULA_MAX+1] = {
        [NFULA_PACKET_HDR]              = {

diff --git a/lib/netfilter/queue_msg.c b/lib/netfilter/queue_msg.c
index 338892333fb8104014ae5d32bf80393f264fae2b..1947ab7b63503a54fc97fc76d2b76d7d6b8c54a5 100644 (file)
--- a/lib/netfilter/queue_msg.c
+++ b/lib/netfilter/queue_msg.c
@@ -24,22 +24,10 @@
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/queue_msg.h>
-#include <byteswap.h>
+#include <netlink-private/utils.h>
 
 static struct nl_cache_ops nfnl_queue_msg_ops;
 
-#if __BYTE_ORDER == __BIG_ENDIAN
-static uint64_t ntohll(uint64_t x)
-{
-       return x;
-}
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-static uint64_t ntohll(uint64_t x)
-{
-       return bswap_64(x);
-}
-#endif
-
 static struct nla_policy queue_policy[NFQA_MAX+1] = {
        [NFQA_PACKET_HDR]               = {
                .minlen = sizeof(struct nfqnl_msg_packet_hdr),

diff --git a/lib/route/link/macsec.c b/lib/route/link/macsec.c
index b43f1767285b89f77336eac51417cdc404207e3a..186e8d125afeb39b5aa740f4fc18d8a79a9aa698 100644 (file)
--- a/lib/route/link/macsec.c
+++ b/lib/route/link/macsec.c
@@ -16,24 +16,10 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink-private/route/link/api.h>
+#include <netlink-private/utils.h>
 
 #include <linux/if_macsec.h>
 
-#include <byteswap.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-static uint64_t ntohll(uint64_t x)
-{
-       return x;
-}
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-static uint64_t ntohll(uint64_t x)
-{
-       return bswap_64(x);
-}
-#endif
-#define htonll(x) ntohll(x)
-
 #define MACSEC_ATTR_SCI                        (1 << 0)
 #define MACSEC_ATTR_ICV_LEN            (1 << 1)
 #define MACSEC_ATTR_CIPHER_SUITE       (1 << 2)