commit d4075782f30ea66ef38bd8d0f9aad146063caeb3
author Maciej Żenczykowski <maze@google.com> Wed Mar 15 00:21:08 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 15 00:21:08 2023 +0000
tree 38c2da5d6f07d91e535b47d80e2e8b8474166370
parent b2007796bb43550b0849b2dd84ed217e03c8d3d3
parent b21fe216cc05640c5cde969c8fbfd8106c815657

Merge "clat: enable PACKET_VNET_HDR on v6 ingress" am: b21fe216cc

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

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

service/jni/com_android_server_connectivity_ClatCoordinator.cpp

diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index dae45f3..062d272 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -182,12 +182,19 @@
         throwIOException(env, "packet socket failed", errno);
         return -1;
     }
-    int on = 1;
+    const int on = 1;
+    // enable tpacket_auxdata cmsg delivery, which includes L2 header length
     if (setsockopt(sock, SOL_PACKET, PACKET_AUXDATA, &on, sizeof(on))) {
         throwIOException(env, "packet socket auxdata enablement failed", errno);
         close(sock);
         return -1;
     }
+    // needed for virtio_net_hdr prepending, which includes checksum metadata
+    if (setsockopt(sock, SOL_PACKET, PACKET_VNET_HDR, &on, sizeof(on))) {
+        throwIOException(env, "packet socket vnet_hdr enablement failed", errno);
+        close(sock);
+        return -1;
+    }
     return sock;
 }