commit cf7ca1d38e7d59cc615d9aed91cbd31bfa6aeecc
author Maciej Żenczykowski <maze@google.com> Fri Mar 21 14:40:56 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 21 14:40:56 2025 -0700
tree f8eed9bc835a00c31170df4629963b1a2de91d75
parent 7b07e7219dc6a6bf51c59a39f1d583b9acf4d413
parent 30020a513aeeb5eeb773ae39672acc0029ada41c

clatd: fix endianness of multicast drop am: 30020a513a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3555171

Change-Id: Ic1b1f0ffcf531deb67ff8506da0a76e7a1a36a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bpf/progs/clatd.c

diff --git a/bpf/progs/clatd.c b/bpf/progs/clatd.c
index 2bb9d6f..f4e4f3b 100644
--- a/bpf/progs/clatd.c
+++ b/bpf/progs/clatd.c
@@ -289,7 +289,7 @@
     if (ip4->ihl != 5) return TC_ACT_PIPE;
 
     // Packet must not be multicast
-    if ((ip4->daddr & 0xf0000000) == 0xe0000000) return TC_ACT_PIPE;
+    if ((ip4->daddr & htonl(0xf0000000)) == htonl(0xe0000000)) return TC_ACT_PIPE;
 
     // Calculate the IPv4 one's complement checksum of the IPv4 header.
     __wsum sum4 = 0;

clatd/ipv4.c

diff --git a/clatd/ipv4.c b/clatd/ipv4.c
index 81bf87b..d7ac0d1 100644
--- a/clatd/ipv4.c
+++ b/clatd/ipv4.c
@@ -85,8 +85,8 @@
     return 0;
   }
 
-  if ((header->daddr & 0xf0000000) == 0xe0000000) {
-    logmsg_dbg(ANDROID_LOG_INFO, "ip_packet/daddr is multicast: %x", header->daddr);
+  if ((header->daddr & htonl(0xf0000000)) == htonl(0xe0000000)) {
+    logmsg_dbg(ANDROID_LOG_INFO, "ip_packet/daddr is multicast: %x", ntohl(header->daddr));
     return 0;
   }