clatd: only wait 15s for SIGTERM during shutdown am: 9c05f75eaa am: 70da5b5a0a

Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/2535679

Change-Id: Ie352766e04ca9082c10db72ae389f3c3241602af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/main.c b/main.c
index 11da65b..f888041 100644
--- a/main.c
+++ b/main.c
@@ -194,8 +194,12 @@ int main(int argc, char **argv) {
 
   if (running) {
     logmsg(ANDROID_LOG_INFO, "Clatd on %s waiting for SIGTERM", uplink_interface);
-    while (running) sleep(60);
-    logmsg(ANDROID_LOG_INFO, "Clatd on %s received SIGTERM", uplink_interface);
+    // let's give higher level java code 15 seconds to kill us,
+    // but eventually terminate anyway, in case system server forgets about us...
+    // sleep() should be interrupted by SIGTERM, the handler should clear running
+    sleep(15);
+    logmsg(ANDROID_LOG_INFO, "Clatd on %s %s SIGTERM", uplink_interface,
+           running ? "timed out waiting for" : "received");
   } else {
     logmsg(ANDROID_LOG_INFO, "Clatd on %s already received SIGTERM", uplink_interface);
   }