commit f52d4522e7424fefca6719f10eaa0beff93f68ae
author Erik Kline <ek@google.com> Wed Mar 14 15:01:46 2018 +0900
committer Erik Kline <ek@google.com> Sun Mar 18 14:30:59 2018 -0700
tree f193423106a0d44495fc92a65df53d78f21e0dea
parent 84fde8c5bf02e50bc2f210f63a2069cd0815db28

Migrate INetd String16 method to std::string

Test: as follows
    - built
    - flashed
    - booted
    - system/netd/tests/runtests.sh passes
Change-Id: I7fe0e14a23b3c6f82dbfa17c7a44d221720976a0

server/FirewallController.h

diff --git a/server/FirewallController.h b/server/FirewallController.h
index 1da9e70..c7928b9 100644
--- a/server/FirewallController.h
+++ b/server/FirewallController.h
@@ -34,9 +34,6 @@
 
 enum ChildChain { NONE, DOZABLE, STANDBY, POWERSAVE, INVALID_CHAIN };
 
-#define PROTOCOL_TCP 6
-#define PROTOCOL_UDP 17
-
 /*
  * Simple firewall that drops all packets except those matching explicitly
  * defined ALLOW rules.
@@ -62,7 +59,7 @@
 
     int enableChildChains(ChildChain, bool);
 
-    int replaceUidChain(const char*, bool, const std::vector<int32_t>&);
+    int replaceUidChain(const std::string&, bool, const std::vector<int32_t>&);
 
     static std::string makeCriticalCommands(IptablesTarget target, const char* chainName);