@@ -168,9 +168,12 @@ be reset by restarts.

 OpenVPN will indicate that it is in a hold state by

 sending a real-time notification to the management

-client:

+client, the parameter indicates how long OpenVPN would

+wait without UI (as influenced by connect-retry exponential

+backoff). The UI needs to wait for releasing the hold if it

+wants similar behavior:

-  >HOLD:Waiting for hold release

+  >HOLD:Waiting for hold release:10

 Command examples:

@@ -1960,16 +1960,17 @@ do_deferred_options (struct context *c, const unsigned int found)

 }

 /*

- * Possible hold on initialization

+ * Possible hold on initialization, holdtime is the

+ * time OpenVPN would wait without management

  */

 static bool

-do_hold (void)

+do_hold (int holdtime)

 {

 #ifdef ENABLE_MANAGEMENT

   if (management)

     {

       /* block until management hold is released */

-      if (management_hold (management))

+        if (management_hold (management, holdtime))

 	return true;

     }

 #endif

@@ -2027,8 +2028,10 @@ socket_restart_pause (struct context *c)

   c->persist.restart_sleep_seconds = 0;

   /* do managment hold on context restart, i.e. second, third, fourth, etc. initialization */

-  if (do_hold ())

+  if (do_hold (sec))

+  {

     sec = 0;

+  }

   if (sec)

     {

@@ -2046,7 +2049,7 @@ do_startup_pause (struct context *c)

   if (!c->first_time)

     socket_restart_pause (c);

   else

-    do_hold (); /* do management hold on first context initialization */

+    do_hold (0); /* do management hold on first context initialization */

 }

 /*

@@ -3431,7 +3434,7 @@ open_management (struct context *c)

 	    }

 	  /* initial management hold, called early, before first context initialization */

-	  do_hold ();

+	  do_hold (0);

 	  if (IS_SIG (c))

 	    {

 	      msg (M_WARN, "Signal received from management interface, exiting");

@@ -3332,12 +3332,13 @@ management_should_daemonize (struct management *man)

  * Return true if the caller should not sleep for an additional time interval.

  */

 bool

-management_hold (struct management *man)

+management_hold (struct management *man, int holdtime)

 {

   if (management_would_hold (man))

     {

       volatile int signal_received = 0;

       const bool standalone_disabled_save = man->persist.standalone_disabled;

+      struct gc_arena gc = gc_new ();

       man->persist.standalone_disabled = false; /* This is so M_CLIENT messages will be correctly passed through msg() */

       man->persist.special_state_msg = NULL;

@@ -3347,7 +3348,9 @@ management_hold (struct management *man)

       if (!signal_received)

 	{

-	  man->persist.special_state_msg = ">HOLD:Waiting for hold release";

+	  struct buffer out = alloc_buf_gc (128, &gc);

+	  buf_printf (&out, ">HOLD:Waiting for hold release:%d", holdtime);

+	  man->persist.special_state_msg = BSTR (&out);

 	  msg (M_CLIENT, "%s", man->persist.special_state_msg);

 	  /* run command processing event loop until we get our username/password */

@@ -3366,6 +3369,7 @@ management_hold (struct management *man)

       man->persist.special_state_msg = NULL;

       man->settings.mansig &= ~MANSIG_IGNORE_USR1_HUP;

+      gc_free (&gc);

       return true;

     }

   return false;

@@ -396,7 +396,7 @@ int managment_android_persisttun_action (struct management *man);

 bool management_should_daemonize (struct management *man);

 bool management_would_hold (struct management *man);

-bool management_hold (struct management *man);

+bool management_hold (struct management *man, int holdtime);

 void management_event_loop_n_seconds (struct management *man, int sec);