aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffan Karger2017-07-20 21:17:02 +0200
committerGert Doering2017-07-20 22:41:12 +0200
commit4a04be8b53df37cac0cd4df4d23a1e2210902232 (patch)
tree5c82e791080b75292b898f47ae48d005d0e75f45
parent80ece420966b21b9a6cee2a36a19e3d200dcd3e7 (diff)
downloadopenvpn-4a04be8b53df37cac0cd4df4d23a1e2210902232.zip
openvpn-4a04be8b53df37cac0cd4df4d23a1e2210902232.tar.gz
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 <steffan@karger.me> Acked-by: Gert Doering <gert@greenie.muc.de> 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 <gert@greenie.muc.de> (cherry picked from commit cdb262a6c78a29349789b7cf1813feaf7cc6e8c8)
-rw-r--r--src/openvpn/tun.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 68fb488..3639718 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);
}
}