X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.h;h=9756a3e0c3ca893180ac792a728029d9ef886014;hb=a85198d20f24cd4e20ec5c57e402611fef8b137a;hp=67c94f3d3927330ed0f0ca9bd2c0547f8c9f3a3f;hpb=483c5dcfb43719e5fd50902641252e28a04fd74e;p=tinc

diff --git a/src/utils.h b/src/utils.h
index 67c94f3d..9756a3e0 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,7 +1,10 @@
+#ifndef TINC_UTILS_H
+#define TINC_UTILS_H
+
 /*
     utils.h -- header file for utils.c
     Copyright (C) 1999-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 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
@@ -18,14 +21,18 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_UTILS_H__
-#define __TINC_UTILS_H__
+#include "system.h"
+
+#include "crypto.h"
 
-extern int hex2bin(const char *src, char *dst, int length);
-extern int bin2hex(const char *src, char *dst, int length);
+#define B64_SIZE(len) ((len) * 4 / 3 + 5)
 
-extern int b64encode(const char *src, char *dst, int length);
-extern int b64decode(const char *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 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);
@@ -36,6 +43,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)
@@ -43,8 +56,17 @@ 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);
+
+extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms);
 
-#endif							/* __TINC_UTILS_H__ */
+#endif