commit ad73089954f6d13f90eccb2d2e6b38a86ae2b361
author Maciej Żenczykowski <maze@google.com> Thu Feb 13 18:21:32 2020 -0800
committer Maciej Żenczykowski <maze@google.com> Sat Feb 15 12:59:06 2020 -0800
tree e2b4bd7b49ce605f610ceb3844cb92690c6524d3
parent 77eabde0c1016e7ae074e57af94b3551e4c65e58

OffloadUtils - Introduce 'RAWIP' and 'ETHER' helper constants.

Makes things a tad easier to read.

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

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 294e55b..7e697b7 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -279,9 +279,9 @@
     }
 
     // This program will be attached to the v4-* interface which is a TUN and thus always rawip.
-    rv = getClatEgressProgFd(false);
+    rv = getClatEgressProgFd(RAWIP);
     if (rv < 0) {
-        ALOGE("getClatEgressProgFd(false) failure: %s", strerror(-rv));
+        ALOGE("getClatEgressProgFd(RAWIP) failure: %s", strerror(-rv));
         return;
     }
     unique_fd txRawIpProgFd(rv);
@@ -364,13 +364,13 @@
         return;
     }
 
-    rv = tcFilterAddDevEgressBpf(tracker.v4ifIndex, txRawIpProgFd, false);
+    rv = tcFilterAddDevEgressBpf(tracker.v4ifIndex, txRawIpProgFd, RAWIP);
     if (rv) {
         if ((rv == -ENOENT) && (mClatEbpfMode == ClatEbpfMaybe)) {
-            ALOGI("tcFilterAddDevEgressBpf(%d[%s], false): %s", tracker.v4ifIndex, tracker.v4iface,
+            ALOGI("tcFilterAddDevEgressBpf(%d[%s], RAWIP): %s", tracker.v4ifIndex, tracker.v4iface,
                   strerror(-rv));
         } else {
-            ALOGE("tcFilterAddDevEgressBpf(%d[%s], false) failure: %s", tracker.v4ifIndex,
+            ALOGE("tcFilterAddDevEgressBpf(%d[%s], RAWIP) failure: %s", tracker.v4ifIndex,
                   tracker.v4iface, strerror(-rv));
         }
         rv = tcQdiscDelDevClsact(tracker.ifIndex);