commit b140a3aa1db196e285b8ed94f63d60040d8148c7
author Maciej Żenczykowski <maze@google.com> Sun Dec 15 11:53:46 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Sun Dec 15 16:24:11 2019 -0800
tree 334ce80ee0e48eb8e0f2d6dda5943a863b99cd9b
parent e870a8778c4a19443fbb65b1e6dba86667b12722

rename tcFilterAddDevBpf() to tcFilterAddDevIngressBpf()

This is in preparation for Egress support.

Generated via:
  for f in server/{ClatdController.cpp,ClatUtils.cpp,ClatUtils.h,ClatUtilsTest.cpp}; do
    sed -i -r 's@tcFilterAddDevBpf@tcFilterAddDevIngressBpf@' "${f}"
  done

Test: compiles, atest, 'git grep tcFilterAddDevBpf' comes up empty
Bug: 139396664
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5852039648f04716376f6535d5b177ba0ac4ebb6

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index cf0ab96..1f687bc 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -298,14 +298,14 @@
         return;
     }
 
-    rv = tcFilterAddDevBpf(mNetlinkFd, tracker.ifIndex, progFd, isEthernet);
+    rv = tcFilterAddDevIngressBpf(mNetlinkFd, tracker.ifIndex, progFd, isEthernet);
     if (rv) {
         if ((rv == -ENOENT) && (mClatEbpfMode == ClatEbpfMaybe)) {
-            ALOGI("tcFilterAddDevBpf(%d[%s], %d): %s", tracker.ifIndex, tracker.iface, isEthernet,
-                  strerror(-rv));
-        } else {
-            ALOGE("tcFilterAddDevBpf(%d[%s], %d) failure: %s", tracker.ifIndex, tracker.iface,
+            ALOGI("tcFilterAddDevIngressBpf(%d[%s], %d): %s", tracker.ifIndex, tracker.iface,
                   isEthernet, strerror(-rv));
+        } else {
+            ALOGE("tcFilterAddDevIngressBpf(%d[%s], %d) failure: %s", tracker.ifIndex,
+                  tracker.iface, isEthernet, strerror(-rv));
         }
         rv = tcQdiscDelDevClsact(mNetlinkFd, tracker.ifIndex);
         if (rv)