simplify join timeout

3 files changed, 7 insertions, 6 deletions

diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 6ea92cd9d..d6b591133 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -31,7 +31,7 @@ char *xpra_extra_params = "";
 char *xvfb_screen = "800x600x24";
 char *xvfb_extra_params = "";
 char *netfilter_default = NULL;
-unsigned join_timeout = 50; // 5 sec (unit is 0.1 sec)
+unsigned long join_timeout = 5000000; // microseconds
 
 int checkcfg(int val) {
         assert(val < CFG_MAX);
@@ -217,7 +217,7 @@ int checkcfg(int val) {
 
                         // timeout for join option
                         else if (strncmp(ptr, "join-timeout ", 13) == 0)
-                                join_timeout = strtoul(ptr + 13, NULL, 10) * 10;
+                                join_timeout = strtoul(ptr + 13, NULL, 10) * 1000000; // seconds to microseconds
 
                         else
                                 goto errout;
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 37d8c6883..8b7cfdcdd 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -738,7 +738,7 @@ extern char *xpra_extra_params;
 extern char *xvfb_screen;
 extern char *xvfb_extra_params;
 extern char *netfilter_default;
-extern unsigned join_timeout;
+extern unsigned long join_timeout;
 int checkcfg(int val);
 void print_compiletime_support(void);
 
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 08120cffe..ddf26e0e7 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -318,15 +318,16 @@ int is_ready_for_join(const pid_t pid) {
         return 1;
 }
 
+#define SNOOZE 100000 // sleep interval in microseconds
 void check_join_permission(pid_t pid) {
         // check if pid belongs to a fully set up firejail sandbox
-        unsigned i;
-        for (i = 0; is_ready_for_join(pid) == 0; i++) { // give sandbox some time to start up
+        unsigned long i;
+        for (i = 0; is_ready_for_join(pid) == 0; i += SNOOZE) { // give sandbox some time to start up
                 if (i >= join_timeout) {
                         fprintf(stderr, "Error: no valid sandbox\n");
                         exit(1);
                 }
-                usleep(100000); // 0.1 sec
+                usleep(SNOOZE);
         }
         // check privileges for non-root users
         uid_t uid = getuid();