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

diff --git a/src/utils.h b/src/utils.h
index c3364ced..a966adb1 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,15 +21,14 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_UTILS_H__
-#define __TINC_UTILS_H__
+#include "system.h"
 
-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);
+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);
 
 #ifdef HAVE_MINGW
 extern const char *winerror(int);
@@ -38,6 +40,7 @@ extern const char *winerror(int);
 #define sockinprogress(x) ((x) == WSAEINPROGRESS || (x) == WSAEWOULDBLOCK)
 #define sockinuse(x) ((x) == WSAEADDRINUSE)
 #define socknotconn(x) ((x) == WSAENOTCONN)
+#define sockshutdown(x) ((x) == WSAESHUTDOWN)
 #else
 #define sockerrno errno
 #define sockstrerror(x) strerror(x)
@@ -50,7 +53,10 @@ extern const char *winerror(int);
 
 extern unsigned int bitfield_to_int(const void *bitfield, size_t size);
 
-extern bool check_id(const char *);
+extern bool check_id(const char *id);
+extern bool check_netname(const char *netname, bool strict);
 char *replace_name(const char *name);
 
-#endif /* __TINC_UTILS_H__ */
+extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms);
+
+#endif