X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Futils.h;h=c0b677fcccbef542069800b916bf625e020308f9;hb=6d1ac53f5c34ece4c7a82efb432a8e1d81fcff0d;hp=67c94f3d3927330ed0f0ca9bd2c0547f8c9f3a3f;hpb=40c28589328a2aa96c2ce1419c5d90616c758b3d;p=meshlink diff --git a/src/utils.h b/src/utils.h index 67c94f3d..c0b677fc 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,6 @@ /* utils.h -- header file for utils.c - Copyright (C) 1999-2005 Ivo Timmermans - 2000-2009 Guus Sliepen + Copyright (C) 2014 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 +17,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_UTILS_H__ -#define __TINC_UTILS_H__ +#ifndef __MESHLINK_UTILS_H__ +#define __MESHLINK_UTILS_H__ -extern int hex2bin(const char *src, char *dst, int length); -extern int bin2hex(const char *src, char *dst, int length); +extern int hex2bin(const char *src, void *dst, int length); +extern int bin2hex(const void *src, char *dst, int length); -extern int b64encode(const char *src, char *dst, int length); -extern int b64decode(const char *src, char *dst, int 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); #ifdef HAVE_MINGW extern const char *winerror(int); @@ -47,4 +47,7 @@ extern const char *winerror(int); extern unsigned int bitfield_to_int(const void *bitfield, size_t size); -#endif /* __TINC_UTILS_H__ */ +extern char *get_ip_str(const struct sockaddr *sa, char *s, size_t maxlen); +extern char *get_port_str(const struct sockaddr *sa, char *s, size_t maxlen); + +#endif /* __MESHLINK_UTILS_H__ */