commit 0bd8da7ddb014d139c3a90a402100f30feefd863
author Maciej Żenczykowski <maze@google.com> Mon Dec 16 15:16:28 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Mon Dec 16 15:26:46 2019 -0800
tree 22f3e18469a911a466512e0c101133bda161cd61
parent 1afbd997299e081aad9de62a72de53ac70119f98

ClatdController - add mClatEgressMap and initialize it

Test: compiles, atest
Bug: 139396664
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I950ac0a67595b27d31ec51400c0e11c5b521c92d

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 7270b6e..5027ec3 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -107,10 +107,20 @@
     }
     mNetlinkFd.reset(rv);
 
+    rv = getClatEgressMapFd();
+    if (rv < 0) {
+        ALOGE("getClatEgressMapFd() failure: %s", strerror(-rv));
+        mClatEbpfMode = ClatEbpfDisabled;
+        mNetlinkFd.reset(-1);
+        return;
+    }
+    mClatEgressMap.reset(rv);
+
     rv = getClatIngressMapFd();
     if (rv < 0) {
         ALOGE("getClatIngressMapFd() failure: %s", strerror(-rv));
         mClatEbpfMode = ClatEbpfDisabled;
+        mClatEgressMap.reset(-1);
         mNetlinkFd.reset(-1);
         return;
     }