commit a06943ce9b88ea1d208b6f8d74aa5dd7b2f480c5
author Maciej Żenczykowski <maze@google.com> Sun Dec 15 11:57:42 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Mon Dec 16 07:01:30 2019 -0800
tree 770a69cae00e964c9f9b42701afa6c41003aa827
parent b140a3aa1db196e285b8ed94f63d60040d8148c7

implement tcFilterAddDevEgressBpf and add tests

We also take this opportunity to fix an unpaired #undef
and to make the tests use both rawip and ether programs
(even though it's not technically correct on lo).

Test: compiles, atest
Bug: 139396664
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I239dd314dcafcc93b4c63f7a949e963c813e81c8

server/ClatUtilsTest.cpp

diff --git a/server/ClatUtilsTest.cpp b/server/ClatUtilsTest.cpp
index 5d1bf53..0e65379 100644
--- a/server/ClatUtilsTest.cpp
+++ b/server/ClatUtilsTest.cpp
@@ -181,13 +181,13 @@
     close(fd);
 }
 
-void checkAttachBpfFilterClsactLo(const bool ethernet) {
+static void checkAttachBpfFilterClsactLo(const bool ingress, const bool ethernet) {
     // This test requires kernel 4.9-Q or better
     SKIP_IF_BPF_NOT_SUPPORTED;
     if (!kernelSupportsNetSchIngress()) return;
     if (!kernelSupportsNetClsBpf()) return;
 
-    int bpf_fd = getClatIngressProgFd(false);
+    int bpf_fd = ingress ? getClatIngressProgFd(ethernet) : getClatEgressProgFd(ethernet);
     ASSERT_LE(3, bpf_fd);
 
     int fd = openNetlinkSocket();
@@ -198,7 +198,11 @@
         // actually populating the ebpf control map.
         // Furthermore: it only takes fractions of a second.
         EXPECT_EQ(0, tcQdiscAddDevClsact(fd, LOOPBACK_IFINDEX));
-        EXPECT_EQ(0, tcFilterAddDevIngressBpf(fd, LOOPBACK_IFINDEX, bpf_fd, ethernet));
+        if (ingress) {
+            EXPECT_EQ(0, tcFilterAddDevIngressBpf(fd, LOOPBACK_IFINDEX, bpf_fd, ethernet));
+        } else {
+            EXPECT_EQ(0, tcFilterAddDevEgressBpf(fd, LOOPBACK_IFINDEX, bpf_fd, ethernet));
+        }
         EXPECT_EQ(0, tcQdiscDelDevClsact(fd, LOOPBACK_IFINDEX));
         close(fd);
     }
@@ -206,12 +210,20 @@
     close(bpf_fd);
 }
 
-TEST_F(ClatUtilsTest, CheckAttachBpfFilterRawIpClsactLo) {
-    checkAttachBpfFilterClsactLo(false);
+TEST_F(ClatUtilsTest, CheckAttachBpfFilterRawIpClsactEgressLo) {
+    checkAttachBpfFilterClsactLo(/*ingress*/ false, /*ethernet*/ false);
 }
 
-TEST_F(ClatUtilsTest, CheckAttachBpfFilterEthernetClsactLo) {
-    checkAttachBpfFilterClsactLo(true);
+TEST_F(ClatUtilsTest, CheckAttachBpfFilterEthernetClsactEgressLo) {
+    checkAttachBpfFilterClsactLo(/*ingress*/ false, /*ethernet*/ true);
+}
+
+TEST_F(ClatUtilsTest, CheckAttachBpfFilterRawIpClsactIngressLo) {
+    checkAttachBpfFilterClsactLo(/*ingress*/ true, /*ethernet*/ false);
+}
+
+TEST_F(ClatUtilsTest, CheckAttachBpfFilterEthernetClsactIngressLo) {
+    checkAttachBpfFilterClsactLo(/*ingress*/ true, /*ethernet*/ true);
 }
 
 }  // namespace net