commit 86400031a2c59e335e645d77800a5d4ee72a3bf3
author Maciej Żenczykowski <maze@google.com> Thu Feb 13 18:39:34 2020 -0800
committer Maciej Żenczykowski <maze@google.com> Sat Feb 15 12:59:06 2020 -0800
tree 4253a627dac95c2fea9a39d8149cadb872c6f02c
parent ad73089954f6d13f90eccb2d2e6b38a86ae2b361

OffloadUtils - Introduce 'EGRESS' and 'INGRESS' helper constants.

Makes things a tad easier to read.

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

server/OffloadUtils.h

diff --git a/server/OffloadUtils.h b/server/OffloadUtils.h
index 1705e84..2caace0 100644
--- a/server/OffloadUtils.h
+++ b/server/OffloadUtils.h
@@ -36,6 +36,10 @@
 constexpr bool RAWIP = false;
 constexpr bool ETHER = true;
 
+// For better code clarity when used for 'bool ingress' parameter.
+constexpr bool EGRESS = false;
+constexpr bool INGRESS = true;
+
 inline int getClatEgressMapFd(void) {
     const int fd = bpf::bpfFdGet(CLAT_EGRESS_MAP_PATH, 0);
     return (fd == -1) ? -errno : fd;
@@ -95,12 +99,12 @@
 
 // tc filter add dev .. ingress prio 1 protocol ipv6 bpf object-pinned /sys/fs/bpf/... direct-action
 inline int tcFilterAddDevIngressBpf(int ifIndex, int bpfFd, bool ethernet) {
-    return tcFilterAddDevBpf(ifIndex, bpfFd, ethernet, /*ingress*/ true, /*ipv6*/ true);
+    return tcFilterAddDevBpf(ifIndex, bpfFd, ethernet, INGRESS, /*ipv6*/ true);
 }
 
 // tc filter add dev .. egress prio 1 protocol ip bpf object-pinned /sys/fs/bpf/... direct-action
 inline int tcFilterAddDevEgressBpf(int ifIndex, int bpfFd, bool ethernet) {
-    return tcFilterAddDevBpf(ifIndex, bpfFd, ethernet, /*ingress*/ false, /*ipv6*/ false);
+    return tcFilterAddDevBpf(ifIndex, bpfFd, ethernet, EGRESS, /*ipv6*/ false);
 }
 
 // tc filter del dev .. in/egress prio .. protocol ..
@@ -108,12 +112,12 @@
 
 // tc filter del dev .. ingress prio 1 protocol ipv6
 inline int tcFilterDelDevIngressClatIpv6(int ifIndex) {
-    return tcFilterDelDev(ifIndex, /*ingress*/ true, /*prio*/ 1, ETH_P_IPV6);
+    return tcFilterDelDev(ifIndex, INGRESS, /*prio*/ 1, ETH_P_IPV6);
 }
 
 // tc filter del dev .. egress prio 1 protocol ip
 inline int tcFilterDelDevEgressClatIpv4(int ifIndex) {
-    return tcFilterDelDev(ifIndex, /*ingress*/ false, /*prio*/ 1, ETH_P_IP);
+    return tcFilterDelDev(ifIndex, EGRESS, /*prio*/ 1, ETH_P_IP);
 }
 
 }  // namespace net

server/OffloadUtilsTest.cpp

diff --git a/server/OffloadUtilsTest.cpp b/server/OffloadUtilsTest.cpp
index 6bfe52c..7a21a94 100644
--- a/server/OffloadUtilsTest.cpp
+++ b/server/OffloadUtilsTest.cpp
@@ -247,19 +247,19 @@
 }
 
 TEST_F(OffloadUtilsTest, CheckAttachBpfFilterRawIpClsactEgressLo) {
-    checkAttachDetachBpfFilterClsactLo(/*ingress*/ false, RAWIP);
+    checkAttachDetachBpfFilterClsactLo(EGRESS, RAWIP);
 }
 
 TEST_F(OffloadUtilsTest, CheckAttachBpfFilterEthernetClsactEgressLo) {
-    checkAttachDetachBpfFilterClsactLo(/*ingress*/ false, ETHER);
+    checkAttachDetachBpfFilterClsactLo(EGRESS, ETHER);
 }
 
 TEST_F(OffloadUtilsTest, CheckAttachBpfFilterRawIpClsactIngressLo) {
-    checkAttachDetachBpfFilterClsactLo(/*ingress*/ true, RAWIP);
+    checkAttachDetachBpfFilterClsactLo(INGRESS, RAWIP);
 }
 
 TEST_F(OffloadUtilsTest, CheckAttachBpfFilterEthernetClsactIngressLo) {
-    checkAttachDetachBpfFilterClsactLo(/*ingress*/ true, ETHER);
+    checkAttachDetachBpfFilterClsactLo(INGRESS, ETHER);
 }
 
 }  // namespace net