X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.h;h=487058ae7fc3a75519934c90a52de26dbce072f5;hb=4436af55e55e79b496264fe114039fbc1198d71f;hp=d89d077b08718b3a0de683a449fc03d26db93970;hpb=75e5b2e906bd8563bf0f53a76065618c88122e1c;p=tinc

diff --git a/src/utils.h b/src/utils.h
index d89d077b..487058ae 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,3 +1,6 @@
+#ifndef TINC_UTILS_H
+#define TINC_UTILS_H
+
 /*
     utils.h -- header file for utils.c
     Copyright (C) 1999-2005 Ivo Timmermans
@@ -18,17 +21,27 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_UTILS_H__
-#define __TINC_UTILS_H__
+#include "system.h"
+
+#include "crypto.h"
+
+#define B64_SIZE(len) ((len) * 4 / 3 + 5)
+#define HEX_SIZE(len) ((len) * 2 + 1)
 
-extern int hex2bin(const char *src, void *dst, int length);
-extern int bin2hex(const void *src, char *dst, int length);
+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 int b64encode(const void *src, char *dst, int length);
-extern int b64encode_urlsafe(const void *src, char *dst, int length);
-extern int b64decode(const char *src, void *dst, int length);
+// Returns true if string represents a base-10 integer.
+extern bool is_decimal(const char *str);
 
-#ifdef HAVE_MINGW
+// The reverse of atoi().
+extern char *int_to_str(int num);
+
+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()
@@ -37,6 +50,12 @@ extern const char *winerror(int);
 #define sockmsgsize(x) ((x) == WSAEMSGSIZE)
 #define sockinprogress(x) ((x) == WSAEINPROGRESS || (x) == WSAEWOULDBLOCK)
 #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)
@@ -44,8 +63,22 @@ extern const char *winerror(int);
 #define sockmsgsize(x) ((x) == EMSGSIZE)
 #define sockinprogress(x) ((x) == EINPROGRESS)
 #define sockinuse(x) ((x) == EADDRINUSE)
+#define socknotconn(x) ((x) == ENOTCONN)
+
+static inline suseconds_t jitter(void) {
+	return (suseconds_t)prng(131072);
+}
 #endif
 
-extern unsigned int bitfield_to_int(const void *bitfield, size_t size);
+extern bool check_id(const char *id);
+extern bool check_netname(const char *netname, bool strict);
+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);
 
-#endif /* __TINC_UTILS_H__ */
+// NULL-safe wrapper around strcmp().
+extern bool string_eq(const char *first, const char *second);
+
+#endif