commit abb2cbfa86da8dd8ca7f314d50192cd0d256b913
author Maciej Żenczykowski <maze@google.com> Mon Apr 01 01:29:29 2019 -0700
committer Maciej Żenczykowski <maze@google.com> Mon Apr 01 01:31:32 2019 -0700
tree 99e1d698a7daecff9b28400ce1419eac6467da51
parent 43863e0a89976b572f7bdd31aeb6f87130ac6734

ClatdController - fix dump unique_fd double ownership

Should hopefully fix:
  Abort message: 'failed to exchange ownership of file descriptor: fd ... is owned by unique_fd 0x..., was expected to be unowned'

Test: atest netd_unit_test
Bug: 65674744
Bug: 129654883
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ide661bb6521673d272654e969360ce3aa4bdff5d

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 57f24f3..6f2f43b 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -312,15 +312,14 @@
         }
     }
 
-    int fd = getClatIngressMapFd();
-    if (fd < 0) return;  // if unsupported just don't dump anything
-    unique_fd mapFd(fd);
+    int mapFd = getClatIngressMapFd();
+    if (mapFd < 0) return;  // if unsupported just don't dump anything
+    BpfMap<ClatIngressKey, ClatIngressValue> configMap(mapFd);
 
     ScopedIndent bpfIndent(dw);
     dw.println("BPF ingress map: iif(iface) nat64Prefix v6Addr -> v4Addr oif(iface)");
 
     ScopedIndent bpfDetailIndent(dw);
-    BpfMap<ClatIngressKey, ClatIngressValue> configMap(mapFd);
     const auto printClatMap = [&dw](const ClatIngressKey& key, const ClatIngressValue& value,
                                     const BpfMap<ClatIngressKey, ClatIngressValue>&) {
         char iifStr[IFNAMSIZ] = "?";