51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From b6633bddd0b5f53222bd0658763400dd4a689764 Mon Sep 17 00:00:00 2001
|
|
From: Ziyang Zhou <ziyang.zhou@outlook.com>
|
|
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 438dbb8..8a4ffec 100644
|
|
--- a/server/BandwidthController.cpp
|
|
+++ b/server/BandwidthController.cpp
|
|
@@ -541,6 +541,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 87b2c55..6e60a58 100644
|
|
--- a/server/Controllers.cpp
|
|
+++ b/server/Controllers.cpp
|
|
@@ -321,7 +321,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 d0aaa63..2133538 100644
|
|
--- a/server/IptablesRestoreController.cpp
|
|
+++ b/server/IptablesRestoreController.cpp
|
|
@@ -346,6 +346,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.49.0
|
|
|