support android-15.0.0_r1
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
From 74ba7c71922a0a8b069c7804b09047eafb074cc0 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 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
|
||||
|
||||
24
android-15.0.0_r1/system/netd/0002-ignore-bpf-error.patch
Normal file
24
android-15.0.0_r1/system/netd/0002-ignore-bpf-error.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
From 9c23d4c790c3de54c73f10ea096113865d7aa77d Mon Sep 17 00:00:00 2001
|
||||
From: Ziyang Zhou <ziyang.zhou@outlook.com>
|
||||
Date: Sun, 14 Aug 2022 11:53:19 +0800
|
||||
Subject: [PATCH 2/3] ignore bpf error
|
||||
|
||||
---
|
||||
server/main.cpp | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/server/main.cpp b/server/main.cpp
|
||||
index b0c5406..8ef2f19 100644
|
||||
--- a/server/main.cpp
|
||||
+++ b/server/main.cpp
|
||||
@@ -145,7 +145,6 @@ int main() {
|
||||
|
||||
if (libnetd_updatable_init(cg2_path.c_str())) {
|
||||
ALOGE("libnetd_updatable_init failed");
|
||||
- exit(1);
|
||||
}
|
||||
gLog.info("libnetd_updatable_init success");
|
||||
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 8dc3ead00174559d3f09ae862a53b7e9e1fe7951 Mon Sep 17 00:00:00 2001
|
||||
From: Ziyang Zhou <ziyang.zhou@outlook.com>
|
||||
Date: Sun, 14 Aug 2022 11:57:11 +0800
|
||||
Subject: [PATCH 3/3] ignote getTetherStats error
|
||||
|
||||
---
|
||||
server/TetherController.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
|
||||
index 03185e7..150da1c 100644
|
||||
--- a/server/TetherController.cpp
|
||||
+++ b/server/TetherController.cpp
|
||||
@@ -913,9 +913,11 @@ StatusOr<TetherController::TetherStatsList> TetherController::getTetherStats() {
|
||||
}
|
||||
|
||||
if (int ret = addForwardChainStats(statsList, statsString, parsedIptablesOutput)) {
|
||||
+#if 0
|
||||
return statusFromErrno(-ret, StringPrintf("failed to parse %s tether stats:\n%s",
|
||||
target == V4 ? "IPv4": "IPv6",
|
||||
parsedIptablesOutput.c_str()));
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.45.1
|
||||
|
||||
Reference in New Issue
Block a user