commit 023ad6a0878496ab0f54bb6ec52eddd29f5af2f9
author Maciej Żenczykowski <maze@google.com> Thu Jun 09 22:33:34 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Thu Jun 09 22:35:13 2022 +0000
tree 9c7f50d085a09372e8bcb0a5c8eba9a8a5c91bc7
parent ecb17d3fd62f6ea7117a7d1f098034288072f224

fix sign of error to be positive when passed to strerror()

Currently we see:
  E TcUtils : NLMSG_ERROR message return error: -2
  E ConnectivityService: TcUtils.tcFilterAddDevIngressPolice(ifaceIndex=6, PRIO_POLICE, ETH_P_ALL, rateInBytesPerSecond=2500000, bpfProgPath=/sys/fs/bpf/netd_shared/prog_netd_schedact_ingress_account) failure:
  E ConnectivityService: java.io.IOException: com_android_net_module_util_TcUtils_tcFilterAddDevIngressPolice error: : Unknown error -2

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

staticlibs/native/bpfmapjni/com_android_net_module_util_TcUtils.cpp

diff --git a/staticlibs/native/bpfmapjni/com_android_net_module_util_TcUtils.cpp b/staticlibs/native/bpfmapjni/com_android_net_module_util_TcUtils.cpp
index 073a46f..cb06afb 100644
--- a/staticlibs/native/bpfmapjni/com_android_net_module_util_TcUtils.cpp
+++ b/staticlibs/native/bpfmapjni/com_android_net_module_util_TcUtils.cpp
@@ -34,7 +34,7 @@
   int error = isEthernet(interface.c_str(), result);
   if (error) {
     throwIOException(
-        env, "com_android_net_module_util_TcUtils_isEthernet error: ", error);
+        env, "com_android_net_module_util_TcUtils_isEthernet error: ", -error);
   }
   // result is not touched when error is returned; leave false.
   return result;
@@ -50,7 +50,7 @@
   if (error) {
     throwIOException(
         env,
-        "com_android_net_module_util_TcUtils_tcFilterAddDevBpf error: ", error);
+        "com_android_net_module_util_TcUtils_tcFilterAddDevBpf error: ", -error);
   }
 }
 
@@ -68,7 +68,7 @@
     throwIOException(env,
                      "com_android_net_module_util_TcUtils_"
                      "tcFilterAddDevIngressPolice error: ",
-                     error);
+                     -error);
   }
 }
 
@@ -80,7 +80,7 @@
   if (error) {
     throwIOException(
         env,
-        "com_android_net_module_util_TcUtils_tcFilterDelDev error: ", error);
+        "com_android_net_module_util_TcUtils_tcFilterDelDev error: ", -error);
   }
 }
 
@@ -92,7 +92,7 @@
   if (error) {
     throwIOException(
         env,
-        "com_android_net_module_util_TcUtils_tcQdiscAddDevClsact error: ", error);
+        "com_android_net_module_util_TcUtils_tcQdiscAddDevClsact error: ", -error);
   }
 }