From: Steffan Karger Date: Thu, 20 Jul 2017 19:17:02 +0000 (+0200) Subject: fixup: also change missed openvpn_sleep() occurrences X-Git-Tag: v2.5_beta1~635 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdb262a6c78a29349789b7cf1813feaf7cc6e8c8;p=thirdparty%2Fopenvpn.git fixup: also change missed openvpn_sleep() occurrences 45b2af9c missed some openvpn_sleep() occurrences in platform-specific code in tun.c - fix that. Signed-off-by: Steffan Karger Acked-by: Gert Doering Message-Id: <1500578222-21689-1-git-send-email-steffan@karger.me> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15111.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 68fb48890..3639718c9 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1862,7 +1862,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun if (oldtunfd >=0 && android_method == ANDROID_OPEN_AFTER_CLOSE) { close(oldtunfd); - openvpn_sleep(2); + management_sleep(2); } if (oldtunfd >=0 && android_method == ANDROID_KEEP_OLD_TUN) @@ -4999,7 +4999,7 @@ netsh_command(const struct argv *a, int n, int msglevel) for (i = 0; i < n; ++i) { bool status; - openvpn_sleep(1); + management_sleep(1); netcmd_semaphore_lock(); argv_msg_prefix(M_INFO, a, "NETSH"); status = openvpn_execve_check(a, NULL, 0, "ERROR: netsh command failed"); @@ -5008,7 +5008,7 @@ netsh_command(const struct argv *a, int n, int msglevel) { return; } - openvpn_sleep(4); + management_sleep(4); } msg(msglevel, "NETSH: command failed"); } @@ -5991,7 +5991,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun if (s > 0) { msg(M_INFO, "Sleeping for %d seconds...", s); - openvpn_sleep(s); + management_sleep(s); } }