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

diff --git a/src/utils.h b/src/utils.h
index a966adb1..487058ae 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -23,14 +23,25 @@
 
 #include "system.h"
 
+#include "crypto.h"
+
+#define B64_SIZE(len) ((len) * 4 / 3 + 5)
+#define HEX_SIZE(len) ((len) * 2 + 1)
+
 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);
+// Returns true if string represents a base-10 integer.
+extern bool is_decimal(const char *str);
+
+// The reverse of atoi().
+extern char *int_to_str(int num);
 
-#ifdef HAVE_MINGW
+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_WINDOWS
 extern const char *winerror(int);
 #define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
 #define sockerrno WSAGetLastError()
@@ -41,6 +52,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,14 +64,21 @@ 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);
-char *replace_name(const char *name);
+char *replace_name(const char *name) ATTR_MALLOC;
+
+char *absolute_path(const char *path) ATTR_MALLOC;
+
+extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms) ATTR_DEALLOCATOR(fclose);
 
-extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms);
+// NULL-safe wrapper around strcmp().
+extern bool string_eq(const char *first, const char *second);
 
 #endif