commit 06192fe92d432cec20c42a503ba5501b9be780be
author Maciej Żenczykowski <maze@google.com> Wed Mar 27 09:54:01 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 27 09:54:01 2019 +0000
tree d54b581818b7d1790b14d239b6c9907ee247a0fc
parent 6f6d27337b501038a290d827a6b8fe00d56188ed
parent 0a7dce83db6e3fe38882ae905fc49b2d772a1eb7

Merge changes from topic "ebpfclat"

* changes:
  ClatUtils - implement hardwareAddressType()
  system/netd/server - add ClatUtils.{cpp,h} skeleton

client/NetdClient.cpp

diff --git a/client/NetdClient.cpp b/client/NetdClient.cpp
index fa45eb0..195c45d 100644
--- a/client/NetdClient.cpp
+++ b/client/NetdClient.cpp
@@ -42,7 +42,7 @@
 namespace {
 
 // Keep this in sync with CMD_BUF_SIZE in FrameworkListener.cpp.
-constexpr size_t MAX_CMD_SIZE = 1024;
+constexpr size_t MAX_CMD_SIZE = 4096;
 
 std::atomic_uint netIdForProcess(NETID_UNSET);
 std::atomic_uint netIdForResolv(NETID_UNSET);

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index bb569e9..ad0dfef 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -1222,8 +1222,8 @@
     std::string uidRule = StringPrintf("owner UID match %u", uid);
     std::string perUidChain = StringPrintf("st_clear_caught_%u", uid);
     for (const auto& binary : {IPTABLES_PATH, IP6TABLES_PATH}) {
-        EXPECT_FALSE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule.c_str()));
-        EXPECT_FALSE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule.c_str()));
+        EXPECT_FALSE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule));
+        EXPECT_FALSE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule));
         EXPECT_EQ(0, iptablesRuleLineLength(binary, perUidChain.c_str()));
     }
 }
@@ -1233,8 +1233,8 @@
     std::string uidRule = StringPrintf("owner UID match %u", uid);
     std::string perUidChain = StringPrintf("st_clear_caught_%u", uid);
     for (const auto& binary : {IPTABLES_PATH, IP6TABLES_PATH}) {
-        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule.c_str()));
-        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule.c_str()));
+        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule));
+        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule));
         EXPECT_TRUE(iptablesRuleExists(binary, perUidChain.c_str(), logRule));
     }
 }
@@ -1244,8 +1244,8 @@
     std::string uidRule = StringPrintf("owner UID match %u", uid);
     std::string perUidChain = StringPrintf("st_clear_caught_%u", uid);
     for (const auto& binary : {IPTABLES_PATH, IP6TABLES_PATH}) {
-        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule.c_str()));
-        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule.c_str()));
+        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule));
+        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule));
         EXPECT_TRUE(iptablesRuleExists(binary, perUidChain.c_str(), rejectRule));
     }
 }
@@ -1297,7 +1297,7 @@
     std::string cmd = StringPrintf("ps -Af | grep '[0-9] %s'", processName.c_str());
     std::vector<std::string> result;
     for (uint32_t run = 1;;) {
-        result = runCommand(cmd.c_str());
+        result = runCommand(cmd);
         if (result.size() || ++run > maxTries) {
             break;
         }