Remove unnecessary status bitfield conversions.

[tinc] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index 10de2d4..9756a3e 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -23,6 +23,8 @@
 
 #include "system.h"
 
+#include "crypto.h"
+
 #define B64_SIZE(len) ((len) * 4 / 3 + 5)
 
 extern size_t hex2bin(const char *src, void *dst, size_t length);
@@ -43,6 +45,10 @@ extern const char *winerror(int);
 #define sockinuse(x) ((x) == WSAEADDRINUSE)
 #define socknotconn(x) ((x) == WSAENOTCONN)
 #define sockshutdown(x) ((x) == WSAESHUTDOWN)
+
+static inline long jitter(void) {
+       return (long)prng(131072);
+}
 #else
 #define sockerrno errno
 #define sockstrerror(x) strerror(x)
@@ -51,9 +57,11 @@ extern const char *winerror(int);
 #define sockinprogress(x) ((x) == EINPROGRESS)
 #define sockinuse(x) ((x) == EADDRINUSE)
 #define socknotconn(x) ((x) == ENOTCONN)
-#endif
 
-extern unsigned int bitfield_to_int(const void *bitfield, size_t size);
+static inline suseconds_t jitter(void) {
+       return (suseconds_t)prng(131072);
+}
+#endif
 
 extern bool check_id(const char *id);
 extern bool check_netname(const char *netname, bool strict);