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/ClatUtils.cpp

diff --git a/server/ClatUtils.cpp b/server/ClatUtils.cpp
index a5b7c44..a05e3f8 100644
--- a/server/ClatUtils.cpp
+++ b/server/ClatUtils.cpp
@@ -218,7 +218,7 @@
 }
 
 // tc filter add dev .. ingress prio 1 protocol ipv6 bpf object-pinned /sys/fs/bpf/... direct-action
-int tcFilterAddDevBpf(int fd, int ifIndex, int bpfFd, bool ethernet) {
+int tcFilterAddDevIngressBpf(int fd, int ifIndex, int bpfFd, bool ethernet) {
     // The priority doesn't matter until we actually start attaching multiple
     // things to the same interface's ingress point.
     const int prio = 1;

server/ClatUtils.h

diff --git a/server/ClatUtils.h b/server/ClatUtils.h
index 392bd44..e517950 100644
--- a/server/ClatUtils.h
+++ b/server/ClatUtils.h
@@ -40,7 +40,7 @@
 int tcQdiscReplaceDevClsact(int fd, int ifIndex);
 int tcQdiscDelDevClsact(int fd, int ifIndex);
 
-int tcFilterAddDevBpf(int fd, int ifIndex, int bpfFd, bool ethernet);
+int tcFilterAddDevIngressBpf(int fd, int ifIndex, int bpfFd, bool ethernet);
 
 }  // namespace net
 }  // namespace android

server/ClatUtilsTest.cpp

diff --git a/server/ClatUtilsTest.cpp b/server/ClatUtilsTest.cpp
index b1a265b..5d1bf53 100644
--- a/server/ClatUtilsTest.cpp
+++ b/server/ClatUtilsTest.cpp
@@ -198,7 +198,7 @@
         // actually populating the ebpf control map.
         // Furthermore: it only takes fractions of a second.
         EXPECT_EQ(0, tcQdiscAddDevClsact(fd, LOOPBACK_IFINDEX));
-        EXPECT_EQ(0, tcFilterAddDevBpf(fd, LOOPBACK_IFINDEX, bpf_fd, ethernet));
+        EXPECT_EQ(0, tcFilterAddDevIngressBpf(fd, LOOPBACK_IFINDEX, bpf_fd, ethernet));
         EXPECT_EQ(0, tcQdiscDelDevClsact(fd, LOOPBACK_IFINDEX));
         close(fd);
     }

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)