Merge changes Ifbd15bf9,I985e6861,I54860c7c into nyc-dev
* changes:
Make FirewallController::createChain use replaceUidChain.
Make firewallReplaceUidChain match the behaviour of createChain.
Don't crash the test if expecting more commands than were run.
diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index 8b1f84e..3364577 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -135,7 +135,8 @@
}
NetworkController::NetworkController() :
- mDelegateImpl(new NetworkController::DelegateImpl(this)), mDefaultNetId(NETID_UNSET) {
+ mDelegateImpl(new NetworkController::DelegateImpl(this)), mDefaultNetId(NETID_UNSET),
+ mProtectableUsers({AID_VPN}) {
mNetworks[LOCAL_NET_ID] = new LocalNetwork(LOCAL_NET_ID);
mNetworks[DUMMY_NET_ID] = new DummyNetwork(DUMMY_NET_ID);
}
diff --git a/tests/dns_responder.cpp b/tests/dns_responder.cpp
index 4b77b62..6094ca1 100644
--- a/tests/dns_responder.cpp
+++ b/tests/dns_responder.cpp
@@ -802,7 +802,7 @@
record.name = question.qname;
record.rtype = question.qtype;
record.rclass = ns_class::ns_c_in;
- record.ttl = 1;
+ record.ttl = 5; // seconds
if (question.qtype == ns_type::ns_t_a) {
record.rdata.resize(4);
if (inet_pton(AF_INET, it->second.c_str(), record.rdata.data()) != 1) {