Changes for May 2024, syncing up to 20240508
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 5eca866c8d670d959f76935f129c20539241bc79 Mon Sep 17 00:00:00 2001
|
||||
From 2558386176b8de642e5e284a1ff2398b21757b4f Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 2 Jul 2018 22:01:43 +0200
|
||||
Subject: [PATCH 1/4] Huawei Kirin 960:: accept broken rpfilter match
|
||||
@@ -12,7 +12,7 @@ Change-Id: I9aa63d18e54a8254133adf97bf757c03d6b66757
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
|
||||
index 79193574..d867cea4 100644
|
||||
index 03185e71..a890d60c 100644
|
||||
--- a/server/TetherController.cpp
|
||||
+++ b/server/TetherController.cpp
|
||||
@@ -718,7 +718,7 @@ int TetherController::setForwardRules(bool add, const char *intIface, const char
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8c255147f9ae33b8cd5f726d70edfa9af4ebd363 Mon Sep 17 00:00:00 2001
|
||||
From f00a4d4ea252a8ce15b906e4c5ad6ae3e67b7f3c Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 29 Jul 2019 18:09:12 +0200
|
||||
Subject: [PATCH 2/4] Don't fail on FTP conntracking failing
|
||||
@@ -14,7 +14,7 @@ Change-Id: I3d9c865eb5a4b421f9983210c2ceae62b4906234
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
|
||||
index d867cea4..00c979d8 100644
|
||||
index a890d60c..88e7f52b 100644
|
||||
--- a/server/TetherController.cpp
|
||||
+++ b/server/TetherController.cpp
|
||||
@@ -722,13 +722,19 @@ int TetherController::setForwardRules(bool add, const char *intIface, const char
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 87b5e3c463e66b497d2009b1030c0f2513802b11 Mon Sep 17 00:00:00 2001
|
||||
From 031ddd823b329b268b3cd4620ba3410a4e958292 Mon Sep 17 00:00:00 2001
|
||||
From: ChonDoit <thphantomblog@gmail.com>
|
||||
Date: Fri, 7 Oct 2022 02:43:21 +0000
|
||||
Subject: [PATCH 3/4] Support no-bpf usecase
|
||||
@@ -9,10 +9,10 @@ Change-Id: Ic759e2cfaf11705169a4a6b677b0e5aca26907b3
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/server/Controllers.cpp b/server/Controllers.cpp
|
||||
index 43a2d1ee..35e2b890 100644
|
||||
index 87b2c55d..1a027210 100644
|
||||
--- a/server/Controllers.cpp
|
||||
+++ b/server/Controllers.cpp
|
||||
@@ -284,7 +284,7 @@ void Controllers::init() {
|
||||
@@ -321,7 +321,7 @@ 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.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a613dcfa688ce7cb17d79f07bc3a0ad0e48dd3a0 Mon Sep 17 00:00:00 2001
|
||||
From c305ea8522ae630ff013f96a2ed4068b15c1dde5 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 26 Oct 2022 18:13:56 -0400
|
||||
Subject: [PATCH 4/4] Don't abort in case of cgroup/bpf setup fail, since some
|
||||
@@ -9,10 +9,10 @@ Subject: [PATCH 4/4] Don't abort in case of cgroup/bpf setup fail, since some
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/server/main.cpp b/server/main.cpp
|
||||
index 3c6b0d52..89bf4e9e 100644
|
||||
index b0c5406d..ec15ecc2 100644
|
||||
--- a/server/main.cpp
|
||||
+++ b/server/main.cpp
|
||||
@@ -147,7 +147,7 @@ int main() {
|
||||
@@ -145,7 +145,7 @@ int main() {
|
||||
|
||||
if (libnetd_updatable_init(cg2_path.c_str())) {
|
||||
ALOGE("libnetd_updatable_init failed");
|
||||
|
||||
Reference in New Issue
Block a user