Merge "clat: enable PACKET_AUXDATA cmsg reception"
diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index 2c56d6c..7060958 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -19,6 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
+#include <linux/if_packet.h>
#include <linux/if_tun.h>
#include <linux/ioctl.h>
#include <log/log.h>
@@ -181,6 +182,12 @@
throwIOException(env, "packet socket failed", errno);
return -1;
}
+ int on = 1;
+ if (setsockopt(sock, SOL_PACKET, PACKET_AUXDATA, &on, sizeof(on))) {
+ throwIOException(env, "packet socket auxdata enablement failed", errno);
+ close(sock);
+ return -1;
+ }
return sock;
}