commit 75f4dc3758bbe8a6ed168772e13e803b712d686a
author Maciej Żenczykowski <maze@google.com> Mon Dec 16 18:38:54 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Mon Dec 16 18:39:51 2019 -0800
tree cb320239e610ed3e3d6beccf204877715bb0d195
parent a8ef6f9b42c9ba753ce2691110764a18baaa477c

ClatdController - rename progFd to rxProgFd

(since this is the ingress, and not egress program)

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

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index a29962c..67e16c2 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -297,7 +297,7 @@
         ALOGE("getClatIngressProgFd(%d) failure: %s", isEthernet, strerror(-rv));
         return;
     }
-    unique_fd progFd(rv);
+    unique_fd rxProgFd(rv);
 
     ClatIngressKey key = {
             .iif = tracker.ifIndex,
@@ -328,7 +328,7 @@
         return;
     }
 
-    rv = tcFilterAddDevIngressBpf(mNetlinkFd, tracker.ifIndex, progFd, isEthernet);
+    rv = tcFilterAddDevIngressBpf(mNetlinkFd, tracker.ifIndex, rxProgFd, isEthernet);
     if (rv) {
         if ((rv == -ENOENT) && (mClatEbpfMode == ClatEbpfMaybe)) {
             ALOGI("tcFilterAddDevIngressBpf(%d[%s], %d): %s", tracker.ifIndex, tracker.iface,