projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix segmentation fault when trying to connect via a SOCKS5 proxy.
[tinc]
/
lib
/
dropin.c
diff --git
a/lib/dropin.c
b/lib/dropin.c
index
52fb5b8
..
eb17aca
100644
(file)
--- a/
lib/dropin.c
+++ b/
lib/dropin.c
@@
-1,7
+1,7
@@
/*
dropin.c -- a set of drop-in replacements for libc functions
Copyright (C) 2000-2005 Ivo Timmermans,
/*
dropin.c -- a set of drop-in replacements for libc functions
Copyright (C) 2000-2005 Ivo Timmermans,
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
11
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-164,9
+164,10
@@
int gettimeofday(struct timeval *tv, void *tz) {
}
#endif
}
#endif
-#ifdef HAVE_MINGW
-int usleep(long usec) {
- Sleep(usec / 1000);
+#ifndef HAVE_USLEEP
+int usleep(long long usec) {
+ struct timeval tv = {usec / 1000000, (usec / 1000) % 1000};
+ select(0, NULL, NULL, NULL, &tv);
return 0;
}
#endif
return 0;
}
#endif