X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnetutl.h;h=bce0aaee039369d6b8e9f95a210ec5abcc408595;hb=8d4b96efb7955eaa96174af4804597f92e124041;hp=5554b275cc7730908ebef3feceb48f7d97dd1bb2;hpb=f75dcef72a81a337e847adf0bae54198894f65b9;p=meshlink

diff --git a/src/netutl.h b/src/netutl.h
index 5554b275..bce0aaee 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-2002 Ivo Timmermans <zarq@iname.com>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.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
@@ -13,33 +15,26 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: netutl.h,v 1.2.4.14 2002/09/09 21:24:41 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NETUTL_H__
-#define __TINC_NETUTL_H__
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
 #include "net.h"
-
-extern int hostnames;
-
-extern struct addrinfo *str2addrinfo(char *, char *, int);
-extern sockaddr_t str2sockaddr(char *, char *);
-extern void sockaddr2str(sockaddr_t *, char **, char **);
-extern char *sockaddr2hostname(sockaddr_t *);
-extern int sockaddrcmp(sockaddr_t *, sockaddr_t *);
-extern void sockaddrunmap(sockaddr_t *);
-extern int maskcmp(void *, void *, int, int);
-extern void maskcpy(void *, void *, int, int);
-extern void mask(void *, int, int);
-extern int maskcheck(void *, int, int);
-
-#endif							/* __TINC_NETUTL_H__ */
+#include "packmsg.h"
+
+struct addrinfo *str2addrinfo(const char *, const char *, int) __attribute__((__malloc__));
+sockaddr_t str2sockaddr(const char *, const char *);
+void sockaddr2str(const sockaddr_t *, char **, char **);
+char *sockaddr2hostname(const sockaddr_t *) __attribute__((__malloc__));
+int sockaddrcmp(const sockaddr_t *, const sockaddr_t *) __attribute__((__warn_unused_result__));
+int sockaddrcmp_noport(const sockaddr_t *, const sockaddr_t *) __attribute__((__warn_unused_result__));
+void sockaddrunmap(sockaddr_t *);
+void sockaddrfree(sockaddr_t *);
+void sockaddrcpy(sockaddr_t *, const sockaddr_t *);
+void sockaddrcpy_setport(sockaddr_t *, const sockaddr_t *, uint16_t port);
+
+void packmsg_add_sockaddr(struct packmsg_output *out, const sockaddr_t *);
+sockaddr_t packmsg_get_sockaddr(struct packmsg_input *in) __attribute__((__warn_unused_result__));
+
+#endif