Merge branch 'everbase' of chicago.everbase.net:meshlink/meshlink into everbase

[meshlink] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index b2a90e73281d0437399f963632c033eb7f22e82d..c0b677fcccbef542069800b916bf625e020308f9 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -17,15 +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 b64encode_urlsafe(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__ */