commit 3316382793d2a0747a7d4b0eaf539cedb0bdcbf7
author Maciej Żenczykowski <maze@google.com> Sun Feb 16 17:12:41 2020 -0800
committer Maciej Żenczykowski <maze@google.com> Sun Feb 16 17:21:52 2020 -0800
tree c83b608e0a14d1ca49db8078546ec9346dd45fa4
parent 241e1d9b0875acbc72b82d3ac18125eb38901110

Clat - rename bpf attaching functions

The naming is no longer appropriate with the coming of tether offload.

Test: build
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I94fd53bd090b0c397b9eacf2c6fb7f0f6c65bb59

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 7e697b7..492d946 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -364,13 +364,13 @@
         return;
     }
 
-    rv = tcFilterAddDevEgressBpf(tracker.v4ifIndex, txRawIpProgFd, RAWIP);
+    rv = tcFilterAddDevEgressClatIpv4(tracker.v4ifIndex, txRawIpProgFd, RAWIP);
     if (rv) {
         if ((rv == -ENOENT) && (mClatEbpfMode == ClatEbpfMaybe)) {
-            ALOGI("tcFilterAddDevEgressBpf(%d[%s], RAWIP): %s", tracker.v4ifIndex, tracker.v4iface,
-                  strerror(-rv));
+            ALOGI("tcFilterAddDevEgressClatIpv4(%d[%s], RAWIP): %s", tracker.v4ifIndex,
+                  tracker.v4iface, strerror(-rv));
         } else {
-            ALOGE("tcFilterAddDevEgressBpf(%d[%s], RAWIP) failure: %s", tracker.v4ifIndex,
+            ALOGE("tcFilterAddDevEgressClatIpv4(%d[%s], RAWIP) failure: %s", tracker.v4ifIndex,
                   tracker.v4iface, strerror(-rv));
         }
         rv = tcQdiscDelDevClsact(tracker.ifIndex);
@@ -392,13 +392,13 @@
         return;
     }
 
-    rv = tcFilterAddDevIngressBpf(tracker.ifIndex, rxProgFd, isEthernet);
+    rv = tcFilterAddDevIngressClatIpv6(tracker.ifIndex, rxProgFd, isEthernet);
     if (rv) {
         if ((rv == -ENOENT) && (mClatEbpfMode == ClatEbpfMaybe)) {
-            ALOGI("tcFilterAddDevIngressBpf(%d[%s], %d): %s", tracker.ifIndex, tracker.iface,
+            ALOGI("tcFilterAddDevIngressClatIpv6(%d[%s], %d): %s", tracker.ifIndex, tracker.iface,
                   isEthernet, strerror(-rv));
         } else {
-            ALOGE("tcFilterAddDevIngressBpf(%d[%s], %d) failure: %s", tracker.ifIndex,
+            ALOGE("tcFilterAddDevIngressClatIpv6(%d[%s], %d) failure: %s", tracker.ifIndex,
                   tracker.iface, isEthernet, strerror(-rv));
         }
         rv = tcQdiscDelDevClsact(tracker.ifIndex);