commit 8d3bde79494004524e8bb80bcb96ce742b3b878a
author Maciej Żenczykowski <maze@google.com> Sun Oct 08 18:43:23 2023 -0700
committer Maciej Żenczykowski <maze@google.com> Sun Oct 08 20:16:59 2023 -0700
tree c9c7e17593f46a7141e1b57bdc9e94b51019bb20
parent a8852b24885988dd92f3518e7364193c0405b88a

type safety for is_ethernet

(reversing logic, as 'rawip.rawip' is much shorter then 'ethernet.ethernet')

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib48cc2b889e8b587e14edbe89606f887a884af87

bpf_progs/clatd.c

diff --git a/bpf_progs/clatd.c b/bpf_progs/clatd.c
index ae63d2a..addb02f 100644
--- a/bpf_progs/clatd.c
+++ b/bpf_progs/clatd.c
@@ -55,8 +55,10 @@
 DEFINE_BPF_MAP_GRW(clat_ingress6_map, HASH, ClatIngress6Key, ClatIngress6Value, 16, AID_SYSTEM)
 
 static inline __always_inline int nat64(struct __sk_buff* skb,
-                                        const bool is_ethernet,
+                                        const struct rawip_bool rawip,
                                         const struct kver_uint kver) {
+    const bool is_ethernet = !rawip.rawip;
+
     // Require ethernet dst mac address to be our unicast address.
     if (is_ethernet && (skb->pkt_type != PACKET_HOST)) return TC_ACT_PIPE;