X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.h;h=9756a3e0c3ca893180ac792a728029d9ef886014;hb=b13e1a3c1f7252cda5ab95166d9f2d578983471f;hp=a966adb1a1a5b98ce58832f4b5dc722743dcfe47;hpb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;p=tinc

diff --git a/src/utils.h b/src/utils.h
index a966adb1..9756a3e0 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -23,12 +23,16 @@
 
 #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);
 extern size_t bin2hex(const void *src, char *dst, size_t length);
 
-extern size_t b64encode(const void *src, char *dst, size_t length);
-extern size_t b64encode_urlsafe(const void *src, char *dst, size_t length);
-extern size_t b64decode(const char *src, void *dst, size_t length);
+extern size_t b64encode_tinc(const void *src, char *dst, size_t length);
+extern size_t b64encode_tinc_urlsafe(const void *src, char *dst, size_t length);
+extern size_t b64decode_tinc(const char *src, void *dst, size_t length);
 
 #ifdef HAVE_MINGW
 extern const char *winerror(int);
@@ -41,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)
@@ -49,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);