From 74ba7c71922a0a8b069c7804b09047eafb074cc0 Mon Sep 17 00:00:00 2001 From: Ziyang Zhou Date: Sat, 31 Jul 2021 06:14:33 +0000 Subject: [PATCH 1/3] ignore iptables error --- server/BandwidthController.cpp | 1 + server/Controllers.cpp | 1 - server/IptablesRestoreController.cpp | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp index 8a96738..f1cbf14 100644 --- a/server/BandwidthController.cpp +++ b/server/BandwidthController.cpp @@ -527,6 +527,7 @@ int BandwidthController::updateQuota(const std::string& quotaName, int64_t bytes if (!isOk(file)) { int res = errno; ALOGE("Updating quota %s failed (%s)", quotaName.c_str(), toString(file).c_str()); + res = 0; // HACKED return -res; } // TODO: should we propagate this error? diff --git a/server/Controllers.cpp b/server/Controllers.cpp index ea34897..be185ce 100644 --- a/server/Controllers.cpp +++ b/server/Controllers.cpp @@ -325,7 +325,6 @@ void Controllers::init() { // As such simply exit netd. This may crash loop the system, but by failing // to bootup we will trigger rollback and thus this offers us protection against // a mainline update breaking things. - exit(1); } gLog.info("Enabling bandwidth control: %" PRId64 "us", s.getTimeAndResetUs()); diff --git a/server/IptablesRestoreController.cpp b/server/IptablesRestoreController.cpp index 49b48d3..07bdda4 100644 --- a/server/IptablesRestoreController.cpp +++ b/server/IptablesRestoreController.cpp @@ -349,6 +349,7 @@ int IptablesRestoreController::execute(const IptablesTarget target, const std::s if (target == V6 || target == V4V6) { res |= sendCommand(IP6TABLES_PROCESS, command, output); } + res = 0; // ignore iptables error return res; } -- 2.45.1