X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnetutl.h;h=ebba1ac3c27c3b2553712d906b37990e2c677bb9;hp=7fc41e8af6d33ef0f236373dc136d7682c3d9499;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee

diff --git a/src/netutl.h b/src/netutl.h
index 7fc41e8a..ebba1ac3 100644
--- a/src/netutl.h
+++ b/src/netutl.h
@@ -1,7 +1,9 @@
+#ifndef MESHLINK_NETUTL_H
+#define MESHLINK_NETUTL_H
+
 /*
     netutl.h -- header file for netutl.c
-    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     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,25 +20,21 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NETUTL_H__
-#define __TINC_NETUTL_H__
-
 #include "net.h"
+#include "packmsg.h"
 
-extern bool hostnames;
-
-extern struct addrinfo *str2addrinfo(const char *, const char *, int);
+extern struct addrinfo *str2addrinfo(const char *, const char *, int) __attribute__((__malloc__));
 extern sockaddr_t str2sockaddr(const char *, const char *);
 extern void sockaddr2str(const sockaddr_t *, char **, char **);
-extern char *sockaddr2hostname(const sockaddr_t *);
+extern char *sockaddr2hostname(const sockaddr_t *) __attribute__((__malloc__));
 extern int sockaddrcmp(const sockaddr_t *, const sockaddr_t *);
 extern int sockaddrcmp_noport(const sockaddr_t *, const sockaddr_t *);
 extern void sockaddrunmap(sockaddr_t *);
 extern void sockaddrfree(sockaddr_t *);
 extern void sockaddrcpy(sockaddr_t *, const sockaddr_t *);
-extern int maskcmp(const void *, const void *, int);
-extern void maskcpy(void *, const void *, int, int);
-extern void mask(void *, int, int);
-extern bool maskcheck(const void *, int, int);
+extern void sockaddrcpy_setport(sockaddr_t *, const sockaddr_t *, uint16_t port);
+
+extern void packmsg_add_sockaddr(struct packmsg_output *out, const sockaddr_t *);
+extern sockaddr_t packmsg_get_sockaddr(struct packmsg_input *in);
 
-#endif							/* __TINC_NETUTL_H__ */
+#endif