move htons() & friends into bpf_net_helpers
Test: builds
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I26a8f27fd04ad6feaeeb54f6b794d87eccf3dae7
diff --git a/bpf_progs/bpf_net_helpers.h b/bpf_progs/bpf_net_helpers.h
index fcc79f2..239cf31 100644
--- a/bpf_progs/bpf_net_helpers.h
+++ b/bpf_progs/bpf_net_helpers.h
@@ -35,6 +35,12 @@
__u64 flags) = (void*)BPF_FUNC_l4_csum_replace;
static int (*bpf_redirect)(__u32 ifindex, __u64 flags) = (void*)BPF_FUNC_redirect;
+// Android only supports little endian architectures
+#define htons(x) (__builtin_constant_p(x) ? ___constant_swab16(x) : __builtin_bswap16(x))
+#define htonl(x) (__builtin_constant_p(x) ? ___constant_swab32(x) : __builtin_bswap32(x))
+#define ntohs(x) htons(x)
+#define ntohl(x) htonl(x)
+
static inline __always_inline __unused bool is_received_skb(struct __sk_buff* skb) {
return skb->pkt_type == PACKET_HOST || skb->pkt_type == PACKET_BROADCAST ||
skb->pkt_type == PACKET_MULTICAST;
diff --git a/bpf_progs/clatd.c b/bpf_progs/clatd.c
index 6b4509a..fb7acfa 100644
--- a/bpf_progs/clatd.c
+++ b/bpf_progs/clatd.c
@@ -33,12 +33,6 @@
// From kernel:include/net/ip.h
#define IP_DF 0x4000 // Flag: "Don't Fragment"
-// Android only supports little endian architectures
-#define htons(x) (__builtin_constant_p(x) ? ___constant_swab16(x) : __builtin_bswap16(x))
-#define htonl(x) (__builtin_constant_p(x) ? ___constant_swab32(x) : __builtin_bswap32(x))
-#define ntohs(x) htons(x)
-#define ntohl(x) htonl(x)
-
DEFINE_BPF_MAP(clat_ingress_map, HASH, ClatIngressKey, ClatIngressValue, 16)
static inline __always_inline int nat64(struct __sk_buff* skb, bool is_ethernet) {