commit 35bc6edd492b9cc9d17d5d7eb6463cbe8cb64685
author Maciej Żenczykowski <maze@google.com> Mon Dec 16 15:39:04 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Mon Dec 16 15:40:00 2019 -0800
tree 69330c8bb9ae83eaf095789615ece518f2c9a8d7
parent 0bd8da7ddb014d139c3a90a402100f30feefd863

ClatdController - refactor init() into init() + resetIngressMap()

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

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 5027ec3..da8f5da 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -70,6 +70,22 @@
 namespace android {
 namespace net {
 
+void ClatdController::resetIngressMap() {
+    int netlinkFd = mNetlinkFd.get();
+
+    const auto del = [&netlinkFd](const ClatIngressKey& key,
+                                  const BpfMap<ClatIngressKey, ClatIngressValue>&) {
+        ALOGW("Removing stale clat config on interface %d.", key.iif);
+        int rv = tcQdiscDelDevClsact(netlinkFd, key.iif);
+        if (rv < 0) ALOGE("tcQdiscDelDevClsact() failure: %s", strerror(-rv));
+        return netdutils::status::ok;  // keep on going regardless
+    };
+    auto ret = mClatIngressMap.iterate(del);
+    if (!isOk(ret)) ALOGE("mClatIngressMap.iterate() failure: %s", strerror(ret.code()));
+    ret = mClatIngressMap.clear();
+    if (!isOk(ret)) ALOGE("mClatIngressMap.clear() failure: %s", strerror(ret.code()));
+}
+
 void ClatdController::init(void) {
     std::lock_guard guard(mutex);
 
@@ -126,20 +142,7 @@
     }
     mClatIngressMap.reset(rv);
 
-    int netlinkFd = mNetlinkFd.get();
-
-    // TODO: perhaps this initial cleanup should be in its own function?
-    const auto del = [&netlinkFd](const ClatIngressKey& key,
-                                  const BpfMap<ClatIngressKey, ClatIngressValue>&) {
-        ALOGW("Removing stale clat config on interface %d.", key.iif);
-        int rv = tcQdiscDelDevClsact(netlinkFd, key.iif);
-        if (rv < 0) ALOGE("tcQdiscDelDevClsact() failure: %s", strerror(-rv));
-        return netdutils::status::ok;  // keep on going regardless
-    };
-    auto ret = mClatIngressMap.iterate(del);
-    if (!isOk(ret)) ALOGE("mClatIngressMap.iterate() failure: %s", strerror(ret.code()));
-    ret = mClatIngressMap.clear();
-    if (!isOk(ret)) ALOGE("mClatIngressMap.clear() failure: %s", strerror(ret.code()));
+    resetIngressMap();
 }
 
 bool ClatdController::isIpv4AddressFree(in_addr_t addr) {