Merge "Use xt_bpf programs to do bandwidth control"android-p-preview-4android-n-iot-release-smart-display

1 files changed, 6 insertions, 3 deletions

diff --git a/server/BandwidthController.h b/server/BandwidthController.h
index adf64c8a..4b72f184 100644
--- a/server/BandwidthController.h
+++ b/server/BandwidthController.h
@@ -33,7 +33,7 @@ public:
     BandwidthController();
 
     int setupIptablesHooks();
-    static bool getBpfStatsStatus();
+    static bool getBpfStatus();
 
     int enableBandwidthControl(bool force);
     int disableBandwidthControl();
@@ -69,6 +69,9 @@ public:
     static const char LOCAL_RAW_PREROUTING[];
     static const char LOCAL_MANGLE_POSTROUTING[];
 
+    enum IptJumpOp { IptJumpReject, IptJumpReturn, IptJumpNoAdd };
+    enum IptOp { IptOpInsert, IptOpDelete };
+
   private:
     struct QuotaInfo {
         int64_t quota;
@@ -77,8 +80,6 @@ public:
 
     enum IptIpVer { IptIpV4, IptIpV6 };
     enum IptFullOp { IptFullOpInsert, IptFullOpDelete, IptFullOpAppend };
-    enum IptJumpOp { IptJumpReject, IptJumpReturn, IptJumpNoAdd };
-    enum IptOp { IptOpInsert, IptOpDelete };
     enum QuotaType { QuotaUnique, QuotaShared };
     enum RunCmdErrHandling { RunCmdFailureBad, RunCmdFailureOk };
 #if LOG_NDEBUG
@@ -125,6 +126,8 @@ public:
     static const char *opToString(IptOp op);
     static const char *jumpToString(IptJumpOp jumpHandling);
 
+    bool mBpfSupported;
+
     int64_t mSharedQuotaBytes = 0;
     int64_t mSharedAlertBytes = 0;
     int64_t mGlobalAlertBytes = 0;