commit bcaf128ac3c8b437c2e192c78872dd88e2b8246c
author Maciej Żenczykowski <maze@google.com> Sat Jun 11 08:17:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 11 08:17:55 2022 +0000
tree ec04dacc7e6fc5820e04b73aaecbb5d9d3d787fb
parent cb74444a7fc2a5b4f0a2ead6daa31ec1e77f5991
parent e8dceddeec89515ee0ea53e6ad3d92bb5d63d623

enable NETLINK_EXT_ACK extended error reporting am: 6ef57677b8

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2120769

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

staticlibs/native/tcutils/tcutils.cpp

diff --git a/staticlibs/native/tcutils/tcutils.cpp b/staticlibs/native/tcutils/tcutils.cpp
index 144a4c9..4101885 100644
--- a/staticlibs/native/tcutils/tcutils.cpp
+++ b/staticlibs/native/tcutils/tcutils.cpp
@@ -386,6 +386,12 @@
     return -error;
   }
 
+  if (setsockopt(fd, SOL_NETLINK, NETLINK_EXT_ACK, &on, sizeof(on))) {
+    int error = errno;
+    ALOGW("setsockopt(fd, SOL_NETLINK, NETLINK_EXT_ACK, 1): %d", error);
+    // will fail on 4.9 kernels so don't: return -error;
+  }
+
   // this is needed to get valid strace netlink parsing, it allocates the pid
   if (bind(fd, (const struct sockaddr *)&KERNEL_NLADDR,
            sizeof(KERNEL_NLADDR))) {