X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.h;h=10de2d41205dfe12371292c7edf5b7205dcabe70;hb=b2701c7c54b11cda71461c5dbbc985476bf5b221;hp=e2a3306312be7727daeabeab1b38ba80c1148104;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=tinc diff --git a/src/utils.h b/src/utils.h index e2a33063..10de2d41 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 + 2000-2013 Guus Sliepen 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,16 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_UTILS_H__ -#define __TINC_UTILS_H__ +#include "system.h" + +#define B64_SIZE(len) ((len) * 4 / 3 + 5) -extern int hex2bin(const char *src, char *dst, int length); -extern int bin2hex(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 int b64encode(const char *src, char *dst, int length); -extern int b64decode(const char *src, char *dst, int 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 +41,8 @@ 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) #else #define sockerrno errno #define sockstrerror(x) strerror(x) @@ -43,8 +50,15 @@ 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) #endif extern unsigned int bitfield_to_int(const void *bitfield, size_t size); -#endif /* __TINC_UTILS_H__ */ +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