commit 58c182291dfbb90cb136d862a56f57a44085341c
author Maciej Żenczykowski <maze@google.com> Fri Oct 20 14:40:16 2023 -0700
committer Maciej Żenczykowski <maze@google.com> Sat Oct 21 09:20:03 2023 +0000
tree dad8d398b2d789b14b389f3fd1b5f63c1dfc1406
parent 3f25b4ba8a01bc5ccd165724f82e00c9b1d03316

execute platform bpfloader after netbpfload is done

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I447880763bbc506f08b578f862f09be91ab3d14d

netbpfload/NetBpfLoad.cpp

diff --git a/netbpfload/NetBpfLoad.cpp b/netbpfload/NetBpfLoad.cpp
index fd20293..d150373 100644
--- a/netbpfload/NetBpfLoad.cpp
+++ b/netbpfload/NetBpfLoad.cpp
@@ -168,7 +168,7 @@
     return 0;
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char** argv, char * const envp[]) {
     (void)argc;
     android::base::InitLogging(argv, &android::base::KernelLogger);
 
@@ -257,5 +257,12 @@
         return 1;
     }
 
-    return 0;
+    ALOGI("done, transferring control to platform bpfloader.");
+
+    const char * args[] = { "/system/bin/bpfloader", NULL, };
+    if (execve(args[0], (char**)args, envp)) {
+        ALOGE("FATAL: execve('/system/bin/bpfloader'): %d[%s]", errno, strerror(errno));
+    }
+
+    return 1;
 }