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

diff --git a/src/netutl.h b/src/netutl.h
index 3f6d009f..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-2001 Ivo Timmermans <zarq@iname.com>
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    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,19 +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.7 2001/10/27 12:13:17 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 "net.h"
-
-extern char *hostlookup(unsigned long);
-extern ip_mask_t *strtoip(char*);
-
-#endif /* __TINC_NETUTL_H__ */
+#include "packmsg.h"
+
+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 *) __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 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