@@ -756,7 +756,7 @@ read_incoming_link(struct context *c)

                 if (event_timeout_defined(&c->c2.explicit_exit_notification_interval))

                 {

                     msg(D_STREAM_ERRORS, "Connection reset during exit notification period, ignoring [%d]", status);

-                    openvpn_sleep(1);

+                    management_sleep(1);

                 }

                 else

 #endif

@@ -1969,7 +1969,7 @@ do_up(struct context *c, bool pulled_options, unsigned int option_types_found)

                 /* if so, close tun, delete routes, then reinitialize tun and add routes */

                 msg(M_INFO, "NOTE: Pulled options changed on restart, will need to close and reopen TUN/TAP device.");

                 do_close_tun(c, true);

-                openvpn_sleep(1);

+                management_sleep(1);

                 c->c2.did_open_tun = do_open_tun(c);

                 update_time();

             }

@@ -2263,7 +2263,7 @@ socket_restart_pause(struct context *c)

     if (sec)

     {

         msg(D_RESTART, "Restart pause, %d second(s)", sec);

-        openvpn_sleep(sec);

+        management_sleep(sec);

     }

 }

@@ -3997,9 +3997,25 @@ log_history_ref(const struct log_history *h, const int index)

     }

 }

+void

+management_sleep(const int n)

+{

+    if (management)

+    {

+        management_event_loop_n_seconds(management, n);

+    }

+    else

+    {

+        sleep(n);

+    }

+}

+

 #else  /* ifdef ENABLE_MANAGEMENT */

-static void

-dummy(void)

+

+void

+management_sleep(const int n)

 {

+    sleep(n);

 }

+

 #endif /* ENABLE_MANAGEMENT */

@@ -605,4 +605,11 @@ management_bytes_server(struct management *man,

 #endif /* MANAGEMENT_DEF_AUTH */

 #endif /* ifdef ENABLE_MANAGEMENT */

+

+/**

+ * A sleep function that services the management layer for n seconds rather

+ * than doing nothing.

+ */

+void management_sleep(const int n);

+

 #endif /* ifndef MANAGE_H */

@@ -1615,19 +1615,6 @@ make_extended_arg_array(char **p, struct gc_arena *gc)

     }

 }

-void

-openvpn_sleep(const int n)

-{

-#ifdef ENABLE_MANAGEMENT

-    if (management)

-    {

-        management_event_loop_n_seconds(management, n);

-        return;

-    }

-#endif

-    sleep(n);

-}

-

 /*

  * Remove security-sensitive strings from control message

  * so that they will not be output to log file.

@@ -292,12 +292,6 @@ bool env_safe_to_print(const char *str);

 /* returns true if environmental variable may be passed to an external program */

 bool env_allowed(const char *str);

-/*

- * A sleep function that services the management layer for n

- * seconds rather than doing nothing.

- */

-void openvpn_sleep(const int n);

-

 void configure_path(void);

 const char *sanitize_control_message(const char *str, struct gc_arena *gc);

@@ -496,7 +496,7 @@ openvpn_getaddrinfo(unsigned int flags,

                 goto done;

             }

-            openvpn_sleep(fail_wait_interval);

+            management_sleep(fail_wait_interval);

         }

         ASSERT(res);

@@ -1193,7 +1193,7 @@ socket_listen_accept(socket_descriptor_t sd,

         if (status <= 0)

         {

-            openvpn_sleep(1);

+            management_sleep(1);

             continue;

         }

@@ -1228,7 +1228,7 @@ socket_listen_accept(socket_descriptor_t sd,

                 break;

             }

         }

-        openvpn_sleep(1);

+        management_sleep(1);

     }

     if (!nowait && openvpn_close_socket(sd))

@@ -1374,7 +1374,7 @@ openvpn_connect(socket_descriptor_t sd,

 #endif

                     break;

                 }

-                openvpn_sleep(1);

+                management_sleep(1);

                 continue;

             }