commit d9db08c4a12d6a2953b597d39bb3ac37c43d3658
author Lorenzo Colitti <lorenzo@google.com> Fri Apr 28 11:06:40 2017 +0900
committer Lorenzo Colitti <lorenzo@google.com> Fri Apr 28 17:31:09 2017 +0900
tree 87c08c19960c70e4c3edb05eb22043bed8733b12
parent f4dfa682f436398d74e8b55d610b8cca53877246

Simplify enums in BandwidthController.

1. Ensure that the code always uses all enum values. This
   provides a clear compile-time error if a passed-in enum value
   is not handled, and allows us to remove several default
   case labels and unreachable error logging code.
2. Factor out to common functions the code that converts enum
   values to parts of iptables command lines.

Bug: 32073253
Test: netd_{unit,integration}_test pass
Change-Id: I7136055100dc312fa7cb8bba5506fe86412b1f4d

server/BandwidthController.h

diff --git a/server/BandwidthController.h b/server/BandwidthController.h
index 0398ce9..0a51346 100644
--- a/server/BandwidthController.h
+++ b/server/BandwidthController.h
@@ -124,9 +124,9 @@
     };
 
     enum IptIpVer { IptIpV4, IptIpV6 };
-    enum IptOp { IptOpInsert, IptOpReplace, IptOpDelete, IptOpAppend };
+    enum IptFullOp { IptFullOpInsert, IptFullOpDelete, IptFullOpAppend };
     enum IptJumpOp { IptJumpReject, IptJumpReturn, IptJumpNoAdd };
-    enum SpecialAppOp { SpecialAppOpAdd, SpecialAppOpRemove };
+    enum IptOp { IptOpInsert, IptOpDelete };
     enum QuotaType { QuotaUnique, QuotaShared };
     enum RunCmdErrHandling { RunCmdFailureBad, RunCmdFailureOk };
 #if LOG_NDEBUG
@@ -137,15 +137,15 @@
 
     int manipulateSpecialApps(int numUids, char *appStrUids[],
                                const char *chain,
-                               IptJumpOp jumpHandling, SpecialAppOp appOp);
-    int manipulateNaughtyApps(int numUids, char *appStrUids[], SpecialAppOp appOp);
-    int manipulateNiceApps(int numUids, char *appStrUids[], SpecialAppOp appOp);
+                               IptJumpOp jumpHandling, IptOp appOp);
+    int manipulateNaughtyApps(int numUids, char *appStrUids[], IptOp appOp);
+    int manipulateNiceApps(int numUids, char *appStrUids[], IptOp appOp);
 
     int prepCostlyIface(const char *ifn, QuotaType quotaType);
     int cleanupCostlyIface(const char *ifn, QuotaType quotaType);
 
     std::string makeIptablesSpecialAppCmd(IptOp op, int uid, const char *chain);
-    std::string makeIptablesQuotaCmd(IptOp op, const char *costName, int64_t quota);
+    std::string makeIptablesQuotaCmd(IptFullOp op, const char *costName, int64_t quota);
 
     int runIptablesAlertCmd(IptOp op, const char *alertName, int64_t bytes);
     int runIptablesAlertFwdCmd(IptOp op, const char *alertName, int64_t bytes);
@@ -223,6 +223,10 @@
     static int (*execFunction)(int, char **, int *, bool, bool);
     static FILE *(*popenFunction)(const char *, const char *);
     static int (*iptablesRestoreFunction)(IptablesTarget, const std::string&, std::string *);
+
+private:
+    static const char *opToString(IptOp op);
+    static const char *jumpToString(IptJumpOp jumpHandling);
 };
 
 #endif